Version 0.5.
authorJimmy Christensen <dusted@dusted.dk>
Thu, 2 Apr 2015 07:37:41 +0000 (10:37 +0300)
committerJimmy Christensen <dusted@dusted.dk>
Thu, 2 Apr 2015 09:28:23 +0000 (12:28 +0300)
src/fkgui/Backup.java
src/fkgui/ChangePassPrompt.java
src/fkgui/FkActionEventListener.java
src/fkgui/FkManager.java
src/fkgui/MainWin.java
src/fkgui/Messages.java
src/fkgui/SaveSettingsDialog.java
src/fkgui/UpdateChecker.java
src/fkgui/messages.properties
src/fkgui/messages_da.properties
src/org/eclipse/wb/swt/SWTResourceManager.java

index 4a322b6..3aa4261 100644 (file)
@@ -2,6 +2,7 @@ package fkgui;
 
 import java.io.File;
 import java.io.FileOutputStream;
+
 import org.eclipse.swt.widgets.Dialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
@@ -18,7 +19,6 @@ import org.eclipse.swt.layout.FormData;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Button;
-
 import org.eclipse.wb.swt.SWTResourceManager;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.ProgressBar;
@@ -68,9 +68,9 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                if( _restoreBackup )
                {
-                       setText("FinalKey - Restore");
+                       setText(Messages.Backup_0);
                } else {
-                       setText("FinalKey - Backup");
+                       setText(Messages.Backup_1);
                }
 
                Display display = getParent().getDisplay();
@@ -140,19 +140,19 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                if(!restoreBackup)
                {
-                       lblMsg.setText("About backup:\nIt is a good idea to backup your FinalKey so you don't\nlose all your logins if you lose your FinalKey or it breaks.\n\nSecurity:\nThe FinalKey backup files are encrypted, but you should\nnever keep them on your computer or in a place where\nsomeone else may steal them. Keep your backup on\nan offline storage medium in a safe place.\n");
+                       lblMsg.setText(Messages.Backup_2);
                } else {
-                       lblMsg.setText("Important! Read  first!\nThis will overwrite all data on your FinalKey with the data\nfrom the backup-file you select!\n\nThe password needed to unlock your FinalKey will be\nthe password that was used at the time that the backup\nwas made. If you do not know the password of the\nbackup file, your FinalKey is useless.\n");
+                       lblMsg.setText(Messages.Backup_3);
                }
 
                btnBackup = new Button(cmpBackupFileSelect, SWT.NONE);
                if(!restoreBackup)
                {
-                       btnBackup.setText("Backup");
-                       btnBackup.setImage(SWTResourceManager.getImage(Backup.class, "/fkgui/gfx/backup.png"));
+                       btnBackup.setText(Messages.Backup_4);
+                       btnBackup.setImage(SWTResourceManager.getImage(Backup.class, "/fkgui/gfx/backup.png")); //$NON-NLS-1$
                } else {
-                       btnBackup.setText("Restore");
-                       btnBackup.setImage(SWTResourceManager.getImage(Backup.class, "/fkgui/gfx/restore.png"));
+                       btnBackup.setText(Messages.Backup_6);
+                       btnBackup.setImage(SWTResourceManager.getImage(Backup.class, "/fkgui/gfx/restore.png")); //$NON-NLS-1$
                }
                FormData fd_btnBackup = new FormData();
                fd_btnBackup.bottom = new FormAttachment(100, -10);
@@ -176,8 +176,8 @@ public class Backup extends Dialog implements FkActionEventListener {
                                                if(backupFile.createNewFile())
                                                {
                                                        MessageBox m = new MessageBox(shell, SWT.ICON_INFORMATION);
-                                                       m.setText("Ready to backup");
-                                                       m.setMessage("When you press OK, The FinalKey will start blinking, you then have 5 seconds to press the button to allow backup.");
+                                                       m.setText(Messages.Backup_8);
+                                                       m.setMessage(Messages.Backup_9);
                                                        shell.setEnabled(false);
                                                        m.open();
                                                        FkManager.getInstance().backup(backupFile, mySelf);
@@ -185,8 +185,8 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                                                } else {
                                                        MessageBox m = new MessageBox(shell, SWT.ICON_ERROR);
-                                                       m.setText("File exists");
-                                                       m.setMessage("Will not overwrite an existing file.\nChose a new name or delete the existing file.");
+                                                       m.setText(Messages.Backup_10);
+                                                       m.setMessage(Messages.Backup_11);
                                                        shell.setEnabled(false);
                                                        m.open();
                                                        shell.setEnabled(true);
@@ -194,12 +194,12 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                                        } catch(Exception ex)
                                        {
-                                               fileName="";
-                                               txtFileName.setText("");
+                                               fileName=""; //$NON-NLS-1$
+                                               txtFileName.setText(""); //$NON-NLS-1$
                                                btnBackup.setEnabled(false);
                                                MessageBox m = new MessageBox(shell, SWT.ICON_ERROR);
-                                               m.setText("Could not create file.");
-                                               m.setMessage("The file could not be created: "+ex.getLocalizedMessage() );
+                                               m.setText(Messages.Backup_14);
+                                               m.setMessage(Messages.Backup_15+ex.getLocalizedMessage() );
                                                shell.setEnabled(false);
                                                m.open();
                                                shell.setEnabled(true);
@@ -222,24 +222,24 @@ public class Backup extends Dialog implements FkActionEventListener {
                                                if( backupFile.canRead() )
                                                {
                                                        MessageBox m = new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO);
-                                                       m.setText("Ready to Restore");
-                                                       m.setMessage("Press yes to restore the backup onto the Finalkey. You will have 5 seconds to press the button on your FinalKey to allow restore.\nIf you do not want to overwrite your FinalKey, press No to abort.");
+                                                       m.setText(Messages.Backup_16);
+                                                       m.setMessage(Messages.Backup_17);
                                                        shell.setEnabled(false);
                                                        if( m.open() == SWT.YES )
                                                        {
                                                                FkManager.getInstance().restore(backupFile, mySelf);
                                                        } else {
                                                                m = new MessageBox(shell, SWT.ICON_INFORMATION);
-                                                               m.setText("Aborted");
-                                                               m.setMessage("Restore was aborted.");
+                                                               m.setText(Messages.Backup_18);
+                                                               m.setMessage(Messages.Backup_19);
                                                                m.open();
                                                                shell.close();
                                                        }
 
                                                } else {
                                                        MessageBox m = new MessageBox(shell, SWT.ICON_ERROR);
-                                                       m.setText("File exists");
-                                                       m.setMessage("Will not overwrite an existing file.\nChose a new name or delete the existing file.");
+                                                       m.setText(Messages.Backup_20);
+                                                       m.setMessage(Messages.Backup_21);
                                                        shell.setEnabled(false);
                                                        m.open();
                                                        shell.setEnabled(true);
@@ -247,12 +247,12 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                                        } catch(Exception ex)
                                        {
-                                               fileName="";
-                                               txtFileName.setText("");
+                                               fileName=""; //$NON-NLS-1$
+                                               txtFileName.setText(""); //$NON-NLS-1$
                                                btnBackup.setEnabled(false);
                                                MessageBox m = new MessageBox(shell, SWT.ICON_ERROR);
-                                               m.setText("Could not create file.");
-                                               m.setMessage("The file could not be created: "+ex.getLocalizedMessage() );
+                                               m.setText(Messages.Backup_24);
+                                               m.setMessage(Messages.Backup_25+ex.getLocalizedMessage() );
                                                shell.setEnabled(false);
                                                m.open();
                                                shell.setEnabled(true);
@@ -267,7 +267,7 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                Label lblThisSavesThe = new Label(cmpBackupFileSelect, SWT.NONE);
                fd_lblNewLabel.top = new FormAttachment(lblThisSavesThe, 18);
-               lblThisSavesThe.setFont(SWTResourceManager.getFont("Sans", 10, SWT.BOLD));
+               lblThisSavesThe.setFont(SWTResourceManager.getFont("Sans", 10, SWT.BOLD)); //$NON-NLS-1$
                FormData fd_lblThisSavesThe = new FormData();
                fd_lblThisSavesThe.top = new FormAttachment(0, 10);
                fd_lblThisSavesThe.left = new FormAttachment(lblMsg, 0, SWT.LEFT);
@@ -277,26 +277,25 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                if(!restoreBackup)
                {
-                       lblThisSavesThe.setText("Save the contents of FinalKey to a file");
+                       lblThisSavesThe.setText(Messages.Backup_27);
                } else {
-                       lblThisSavesThe.setText("Restore the contents of a file onto FinalKey");
+                       lblThisSavesThe.setText(Messages.Backup_28);
                }
 
                lblFileName = new Label(cmpBackupFileSelect, SWT.NONE);
                fd_lblNewLabel.bottom = new FormAttachment(100, -81);
                lblFileName.setAlignment(SWT.RIGHT);
-               lblFileName.setText("File:");
+               lblFileName.setText(Messages.Backup_29);
                FormData fd_lblFileName = new FormData();
-               fd_lblFileName.top = new FormAttachment(lblMsg, 49);
-               fd_lblFileName.bottom = new FormAttachment(100, -10);
+               fd_lblFileName.bottom = new FormAttachment(btnBackup,0, SWT.CENTER);
                fd_lblFileName.left = new FormAttachment(0, 10);
                lblFileName.setLayoutData(fd_lblFileName);
 
                txtFileName = new Text(cmpBackupFileSelect, SWT.BORDER);
                fd_lblFileName.right = new FormAttachment(100, -463);
                FormData fd_txtFileName = new FormData();
-               fd_txtFileName.top = new FormAttachment(lblMsg, 49);
-               fd_txtFileName.bottom = new FormAttachment(100, -10);
+               //fd_txtFileName.top = new FormAttachment(lblMsg, 49);
+               fd_txtFileName.bottom = new FormAttachment(btnBackup, 0, SWT.CENTER);
                fd_txtFileName.left = new FormAttachment(lblFileName, 6);
                txtFileName.setLayoutData(fd_txtFileName);
                txtFileName.addListener(SWT.CHANGED, new Listener() {
@@ -315,16 +314,25 @@ public class Backup extends Dialog implements FkActionEventListener {
                btnBrowse = new Button(cmpBackupFileSelect, SWT.NONE);
                fd_txtFileName.right = new FormAttachment(btnBrowse, -6);
                FormData fd_btnBrowse = new FormData();
-               fd_btnBrowse.top = new FormAttachment(lblMsg, 49);
-               fd_btnBrowse.bottom = new FormAttachment(btnBackup, 0, SWT.BOTTOM);
+               fd_btnBrowse.left = new FormAttachment(0, 322);
                fd_btnBrowse.right = new FormAttachment(btnBackup, -6);
+               fd_btnBrowse.top = new FormAttachment(lblMsg, 38);
+               fd_btnBrowse.bottom = new FormAttachment(btnBackup, 0, SWT.BOTTOM);
                btnBrowse.setLayoutData(fd_btnBrowse);
-               btnBrowse.setText("...");
+               btnBrowse.setText("..."); //$NON-NLS-1$
                btnBrowse.addSelectionListener( new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
-                               FileDialog fd = new FileDialog(shell, SWT.SAVE );
-                               String[] ext = { "*.fkb", "*.*"  };
-                               String[] extN = { "FinalKey Backup Files", "All Files"};
+                               FileDialog fd;
+
+                               if(restoreBackup)
+                               {
+                                       fd = new FileDialog(shell, SWT.OPEN );
+                               } else {
+                                       fd = new FileDialog(shell, SWT.SAVE );
+                               }
+
+                               String[] ext = { "*.fkb", "*.*"  }; //$NON-NLS-1$ //$NON-NLS-2$
+                               String[] extN = { Messages.Backup_33, Messages.Backup_34};
 
                                //Try to start the selection dialog in the existing information, if it is correct and exist
                                fileName = txtFileName.getText();
@@ -345,7 +353,7 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                                if(restoreBackup)
                                {
-                                       fd.setFileName("");
+                                       fd.setFileName(""); //$NON-NLS-1$
                                }
 
                                fd.setFilterExtensions( ext );
@@ -356,7 +364,7 @@ public class Backup extends Dialog implements FkActionEventListener {
                                if( fileName != null )
                                {
 
-                                       System.out.println("FileName: " + fileName);
+                                       System.out.println("FileName: " + fileName); //$NON-NLS-1$
                                        txtFileName.setText(fileName);
                                        btnBackup.setEnabled(true);
                                }
@@ -368,7 +376,6 @@ public class Backup extends Dialog implements FkActionEventListener {
        @Override
        public void fkActionEvent(FkActionEvent event) {
                MessageBox m;
-               System.out.println(event);
 
                //Handle errors differently when we are taking bacup
                if( !restoreBackup )
@@ -378,8 +385,8 @@ public class Backup extends Dialog implements FkActionEventListener {
                        case ACTION_ABORTED:
                                backupFile.delete();
                                m = new MessageBox(shell, SWT.ICON_WARNING| SWT.YES| SWT.NO);
-                               m.setText("Backup failed");
-                               m.setMessage("You did not press the button within 5 seconds, or you held down the button to abort the backup. Try again ?");
+                               m.setText(Messages.Backup_37);
+                               m.setMessage(Messages.Backup_38);
 
                                if( m.open() == SWT.YES )
                                {
@@ -391,17 +398,17 @@ public class Backup extends Dialog implements FkActionEventListener {
                                }
                                break;
                        case ACTION_ERROR:
-                               lblStatusVerified.setText("Valid: No - Validation failed.");
+                               lblStatusVerified.setText(Messages.Backup_39);
 
                                m = new MessageBox(shell, SWT.ICON_ERROR| SWT.YES| SWT.NO);
-                               m.setText("Checksum Error");
-                               m.setMessage("There were one or more errors when verifying the backup data, this may indicate a bad connection or a hardware-malfunction on the FinalKey.\nThe Backup File can NOT be restored onto the FinalKey, but it may be manually repaired by someone with a hex-editor and too much free-time. Do you want to delete the corrupted file ?");
+                               m.setText(Messages.Backup_40);
+                               m.setMessage(Messages.Backup_41);
                                if( m.open() == SWT.YES )
                                {
                                        backupFile.delete();
                                } else {
-                                       backupFile.renameTo( new File(fileName+"-failed"));
-                                       File crashLog = new File(fileName+"-errorlog.txt");
+                                       backupFile.renameTo( new File(fileName+"-failed")); //$NON-NLS-1$
+                                       File crashLog = new File(fileName+"-errorlog.txt"); //$NON-NLS-1$
                                        FileOutputStream fout;
                                        try {
                                                fout = new FileOutputStream( crashLog );
@@ -416,22 +423,22 @@ public class Backup extends Dialog implements FkActionEventListener {
 
                                break;
                        case ACTION_OKAY:
-                               lblStatusVerified.setText("Valid: Yes");
+                               lblStatusVerified.setText(Messages.Backup_44);
                                progressBar.setSelection(66000);
                                m=new MessageBox(shell, SWT.ICON_INFORMATION);
-                               m.setText("Backup successful");
-                               m.setMessage("Backup was verified and saved.");
+                               m.setText(Messages.Backup_45);
+                               m.setMessage(Messages.Backup_46);
                                m.open();
                                shell.close();
                                break;
                        case ACTION_WAITING:
                                cmpBackupFileSelect.dispose();
-                               createWaitingScreen("Press the FinalKey button to allow backup.\nPress and hold, or wait, to abort.");
+                               createWaitingScreen(Messages.Backup_47);
                                shell.layout();
                                break;
                        case ACTION_WORKING:
                                cmpWaiting.dispose();
-                               createStatusView("Backing up...");
+                               createStatusView(Messages.Backup_48);
                                shell.layout();
                                shell.setEnabled(false);
                                break;
@@ -453,24 +460,24 @@ public class Backup extends Dialog implements FkActionEventListener {
                        {
                        case ACTION_ABORTED:
                                m = new MessageBox(shell, SWT.ICON_ERROR);
-                               m.setText("Restore aborted");
-                               m.setMessage("You did not press the button within 5 second, restore aborted.");
+                               m.setText(Messages.Backup_49);
+                               m.setMessage(Messages.Backup_50);
                                m.open();
                                shell.close();
                                break;
                        case ACTION_ERROR:
                                disconnect=true;
                                m = new MessageBox(shell, SWT.ICON_ERROR);
-                               m.setText("Restore Error");
-                               m.setMessage("Something went wrong, the backup was not fully restored, error: "+event.data);
+                               m.setText(Messages.Backup_51);
+                               m.setMessage(Messages.Backup_52+event.data);
                                m.open();
                                break;
                        case ACTION_OKAY:
-                               lblStatusVerified.setText("Restore complete.");
+                               lblStatusVerified.setText(Messages.Backup_53);
                                lblStatusVerified.setVisible(true);
                                m = new MessageBox(shell, SWT.ICON_INFORMATION);
-                               m.setText("Restore success");
-                               m.setMessage("The backup has been restored to your FinalKey.\nPress the FinalKey button now, so the blinking stops.");
+                               m.setText(Messages.Backup_54);
+                               m.setMessage(Messages.Backup_55);
                                FkManager.getInstance().disconnect();
                                m.open();
                                shell.close();
@@ -478,19 +485,19 @@ public class Backup extends Dialog implements FkActionEventListener {
                        case ACTION_WAITING:
                                shell.setEnabled(false);
                                cmpBackupFileSelect.dispose();
-                               createWaitingScreen("Press the FinalKey button to allo restore.\nPress and hold, or wait, to abort.");
+                               createWaitingScreen(Messages.Backup_56);
                                shell.layout();
                                break;
                        case ACTION_WORKING:
                                cmpWaiting.dispose();
-                               createStatusView("Writing data to FinalKey...");
+                               createStatusView(Messages.Backup_57);
                                lblStatusVerified.setVisible(false);
                                shell.layout();
                                break;
                        case FILE_ERROR:
                                m = new MessageBox(shell, SWT.ICON_ERROR);
-                               m.setText("Restore Aborted");
-                               m.setMessage("There was a problem with the backup file: "+event.data);
+                               m.setText(Messages.Backup_58);
+                               m.setMessage(Messages.Backup_59+event.data);
                                m.open();
                                shell.setEnabled(true);
                                break;
@@ -505,8 +512,8 @@ public class Backup extends Dialog implements FkActionEventListener {
                        if(event.type == FkActionEventType.STATE_ERROR )
                        {
                                m = new MessageBox(shell, SWT.ICON_ERROR);
-                               m.setText("State error");
-                               m.setMessage("The FinalKey was in an unexpected state, operation failed.");
+                               m.setText(Messages.Backup_60);
+                               m.setMessage(Messages.Backup_61);
                                m.open();
                                disconnect=true;
                        }
@@ -540,7 +547,7 @@ public class Backup extends Dialog implements FkActionEventListener {
                lblStatusMsg.setText(msg);
 
                progressBar = new ProgressBar(cmpStatus, SWT.NONE);
-               progressBar.setToolTipText("Progress");
+               progressBar.setToolTipText(Messages.Backup_62);
                progressBar.setMaximum(66000);
                FormData fd_progressBar = new FormData();
                fd_progressBar.right = new FormAttachment(lblStatusMsg, 0, SWT.RIGHT);
@@ -554,7 +561,7 @@ public class Backup extends Dialog implements FkActionEventListener {
                fd_lblStatusVerified.top = new FormAttachment(progressBar, 6);
                fd_lblStatusVerified.left = new FormAttachment(lblStatusMsg, 0, SWT.LEFT);
                lblStatusVerified.setLayoutData(fd_lblStatusVerified);
-               lblStatusVerified.setText("Valid: Not verified yet");
+               lblStatusVerified.setText(Messages.Backup_63);
 
                btnStatusOk = new Button(cmpStatus, SWT.NONE);
                fd_lblStatusVerified.bottom = new FormAttachment(btnStatusOk, -6);
@@ -562,7 +569,7 @@ public class Backup extends Dialog implements FkActionEventListener {
                fd_btnStatusOk.bottom = new FormAttachment(100, -10);
                fd_btnStatusOk.right = new FormAttachment(100, -10);
                btnStatusOk.setLayoutData(fd_btnStatusOk);
-               btnStatusOk.setText("OK");
+               btnStatusOk.setText(Messages.Backup_64);
                btnStatusOk.setVisible(false);
 
        }
index c1e12ef..efd3cf0 100644 (file)
@@ -108,7 +108,7 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                fd_lblNewLabel.top = new FormAttachment(0, 10);
                fd_lblNewLabel.left = new FormAttachment(0, 10);
                lblNewLabel.setLayoutData(fd_lblNewLabel);
-               lblNewLabel.setText("Current Password");
+               lblNewLabel.setText(Messages.ChangePassPrompt_0);
 
                txtCurrentPass = new Text(content, SWT.BORDER | SWT.PASSWORD);
                fd_lblNewLabel.right = new FormAttachment(txtCurrentPass, -6);
@@ -133,7 +133,7 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                fd_lblNewLabel_1.top = new FormAttachment(label, 6);
                fd_lblNewLabel_1.right = new FormAttachment(lblNewLabel, 0, SWT.RIGHT);
                lblNewLabel_1.setLayoutData(fd_lblNewLabel_1);
-               lblNewLabel_1.setText("New Password");
+               lblNewLabel_1.setText(Messages.ChangePassPrompt_1);
 
                txtNewPassA = new Text(content, SWT.BORDER | SWT.PASSWORD);
                FormData fd_txtNewPassA = new FormData();
@@ -150,7 +150,7 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                txtNewPassB.setLayoutData(fd_txtNewPassB);
 
                lblRepeat = new Label(content, SWT.NONE);
-               lblRepeat.setText("Repeat");
+               lblRepeat.setText(Messages.ChangePassPrompt_2);
                lblRepeat.setAlignment(SWT.RIGHT);
                FormData fd_lblRepeat = new FormData();
                fd_lblRepeat.left = new FormAttachment(0, 10);
@@ -168,10 +168,11 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
 
                btnAbort = new Button(content, SWT.NONE);
                FormData fd_btnAbort = new FormData();
+               fd_btnAbort.right = new FormAttachment(lblNewLabel, 74);
                fd_btnAbort.top = new FormAttachment(label_1, 5);
                fd_btnAbort.left = new FormAttachment(lblNewLabel, 0, SWT.LEFT);
                btnAbort.setLayoutData(fd_btnAbort);
-               btnAbort.setText("Abort");
+               btnAbort.setText(Messages.ChangePassPrompt_3);
                btnAbort.addSelectionListener( new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
                                shell.close();
@@ -180,9 +181,9 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
 
                btnGo = new Button(content, SWT.NONE);
                FormData fd_btnGo = new FormData();
-               fd_btnGo.left = new FormAttachment(txtCurrentPass, -89);
-               fd_btnGo.top = new FormAttachment(btnAbort, -22);
                fd_btnGo.bottom = new FormAttachment(btnAbort, 0, SWT.BOTTOM);
+               fd_btnGo.top = new FormAttachment(label_1, 6);
+               fd_btnGo.left = new FormAttachment(txtCurrentPass, -126);
                fd_btnGo.right = new FormAttachment(txtCurrentPass, 0, SWT.RIGHT);
                btnGo.setLayoutData(fd_btnGo);
                btnGo.addSelectionListener( new SelectionAdapter() {
@@ -196,8 +197,8 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                                        if( txtNewPassA.getText().length() < 10 )
                                        {
                                                m = new MessageBox(shell, SWT.ICON_WARNING|SWT.YES|SWT.NO);
-                                               m.setText("Short password");
-                                               m.setMessage("Secure passwords need to be long and complex. Your password can be up to 32 characters long, do you want to continue with the short password?");
+                                               m.setText(Messages.ChangePassPrompt_4);
+                                               m.setMessage(Messages.ChangePassPrompt_5);
                                                if( m.open() == SWT.YES )
                                                {
                                                        if( format )
@@ -213,8 +214,8 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                                        }
                                } else {
                                        m = new MessageBox(shell, SWT.ICON_ERROR);
-                                       m.setText("Passwords do not match");
-                                       m.setMessage("The new passwords you entered do not match, try again.");
+                                       m.setText(Messages.ChangePassPrompt_6);
+                                       m.setMessage(Messages.ChangePassPrompt_7);
                                        m.open();
                                        shell.setEnabled(true);
                                }
@@ -225,11 +226,11 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
 
                if( format )
                {
-                       btnGo.setText("Format");
-                       setText("Format your FinalKey");
+                       btnGo.setText(Messages.ChangePassPrompt_8);
+                       setText(Messages.ChangePassPrompt_9);
                } else {
-                       btnGo.setText("Re-Encrypt");
-                       setText("Change password");
+                       btnGo.setText(Messages.ChangePassPrompt_10);
+                       setText(Messages.ChangePassPrompt_11);
                }
                
        }
@@ -256,9 +257,9 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                
                if(format )
                {
-                       lblProgressMsg.setText("Formatting...");
+                       lblProgressMsg.setText(Messages.ChangePassPrompt_12);
                } else {
-                       lblProgressMsg.setText("Re-encrypting... Do not unplug The FinalKey!");
+                       lblProgressMsg.setText(Messages.ChangePassPrompt_13);
                }
 
                progressBar = new ProgressBar(content, SWT.NONE);
@@ -274,14 +275,19 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                fd_btnClose.bottom = new FormAttachment(100, -10);
                fd_btnClose.right = new FormAttachment(lblProgressMsg, 0, SWT.RIGHT);
                btnClose.setLayoutData(fd_btnClose);
-               btnClose.setText("Done");
+               btnClose.setText(Messages.ChangePassPrompt_14);
                btnClose.setVisible(false);
                
                btnClose.addSelectionListener( new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
+                               shell.setEnabled(false);
                                if(format)
                                {
                                        FkManager.getInstance().disconnect();
+                                       MessageBox d = new MessageBox(shell, SWT.ICON_INFORMATION);
+                                       d.setText(Messages.ChangePassPrompt_15);
+                                       d.setMessage(Messages.ChangePassPrompt_16);
+                                       d.open();
                                }
                                shell.close();
                        }
@@ -337,26 +343,24 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                fd_lblWaitText.top = new FormAttachment(0, 10);
                fd_lblWaitText.left = new FormAttachment(animation, 6);
                lblWaitText.setLayoutData(fd_lblWaitText);
-               lblWaitText.setText("Working...");
+               lblWaitText.setText(Messages.ChangePassPrompt_17);
 
        }
        
        @Override
        public void fkActionEvent(FkActionEvent event) {
-               
+
                MessageBox d;
-               System.out.println("Event: "+event);
-               
                switch( event.type )
                {
                case ACTION_ABORTED:
                        d = new MessageBox(shell, SWT.ICON_WARNING);
-                       d.setText("Aborted");
+                       d.setText(Messages.ChangePassPrompt_18);
                        if(format)
                        {
-                               d.setMessage("Formatting was aborted.\nMaybe you did not press the FinalKey button in time, or you held it down.");
+                               d.setMessage(Messages.ChangePassPrompt_19);
                        } else {
-                               d.setMessage("Re-encryption was aborted.\nMaybe you did not press the FinalKey button in time, or you held it down.");
+                               d.setMessage(Messages.ChangePassPrompt_20);
                        }
                        d.open();
                        shell.close();
@@ -364,9 +368,15 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                case STATE_ERROR:
                case ACTION_ERROR:
                        d = new MessageBox(shell, SWT.ICON_ERROR);
-                       d.setText("Error");
+                       d.setText(Messages.ChangePassPrompt_21);
                        d.setMessage(event.data);
                        d.open();
+                       
+                       if(event.action == 'F' )
+                       {
+                               FkManager.getInstance().disconnect();
+                       }
+                       
                        shell.close();
                        break;
                case ACTION_OKAY:
@@ -375,9 +385,9 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                        
                        if( format )
                        {
-                               lblProgressMsg.setText("Format complete.");
+                               lblProgressMsg.setText(Messages.ChangePassPrompt_22);
                        } else {
-                               lblProgressMsg.setText("Re-encryption complete.");
+                               lblProgressMsg.setText(Messages.ChangePassPrompt_23);
                        }
 
                        break;
@@ -388,14 +398,14 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
 
                        if( event.action == 'p' )
                        {
-                               lblWaitText.setText("Press FinalKey button to re-encrypt.\nPress and hold to abort.");
+                               lblWaitText.setText(Messages.ChangePassPrompt_24);
                        } else if( event.action == 'f' )
                        {
-                               if( event.data.compareTo("stage1")==0 )
+                               if( event.data.compareTo("press1")==0 ) //$NON-NLS-1$
                                {
-                                       lblWaitText.setText("Press button to format.\nPress and hold to abort.");
+                                       lblWaitText.setText(Messages.ChangePassPrompt_26);
                                } else {
-                                       lblWaitText.setText("Press button again.");
+                                       lblWaitText.setText(Messages.ChangePassPrompt_27);
                                }
                        }
                        shell.layout();
@@ -403,7 +413,7 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                        break;
                case ACTION_WORKING:
                        content.dispose();
-                       if( event.data.compareTo( "next" )==0 )
+                       if( event.data.compareTo( "next" )==0 ) //$NON-NLS-1$
                        {
                                createProgress();
                        } else {
@@ -416,6 +426,11 @@ public class ChangePassPrompt extends Dialog implements FkActionEventListener {
                case PROGRESS_UPDATE:
                        try {
                                progressBar.setSelection( Integer.parseInt(event.data) );
+                               
+                               if(event.action=='f' && event.data.contains("255")) //$NON-NLS-1$
+                               {
+                                       lblProgressMsg.setText(Messages.ChangePassPrompt_30);
+                               }
                        } catch(Exception e)
                        {
                                
index e4e44ac..4c342c0 100644 (file)
@@ -20,7 +20,7 @@ public interface FkActionEventListener {
                
                public String toString()
                {
-                       return("Event {\n  Type: "+type+"\n  Data: "+data+"\n  Account: "+((acc!=null)?acc.toString():"null")+"\n  Action:"+action+"\n}");
+                       return("Event {\n  Type: "+type+"\n  Data: "+data+"\n  Account: "+((acc!=null)?acc.toString():"null")+"\n  Action:"+action+"\n}"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
                }
        }
        public enum FkActionEventType { ACTION_ABORTED, ACTION_OKAY, ACTION_ERROR, ACTION_WAITING, ACTION_WORKING, STATE_ERROR, UNEXPECTED_ACTION_RESULT_ERROR, PROGRESS_UPDATE, FILE_ERROR };
index 3c52867..58fb77d 100644 (file)
@@ -6,8 +6,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.spi.CharsetProvider;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Vector;
@@ -16,11 +14,6 @@ import jssc.SerialPort;
 import jssc.SerialPortException;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-
-import sun.awt.CharsetString;
-import sun.util.locale.provider.AvailableLanguageTags;
-
 import com.sun.corba.se.impl.ior.ByteBuffer;
 
 import fkgui.FkActionEventListener.FkActionEvent;
@@ -119,7 +112,7 @@ public class FkManager implements ActionListener {
                        {
                                t++;
                                Thread.sleep(5);
-                               
+
                                if( com.serialPort.getInputBufferBytesCount() > 0 )
                                {
                                        msg += com.serialPort.readString();
@@ -1539,7 +1532,7 @@ public class FkManager implements ActionListener {
                                                {
                                                        data="";
                                                        com.serialPort.writeByte((byte)'y');
-                                                       Display.getDefault().asyncExec( new FkActionEventMsg(delegate, FkActionEventListener.FkActionEventType.ACTION_WAITING, "WAITING",null,'f') );
+                                                       Display.getDefault().asyncExec( new FkActionEventMsg(delegate, FkActionEventListener.FkActionEventType.ACTION_WAITING, "press1",null,'f') );
                                                        state++;
                                                }
 
@@ -1632,7 +1625,7 @@ public class FkManager implements ActionListener {
 
                                                if( state == 2 && data.contains("[lock]") )
                                                {
-                                                       Display.getDefault().asyncExec( new FkActionEventMsg(delegate, FkActionEventListener.FkActionEventType.ACTION_ERROR, "Current password was not accepted.",null,'f') );
+                                                       Display.getDefault().asyncExec( new FkActionEventMsg(delegate, FkActionEventListener.FkActionEventType.ACTION_ERROR, "Current password was not accepted.",null,'F') );
                                                        return;
                                                }
                                        }
index 72ce011..9e0d5b6 100644 (file)
@@ -134,7 +134,6 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
        private Group grpBackupAndRestore;
        private Group grpChangePassword;
        private Label lblAlwaysUseA;
-       private Button btnReencrypt;
        private Group grpFormat;
        private Label lblNewLabel;
        private Button btnNewButton;
@@ -142,6 +141,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
        
        private Button btnFkSettingsSave;
        private Label lblMakeSureYou;
+       private Button btnReencrypt;
 
        
        
@@ -268,7 +268,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                // Create a pop-up menu components
                showMain = new MenuItem(Messages.MainWin_7);
                hideMain = new MenuItem(Messages.MainWin_8);
-               exitApp  = new MenuItem("Quit");
+               exitApp  = new MenuItem(Messages.MainWin_19);
 
                showMain.addActionListener(new ActionListener() {
                        @Override
@@ -353,8 +353,13 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
 
        private void destroySysTrayIcon()
        {
-               sysTrayIconVisible=false;
-               SystemTray.getSystemTray().remove(trayIcon);
+               new Thread( new Runnable() {
+                       public void run() {
+                               sysTrayIconVisible=false;
+                               SystemTray.getSystemTray().remove(trayIcon);
+                       }
+               } ).start();
+
        }
 
        private void clearSystray(Boolean addExitBtn) {
@@ -689,7 +694,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                                        }
                                }
 
-                               new Thread( new TrayIconMessageTask(numAccounts +" "+ (( numAccounts >1)?Messages.MainWin_1:Messages.MainWin_2)) ).start();
+                               new Thread( new TrayIconMessageTask(numAccounts +" "+ (( numAccounts >1)?Messages.MainWin_1:Messages.MainWin_2)) ).start(); //$NON-NLS-1$
 
                        }
 
@@ -815,7 +820,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                txtBanner.addVerifyListener(new VerifyListener() {
                        @Override
                        public void verifyText(VerifyEvent arg0) {
-                               System.out.println("Verify:"+arg0.text );
+                               System.out.println("Verify:"+arg0.text ); //$NON-NLS-1$
                                arg0.doit=false;
                                if(arg0.text.length()==0)
                                {
@@ -842,16 +847,15 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                Label lblKeyboardLayout = new Label(group, SWT.NONE);
                lblKeyboardLayout.setAlignment(SWT.RIGHT);
                FormData fd_lblKeyboardLayout = new FormData();
-               fd_lblKeyboardLayout.bottom = new FormAttachment(100, -27);
                fd_lblKeyboardLayout.right = new FormAttachment(lblBannerName, 0, SWT.RIGHT);
-               fd_lblKeyboardLayout.left = new FormAttachment(0, 10);
+               fd_lblKeyboardLayout.left = new FormAttachment(lblBannerName, 0, SWT.LEFT);
                lblKeyboardLayout.setLayoutData(fd_lblKeyboardLayout);
                lblKeyboardLayout.setText(Messages.MainWin_lblKeyboardLayout_text);
 
                cmbLayout = new Combo(group, SWT.READ_ONLY);
+               fd_lblKeyboardLayout.top = new FormAttachment(cmbLayout, 0, SWT.CENTER);
                FormData fd_cmbLayout = new FormData();
                fd_cmbLayout.top = new FormAttachment(txtBanner, 6);
-               fd_cmbLayout.bottom = new FormAttachment(100, -23);
                fd_cmbLayout.right = new FormAttachment(0, 395);
                fd_cmbLayout.left = new FormAttachment(0, 149);
                cmbLayout.setLayoutData(fd_cmbLayout);
@@ -902,9 +906,9 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                        }
                });
                FormData fd_btnSave = new FormData();
-               fd_btnSave.left = new FormAttachment(cmbLayout, 218);
+               fd_btnSave.left = new FormAttachment(100, -72);
+               fd_btnSave.bottom = new FormAttachment(100, -10);
                fd_btnSave.right = new FormAttachment(100, -10);
-               fd_btnSave.bottom = new FormAttachment(100, -3);
                btnFkSettingsSave.setLayoutData(fd_btnSave);
                btnFkSettingsSave.setText(Messages.MainWin_btnSave_text);
                grpBackupAndRestore.setLayoutData(fd_grpBackupAndRestore);
@@ -912,13 +916,12 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
 
                grpChangePassword = new Group(composite, SWT.NONE);
                grpChangePassword.setText(Messages.MainWin_grpChangePassword_text);
-               grpChangePassword.setLayout(new FormLayout());
                FormData fd_grpChangePassword = new FormData();
                fd_grpChangePassword.top = new FormAttachment(grpBackupAndRestore, 6);
                fd_grpChangePassword.right = new FormAttachment(group, 0, SWT.RIGHT);
 
                Button btnBackup = new Button(grpBackupAndRestore, SWT.CENTER);
-               btnBackup.setImage(SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/backup.png"));
+               btnBackup.setImage(SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/backup.png")); //$NON-NLS-1$
                FormData fd_btnBackup = new FormData();
                fd_btnBackup.top = new FormAttachment(0, 10);
                fd_btnBackup.bottom = new FormAttachment(100, -10);
@@ -936,7 +939,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                });
 
                btnNewButton = new Button(grpBackupAndRestore, SWT.NONE);
-               btnNewButton.setImage(SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/restore.png"));
+               btnNewButton.setImage(SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/restore.png")); //$NON-NLS-1$
                FormData fd_btnNewButton = new FormData();
                fd_btnNewButton.bottom = new FormAttachment(btnBackup, 0, SWT.BOTTOM);
                fd_btnNewButton.right = new FormAttachment(100, -10);
@@ -963,65 +966,77 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                fd_lblMakeSureYou.top = new FormAttachment(0, 10);
                lblMakeSureYou.setLayoutData(fd_lblMakeSureYou);
                lblMakeSureYou.setText(Messages.MainWin_lblMakeSureYou_text);
+               grpChangePassword.setLayout(new FormLayout());
                fd_grpChangePassword.left = new FormAttachment(0, 10);
                grpChangePassword.setLayoutData(fd_grpChangePassword);
 
                lblAlwaysUseA = new Label(grpChangePassword, SWT.NONE);
-               lblAlwaysUseA.setText(Messages.MainWin_lblAlwaysUseA_text);
                FormData fd_lblAlwaysUseA = new FormData();
-               fd_lblAlwaysUseA.bottom = new FormAttachment(0, 79);
                fd_lblAlwaysUseA.top = new FormAttachment(0, 10);
-               fd_lblAlwaysUseA.right = new FormAttachment(0, 675);
+               fd_lblAlwaysUseA.right = new FormAttachment(0, 573);
                fd_lblAlwaysUseA.left = new FormAttachment(0, 10);
                lblAlwaysUseA.setLayoutData(fd_lblAlwaysUseA);
-
-               btnReencrypt = new Button(grpChangePassword, SWT.NONE);
-               btnReencrypt.setText(Messages.MainWin_btnReencrypt_text);
-               FormData fd_btnReencrypt = new FormData();
-               fd_btnReencrypt.left = new FormAttachment(lblAlwaysUseA, -102);
-               fd_btnReencrypt.bottom = new FormAttachment(100, -10);
-               fd_btnReencrypt.top = new FormAttachment(lblAlwaysUseA, 6);
-               fd_btnReencrypt.right = new FormAttachment(lblAlwaysUseA, 0, SWT.RIGHT);
-               btnReencrypt.setLayoutData(fd_btnReencrypt);
-               btnReencrypt.addSelectionListener( new SelectionAdapter() {
-                       public void widgetSelected(SelectionEvent e) {
-                               shell.setEnabled(false);
-
-                               MessageBox d;
-                               d= new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO);
-                               d.setText("Danger ahead");
-                               d.setMessage("Changing your password will re-encrypt all accounts on your FinalKey.\nThis may take a while, and if the process is interrupted, data may be unaccessible.\nIt is highly recommended that you backup your FinalKey before proceeding.\nBe sure to remember the new password, your FinalKey can not be unlocked without it!\nDo you wish to continue ?");
-                               if( d.open() == SWT.YES )
-                               {
-                                       ChangePassPrompt p = new ChangePassPrompt(shell, shell.getStyle());
-                                       p.setText("Re-encrypt with new password");
-                                       p.open(false);
-                               } else {
-                                       d = new MessageBox(shell, SWT.ICON_INFORMATION );
-                                       d.setText("Aborted");
-                                       d.setMessage("Not changing the password.");
-                                       d.open();
-                               }
-                               shell.setEnabled(true);
-                       }
-               });
+               lblAlwaysUseA.setText(Messages.MainWin_lblAlwaysUseA_text);
 
                grpFormat = new Group(composite, SWT.NONE);
-               fd_grpChangePassword.bottom = new FormAttachment(100, -236);
+               fd_grpChangePassword.bottom = new FormAttachment(100, -213);
                grpFormat.setText(Messages.MainWin_grpFormat_text);
+               grpFormat.setLayout(new FormLayout());
                FormData fd_grpFormat = new FormData();
                fd_grpFormat.top = new FormAttachment(grpChangePassword, 6);
-               fd_grpFormat.left = new FormAttachment(group, 0, SWT.LEFT);
                fd_grpFormat.right = new FormAttachment(group, 0, SWT.RIGHT);
-               fd_grpFormat.bottom = new FormAttachment(100, -167);
+               fd_grpFormat.left = new FormAttachment(group, 0, SWT.LEFT);
+               fd_grpFormat.bottom = new FormAttachment(100, -136);
+               fd_lblAlwaysUseA.bottom = new FormAttachment(100, -61);
+               
+               btnReencrypt = new Button(grpChangePassword, SWT.NONE);
+               FormData fd_btnReencrypt = new FormData();
+               fd_btnReencrypt.bottom = new FormAttachment(100, -10);
+               fd_btnReencrypt.right = new FormAttachment(100, -10);
+               btnReencrypt.setLayoutData(fd_btnReencrypt);
+               btnReencrypt.setText("Re-Encrypt");
+               
+                               btnReencrypt.addSelectionListener( new SelectionAdapter() {
+                                       public void widgetSelected(SelectionEvent e) {
+                                               shell.setEnabled(false);
+               
+                                               MessageBox d;
+                                               d= new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO);
+                                               d.setText(Messages.MainWin_30);
+                                               d.setMessage(Messages.MainWin_31);
+                                               if( d.open() == SWT.YES )
+                                               {
+                                                       ChangePassPrompt p = new ChangePassPrompt(shell, shell.getStyle());
+                                                       p.setText(Messages.MainWin_35);
+                                                       p.open(false);
+                                               } else {
+                                                       d = new MessageBox(shell, SWT.ICON_INFORMATION );
+                                                       d.setText(Messages.MainWin_36);
+                                                       d.setMessage(Messages.MainWin_37);
+                                                       d.open();
+                                               }
+                                               shell.setEnabled(true);
+                                       }
+                               });
                grpFormat.setLayoutData(fd_grpFormat);
 
+
                lblNewLabel = new Label(grpFormat, SWT.NONE);
-               lblNewLabel.setBounds(10, 0, 366, 40);
+               FormData fd_lblNewLabel = new FormData();
+               fd_lblNewLabel.bottom = new FormAttachment(0, 40);
+               fd_lblNewLabel.right = new FormAttachment(0, 376);
+               fd_lblNewLabel.top = new FormAttachment(0);
+               fd_lblNewLabel.left = new FormAttachment(0, 10);
+               lblNewLabel.setLayoutData(fd_lblNewLabel);
                lblNewLabel.setText(Messages.MainWin_lblNewLabel_text_1);
 
                btnFormat = new Button(grpFormat, SWT.NONE);
-               btnFormat.setBounds(594, 14, 81, 26);
+               FormData fd_btnFormat = new FormData();
+               fd_btnFormat.top = new FormAttachment(100, -36);
+               fd_btnFormat.left = new FormAttachment(100, -91);
+               fd_btnFormat.bottom = new FormAttachment(100, -10);
+               fd_btnFormat.right = new FormAttachment(100, -10);
+               btnFormat.setLayoutData(fd_btnFormat);
                btnFormat.setText(Messages.MainWin_btnNewButton_1_text);
                btnFormat.addSelectionListener( new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
@@ -1029,19 +1044,19 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
 
                                MessageBox d;
                                d= new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO);
-                               d.setText("Danger ahead");
-                               d.setMessage("Formatting your FinalKey overwrites all stored data, all accounts will be lost and unrecoverable. Are you sure you want to erase all data ?");
+                               d.setText(Messages.MainWin_38);
+                               d.setMessage(Messages.MainWin_39);
                                if( d.open() == SWT.YES )
                                {
                                        ChangePassPrompt p = new ChangePassPrompt(shell, shell.getStyle());
-                                       p.setText("Format The FinalKey");
+                                       p.setText(Messages.MainWin_40);
                                        p.newBanner = txtBanner.getText();
-                                       p.newLayout = ""+(cmbLayout.getSelectionIndex()+1);
+                                       p.newLayout = ""+(cmbLayout.getSelectionIndex()+1); //$NON-NLS-1$
                                        p.open(true);
                                } else {
                                        d = new MessageBox(shell, SWT.ICON_INFORMATION );
-                                       d.setText("Aborted");
-                                       d.setMessage("Format aborted.");
+                                       d.setText(Messages.MainWin_46);
+                                       d.setMessage(Messages.MainWin_48);
                                        d.open();
                                }
                                shell.setEnabled(true);
@@ -1339,6 +1354,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                cmpSettings.setLayout(new FormLayout());
 
                chkAutoHide = new Button(cmpSettings, SWT.CHECK);
+               chkAutoHide.setToolTipText(Messages.MainWin_chkAutoHide_toolTipText);
                chkAutoHide.setText(Messages.MainWin_6);
                chkAutoHide.setSelection( prefs.getBoolean( PREF_AUTOHIDE, false ) );
                FormData fd_chkAutoHide = new FormData();
@@ -1352,6 +1368,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                });
 
                chkSortByAccountId = new Button(cmpSettings, SWT.CHECK);
+               chkSortByAccountId.setToolTipText(Messages.MainWin_chkSortByAccountId_toolTipText);
                fd_chkAutoHide.right = new FormAttachment(chkSortByAccountId, 0, SWT.RIGHT);
                chkSortByAccountId.setText(Messages.MainWin_9);
                chkSortByAccountId.setSelection( prefs.getBoolean( PREF_SORT_BY_ID_KEY, false) );
@@ -1369,6 +1386,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                });
 
                chkShowAccountId = new Button(cmpSettings, SWT.CHECK);
+               chkShowAccountId.setToolTipText(Messages.MainWin_chkShowAccountId_toolTipText);
                FormData fd_chkShowAccountId = new FormData();
                fd_chkShowAccountId.left = new FormAttachment(0, 10);
                fd_chkShowAccountId.right = new FormAttachment(100, -10);
@@ -1384,6 +1402,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                });
 
                chkCheckForUpdates = new Button(cmpSettings, SWT.CHECK);
+               chkCheckForUpdates.setToolTipText(Messages.MainWin_chkCheckForUpdates_toolTipText);
                FormData fd_chkCheckForUpdates = new FormData();
                fd_chkCheckForUpdates.left = new FormAttachment(0, 10);
                fd_chkCheckForUpdates.right = new FormAttachment(100, -10);
@@ -1399,6 +1418,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                });
 
                btnShowaccountsReady = new Button(cmpSettings, SWT.CHECK);
+               btnShowaccountsReady.setToolTipText(Messages.MainWin_btnShowaccountsReady_toolTipText);
                btnShowaccountsReady.setSelection( prefs.getBoolean( PREF_SHOW_ACCOUNTS_READY_NOTICE, true) );
                FormData fd_btnShowaccountsReady = new FormData();
                fd_btnShowaccountsReady.left = new FormAttachment(0, 10);
@@ -1414,6 +1434,7 @@ public class MainWin implements ConsoleMsg, UpdateCheckResultListener {
                });
 
                Button btnShowSystrayName = new Button( cmpSettings, SWT.CHECK );
+               btnShowSystrayName.setToolTipText(Messages.MainWin_btnShowSystrayName_toolTipText);
                btnShowSystrayName.setSelection( prefs.getBoolean( PREF_SHOW_SYSTRAY_NAME,  true) );
                FormData fd_btnShowSystrayName = new FormData();
                fd_btnShowSystrayName.left = new FormAttachment(0, 10);
index 1069fe3..4c97096 100644 (file)
@@ -4,6 +4,85 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
        private static final String BUNDLE_NAME = "fkgui.messages"; //$NON-NLS-1$
+       public static String Backup_0;
+       public static String Backup_1;
+       public static String Backup_10;
+       public static String Backup_11;
+       public static String Backup_14;
+       public static String Backup_15;
+       public static String Backup_16;
+       public static String Backup_17;
+       public static String Backup_18;
+       public static String Backup_19;
+       public static String Backup_2;
+       public static String Backup_20;
+       public static String Backup_21;
+       public static String Backup_24;
+       public static String Backup_25;
+       public static String Backup_27;
+       public static String Backup_28;
+       public static String Backup_29;
+       public static String Backup_3;
+       public static String Backup_33;
+       public static String Backup_34;
+       public static String Backup_37;
+       public static String Backup_38;
+       public static String Backup_39;
+       public static String Backup_4;
+       public static String Backup_40;
+       public static String Backup_41;
+       public static String Backup_44;
+       public static String Backup_45;
+       public static String Backup_46;
+       public static String Backup_47;
+       public static String Backup_48;
+       public static String Backup_49;
+       public static String Backup_50;
+       public static String Backup_51;
+       public static String Backup_52;
+       public static String Backup_53;
+       public static String Backup_54;
+       public static String Backup_55;
+       public static String Backup_56;
+       public static String Backup_57;
+       public static String Backup_58;
+       public static String Backup_59;
+       public static String Backup_6;
+       public static String Backup_60;
+       public static String Backup_61;
+       public static String Backup_62;
+       public static String Backup_63;
+       public static String Backup_64;
+       public static String Backup_8;
+       public static String Backup_9;
+       public static String ChangePassPrompt_0;
+       public static String ChangePassPrompt_1;
+       public static String ChangePassPrompt_10;
+       public static String ChangePassPrompt_11;
+       public static String ChangePassPrompt_12;
+       public static String ChangePassPrompt_13;
+       public static String ChangePassPrompt_14;
+       public static String ChangePassPrompt_15;
+       public static String ChangePassPrompt_16;
+       public static String ChangePassPrompt_17;
+       public static String ChangePassPrompt_18;
+       public static String ChangePassPrompt_19;
+       public static String ChangePassPrompt_2;
+       public static String ChangePassPrompt_20;
+       public static String ChangePassPrompt_21;
+       public static String ChangePassPrompt_22;
+       public static String ChangePassPrompt_23;
+       public static String ChangePassPrompt_24;
+       public static String ChangePassPrompt_26;
+       public static String ChangePassPrompt_27;
+       public static String ChangePassPrompt_3;
+       public static String ChangePassPrompt_30;
+       public static String ChangePassPrompt_4;
+       public static String ChangePassPrompt_5;
+       public static String ChangePassPrompt_6;
+       public static String ChangePassPrompt_7;
+       public static String ChangePassPrompt_8;
+       public static String ChangePassPrompt_9;
        public static String MainWin_0;
        public static String MainWin_2;
        public static String MainWin_20;
@@ -18,20 +97,31 @@ public class Messages extends NLS {
        public static String MainWin_16;
        public static String MainWin_17;
        public static String MainWin_18;
+       public static String MainWin_19;
        public static String MainWin_22;
        public static String MainWin_25;
        public static String MainWin_26;
        public static String MainWin_27;
        public static String MainWin_3;
+       public static String MainWin_30;
+       public static String MainWin_31;
        public static String MainWin_32;
        public static String MainWin_33;
        public static String MainWin_34;
+       public static String MainWin_35;
+       public static String MainWin_36;
+       public static String MainWin_37;
+       public static String MainWin_38;
+       public static String MainWin_39;
        public static String MainWin_4;
+       public static String MainWin_40;
        public static String MainWin_41;
        public static String MainWin_42;
        public static String MainWin_43;
        public static String MainWin_45;
+       public static String MainWin_46;
        public static String MainWin_47;
+       public static String MainWin_48;
        public static String MainWin_5;
        public static String MainWin_52;
        public static String MainWin_53;
@@ -102,6 +192,31 @@ public class Messages extends NLS {
        public static String NewAccountDialog_8;
        public static String NewAccountDialog_9;
        public static String PermitCountDownDialog_0;
+       public static String SaveSettingsDialog_0;
+       public static String SaveSettingsDialog_1;
+       public static String SaveSettingsDialog_10;
+       public static String SaveSettingsDialog_12;
+       public static String SaveSettingsDialog_13;
+       public static String SaveSettingsDialog_14;
+       public static String SaveSettingsDialog_15;
+       public static String SaveSettingsDialog_16;
+       public static String SaveSettingsDialog_17;
+       public static String SaveSettingsDialog_2;
+       public static String SaveSettingsDialog_20;
+       public static String SaveSettingsDialog_21;
+       public static String SaveSettingsDialog_22;
+       public static String SaveSettingsDialog_23;
+       public static String SaveSettingsDialog_24;
+       public static String SaveSettingsDialog_25;
+       public static String SaveSettingsDialog_26;
+       public static String SaveSettingsDialog_27;
+       public static String SaveSettingsDialog_3;
+       public static String SaveSettingsDialog_4;
+       public static String SaveSettingsDialog_5;
+       public static String SaveSettingsDialog_6;
+       public static String SaveSettingsDialog_7;
+       public static String SaveSettingsDialog_8;
+       public static String SaveSettingsDialog_9;
        public static String SerialWorker_0;
        public static String SerialWorker_10;
        public static String SerialWorker_11;
@@ -179,7 +294,6 @@ public class Messages extends NLS {
        public static String MainWin_btnShowaccountsReady_text;
        public static String NewAccountDialog_btnNoSpecialSymbols_text;
        public static String NewAccountDialog_51;
-       public static String MainWin_btnF_text;
        public static String MainWin_btnCheckButton_text;
        public static String MainWin_btnHideToTrayOnClose_toolTipText;
        public static String MainWin_tbtmThisFinalkey_text;
@@ -195,26 +309,31 @@ public class Messages extends NLS {
        public static String MainWin_group_1_text;
        public static String MainWin_grpBackupAndRestore_text;
        public static String MainWin_btnSave_text;
-       public static String MainWin_lblNewLabel_text;
-       public static String MainWin_text_1_text_2;
-       public static String MainWin_lblNewLabel_1_text;
-       public static String MainWin_lblNewPsw1_text;
-       public static String MainWin_lblRepeat_text;
-       public static String MainWin_btnChange_text;
+
+       
+       
        public static String MainWin_grpFormat_text;
        public static String MainWin_lblNewLabel_text_1;
-       public static String MainWin_lblY_text;
+
        public static String MainWin_btnBackupYourFinalkey_text;
        public static String MainWin_btnNewButton_text;
-       public static String MainWin_lblNewLabel_1_text_1;
+
        public static String MainWin_btnFormatMyFinalkey_text;
        public static String MainWin_btnNewButton_1_text;
        public static String MainWin_lblMakeSureYou_text;
-       public static String MainWin_lblYouHaveNever_text;
+       
        public static String MainWin_lblAlwaysUseA_text;
        public static String MainWin_grpChangePassword_text;
-       public static String MainWin_lblNewPassword_text;
+       
        public static String MainWin_btnReencrypt_text;
+       public static String UpdateChecker_11;
+       public static String UpdateChecker_16;
+       public static String MainWin_chkAutoHide_toolTipText;
+       public static String MainWin_chkSortByAccountId_toolTipText;
+       public static String MainWin_chkShowAccountId_toolTipText;
+       public static String MainWin_chkCheckForUpdates_toolTipText;
+       public static String MainWin_btnShowaccountsReady_toolTipText;
+       public static String MainWin_btnShowSystrayName_toolTipText;
 
        static {
                // initialize resource bundle
index f8257d6..b72eb7f 100644 (file)
@@ -84,9 +84,9 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
        private void createSetLayout() {
                if(bannerTxt == null)
                {
-                       setText("Save Settings, Save the keyboard layout");
+                       setText(Messages.SaveSettingsDialog_0);
                } else {
-                       setText("Save Settings, step 2/2: Save the keyboard layout");
+                       setText(Messages.SaveSettingsDialog_1);
                }
 
                Composite cmpSetLayout = new Composite(shell, SWT.NONE);
@@ -105,7 +105,7 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                fd_lblL.top = new FormAttachment(0, 10);
                fd_lblL.left = new FormAttachment(0, 10);
                lblL.setLayoutData(fd_lblL);
-               lblL.setText("Ready to set the keyboard layout.\nWhen you press GO, The FinalKey will start blinking.\nPress the button on the FinalKey to proceed.");
+               lblL.setText(Messages.SaveSettingsDialog_2);
 
                Button btnSaveLayout = new Button(cmpSetLayout, SWT.NONE);
                FormData fd_btnSaveLayout = new FormData();
@@ -113,10 +113,10 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                fd_btnSaveLayout.top = new FormAttachment(0, 135);
                fd_btnSaveLayout.left = new FormAttachment(0, 515);
                btnSaveLayout.setLayoutData(fd_btnSaveLayout);
-               btnSaveLayout.setText("GO");
+               btnSaveLayout.setText(Messages.SaveSettingsDialog_3);
                btnSaveLayout.addSelectionListener( new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
-                               lblL.setText("Press the button now.");
+                               lblL.setText(Messages.SaveSettingsDialog_4);
                                animation.setVisible(true);
                                animation.setPlaying(true);
                                Button btn = (Button)e.widget;
@@ -145,7 +145,7 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                fd_lblTest.left = new FormAttachment(0, 10);
                fd_lblTest.right = new FormAttachment(0, 52);
                lblTest.setLayoutData(fd_lblTest);
-               lblTest.setText("Test:");
+               lblTest.setText(Messages.SaveSettingsDialog_5);
                
                txtTest = new Text(cmpSetLayout, SWT.BORDER);
                FormData fd_txtTest = new FormData();
@@ -161,9 +161,9 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                
                if(Layout == 0)
                {
-                       setText("Save Settings, Save the banner text");
+                       setText(Messages.SaveSettingsDialog_6);
                } else {
-                       setText("Save Settings, step 1/2: Save the banner text");
+                       setText(Messages.SaveSettingsDialog_7);
                }
                
                cmpSetBanner = new Composite(shell, SWT.NONE);
@@ -181,7 +181,7 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                fd_lblK.top = new FormAttachment(0, 10);
                fd_lblK.left = new FormAttachment(0, 10);
                lblK.setLayoutData(fd_lblK);
-               lblK.setText("Ready to set the banner text.\nWhen you press GO, The FinalKey will start blinking, and you have 5 seconds\nto press the button on your FinalKey to confirm saving the new banner.\n");
+               lblK.setText(Messages.SaveSettingsDialog_8);
                
                
                animation = new Animation(cmpSetBanner, SWT.NONE, 4);
@@ -203,12 +203,12 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                fd_btnGoSaveBanner.right = new FormAttachment(100, -10);
                fd_btnGoSaveBanner.left = new FormAttachment(100, -117);
                btnGoSaveBanner.setLayoutData(fd_btnGoSaveBanner);
-               btnGoSaveBanner.setText("GO");
+               btnGoSaveBanner.setText(Messages.SaveSettingsDialog_9);
                
                btnGoSaveBanner.forceFocus();
                btnGoSaveBanner.addSelectionListener( new SelectionAdapter() {
                        public void widgetSelected(SelectionEvent e) {
-                               lblK.setText("Press the button now.");
+                               lblK.setText(Messages.SaveSettingsDialog_10);
                                animation.setVisible(true);
                                animation.setPlaying(true);
                                Button btn = (Button)e.widget;
@@ -233,14 +233,14 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                
                if( event.action == 'b' )
                {
-                       System.out.println("Event (B):" + event.toString() );
+                       System.out.println("Event (B):" + event.toString() ); //$NON-NLS-1$
                        
                        if( event.type == FkActionEventType.ACTION_OKAY )
                        {
                                FkManager.getInstance().setBanner(bannerTxt);
                                m = new MessageBox(shell, SWT.ICON_INFORMATION);
-                               m.setText("Saved");
-                               m.setMessage("Banner is set to "+bannerTxt);
+                               m.setText(Messages.SaveSettingsDialog_12);
+                               m.setMessage(Messages.SaveSettingsDialog_13+bannerTxt);
                                m.open();
                                
                                if(Layout!=0)
@@ -256,8 +256,8 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                        if( event.type == FkActionEventType.ACTION_ABORTED )
                        {
                                m = new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO );
-                               m.setText("Set banner was aborted");
-                               m.setMessage("The banner was not saved. You did not press the button in time, or you held it down to cancel saving the banner. Do you want to try again ?");
+                               m.setText(Messages.SaveSettingsDialog_14);
+                               m.setMessage(Messages.SaveSettingsDialog_15);
 
                                cmpSetBanner.dispose();
                                if( m.open() == SWT.YES  )
@@ -266,8 +266,8 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                                        shell.layout();
                                } else if( Layout != 0 ) {
                                        m = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES | SWT.NO );
-                                       m.setText("Continue saving layout");
-                                       m.setMessage("You said no to save the banner, but you also wanted to change the keyboard layout. Do you want save the keyboard layout ?");
+                                       m.setText(Messages.SaveSettingsDialog_16);
+                                       m.setMessage(Messages.SaveSettingsDialog_17);
                                        if( m.open() == SWT.YES )
                                        {
                                                createSetLayout();
@@ -282,18 +282,18 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
 
                if( event.action == 'k')
                {
-                       System.out.println("Event (k):" + event.toString() );
+                       System.out.println("Event (k):" + event.toString() ); //$NON-NLS-1$
                        if( event.type == FkActionEventType.ACTION_OKAY )
                        {
-                               if( txtTest.getText().compareTo( "Supported specials:!\"#$%&@?()[]-.,+{}_/<>=|'\\;: *" ) == 0 )
+                               if( txtTest.getText().compareTo( "Supported specials:!\"#$%&@?()[]-.,+{}_/<>=|'\\;: *" ) == 0 ) //$NON-NLS-1$
                                {
                                        m = new MessageBox(shell, SWT.ICON_INFORMATION );
-                                       m.setText("Saved");
-                                       m.setMessage("Layout verified.");
+                                       m.setText(Messages.SaveSettingsDialog_20);
+                                       m.setMessage(Messages.SaveSettingsDialog_21);
                                } else {
                                        m = new MessageBox(shell, SWT.ICON_INFORMATION );
-                                       m.setText("Saved");
-                                       m.setMessage("The layout was saved, but it did not look right, maybe the FinalKey application runs with a different input-language setting than the application you want to use, but if your FinalKey is writing the wrong letters then try another layout.");
+                                       m.setText(Messages.SaveSettingsDialog_22);
+                                       m.setMessage(Messages.SaveSettingsDialog_23);
                                }
                                FkManager.getInstance().setCurrentLayout( FkManager.getInstance().getAvailableLayouts()[Layout-1] );
                                m.open();
@@ -306,8 +306,8 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                if( event.type == FkActionEventType.ACTION_ERROR  )
                {
                        m = new MessageBox(shell, SWT.ICON_ERROR );
-                       m.setText("Error - All changes may not have been saved");
-                       m.setMessage( "Something went wrong, here is the output: "+event.data);
+                       m.setText(Messages.SaveSettingsDialog_24);
+                       m.setMessage( Messages.SaveSettingsDialog_25+event.data);
                        m.open();
                        shell.close();
                        
@@ -316,8 +316,8 @@ public class SaveSettingsDialog extends Dialog implements FkActionEventListener
                if( event.type == FkActionEventType.STATE_ERROR )
                {
                        m = new MessageBox(shell, SWT.ICON_ERROR );
-                       m.setText("State Error - All changes may not have been saved");
-                       m.setMessage( "Something went wrong, here is the output: "+event.data);
+                       m.setText(Messages.SaveSettingsDialog_26);
+                       m.setMessage( Messages.SaveSettingsDialog_27+event.data);
                        m.open();
                        shell.close();
                }
index 11c1d09..8292c71 100644 (file)
@@ -15,12 +15,12 @@ public class UpdateChecker implements Runnable {
 
        //Change locale with -Duser.country=DK -Duser.language=da parms for the java command.
 
-       static final String CHECK_URL="http://finalkey.net/gui/update.php";
-       static final String CUR_VER="0.1.2.1";
-       static final String PLATFORM=System.getProperty("os.name")+"_"+System.getProperty("os.arch");
+       static final String CHECK_URL="http://finalkey.net/gui/update.php"; //$NON-NLS-1$
+       static final String CUR_VER="0.5"; //$NON-NLS-1$
+       static final String PLATFORM=System.getProperty("os.name")+"_"+System.getProperty("os.arch"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
        static final String LANG = Locale.getDefault().getLanguage();
 
-       public static final String REQUEST_STRING = CHECK_URL + "?version="+CUR_VER+"&platform="+PLATFORM+"&lang="+LANG;
+       public static final String REQUEST_STRING = CHECK_URL + "?version="+CUR_VER+"&platform="+PLATFORM+"&lang="+LANG; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
        public interface UpdateCheckResultListener {
                public class UpdateResultEvent
@@ -65,10 +65,10 @@ public class UpdateChecker implements Runnable {
        public void run() {
 
                UpdateCheckResult state = UpdateCheckResult.CHECK_FAILED;
-               String res="";
-               String ver="No Version";
-               String msg="No Update";
-               System.out.println("Checking for new version: "+REQUEST_STRING);
+               String res=""; //$NON-NLS-1$
+               String ver="No Version"; //$NON-NLS-1$
+               String msg="No Update"; //$NON-NLS-1$
+               System.out.println(Messages.UpdateChecker_11+REQUEST_STRING);
                try {
                        URL url = new URL(REQUEST_STRING);
                        BufferedReader  in = new BufferedReader ( new InputStreamReader( url.openStream() ) );
@@ -76,14 +76,14 @@ public class UpdateChecker implements Runnable {
                        in.close();
                        state = UpdateCheckResult.NO_UPDATE;
 
-                       String[] lines = res.split( "," );
+                       String[] lines = res.split( "," ); //$NON-NLS-1$
 
-                       if( lines[0].compareTo("1")==0 )
+                       if( lines[0].compareTo("1")==0 ) //$NON-NLS-1$
                        {
                                state = UpdateCheckResult.UPDATE_AVAILABLE;
                                ver = lines[1];
                                msg = lines[2];
-                               msg=msg.replace("<br>", "\n");
+                               msg=msg.replace("<br>", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
                                msg.trim();
 
                        }
@@ -91,7 +91,7 @@ public class UpdateChecker implements Runnable {
                        in.close();
 
                } catch (Exception e) {
-                       System.out.println("Trouble checking for new version: "+e.getMessage() );
+                       System.out.println(Messages.UpdateChecker_16+e.getMessage() );
                }
 
                Display.getDefault().asyncExec( new AutoUpdaterResultTask(new UpdateResultEvent(state , ver, msg), delegate) );
index dfa76f4..09617d4 100644 (file)
@@ -1,5 +1,82 @@
-#Eclipse modern messages class
-#Wed Apr 01 10:37:47 EEST 2015
+Backup_0=FinalKey - Restore
+Backup_1=FinalKey - Backup
+Backup_10=File exists
+Backup_11=Will not overwrite an existing file.\nChose a new name or delete the existing file.
+Backup_14=Could not create file.
+Backup_15=The file could not be created\: 
+Backup_16=Ready to Restore
+Backup_17=Press yes to restore the backup onto the Finalkey. You will have 5 seconds to press the button on your FinalKey to allow restore.\nIf you do not want to overwrite your FinalKey, press No to abort.
+Backup_18=Aborted
+Backup_19=Restore was aborted.
+Backup_2=About backup\:\nIt is a good idea to backup your FinalKey so you don't\nlose all your logins if you lose your FinalKey or it breaks.\n\nSecurity\:\nThe FinalKey backup files are encrypted, but you should\nnever keep them on your computer or in a place where\nsomeone else may steal them. Keep your backup on\nan offline storage medium in a safe place.\n
+Backup_20=Read error
+Backup_21=Could not read the selected file.\nCheck file access permissions.
+Backup_24=Could not open file
+Backup_25=The file could not be opened\: 
+Backup_27=Save the contents of FinalKey to a file
+Backup_28=Restore the contents of a file onto FinalKey
+Backup_29=File\:
+Backup_3=Important\! Read  first\!\nThis will overwrite all data on your FinalKey with the data\nfrom the backup-file you select\!\n\nThe password needed to unlock your FinalKey will be\nthe password that was used at the time that the backup\nwas made. If you do not know the password of the\nbackup file, your FinalKey is useless.\n
+Backup_33=FinalKey Backup Files
+Backup_34=All Files
+Backup_37=Backup failed
+Backup_38=You did not press the button within 5 seconds, or you held down the button to abort the backup. Try again ?
+Backup_39=Valid\: No - Validation failed.
+Backup_4=Backup
+Backup_40=Checksum Error
+Backup_41=There were one or more errors when verifying the backup data, this may indicate a bad connection or a hardware-malfunction on the FinalKey.\nThe Backup File can NOT be restored onto the FinalKey, but it may be manually repaired by someone with a hex-editor and too much free-time. Do you want to delete the corrupted file ?
+Backup_44=Valid\: Yes
+Backup_45=Backup successful
+Backup_46=Backup was verified and saved.
+Backup_47=Press the FinalKey button to allow backup.\nPress and hold, or wait, to abort.
+Backup_48=Backing up...
+Backup_49=Restore aborted
+Backup_50=You did not press the button within 5 second, restore aborted.
+Backup_51=Restore Error
+Backup_52=Something went wrong, the backup was not fully restored, error\: 
+Backup_53=Restore complete.
+Backup_54=Restore success
+Backup_55=The backup has been restored to your FinalKey.\nPress the FinalKey button now, so the blinking stops.
+Backup_56=Press the FinalKey button to allow restore.\nPress and hold, or wait, to abort.
+Backup_57=Writing data to FinalKey...
+Backup_58=Restore Aborted
+Backup_59=There was a problem with the backup file\: 
+Backup_6=Restore
+Backup_60=State error
+Backup_61=The FinalKey was in an unexpected state, operation failed.
+Backup_62=Progress
+Backup_63=Valid\: Not verified yet
+Backup_64=OK
+Backup_8=Ready to backup
+Backup_9=When you press OK, The FinalKey will start blinking, you then have 5 seconds to press the button to allow backup.
+ChangePassPrompt_0=Current Password
+ChangePassPrompt_1=New Password
+ChangePassPrompt_10=Re-Encrypt
+ChangePassPrompt_11=Change password
+ChangePassPrompt_12=Formatting entries...
+ChangePassPrompt_13=Re-encrypting... Do not unplug The FinalKey\!
+ChangePassPrompt_14=Done
+ChangePassPrompt_15=Disconnecting
+ChangePassPrompt_16=Your FinalKey has been formatted with the new password.\nYou need to connect again if you want to use it.
+ChangePassPrompt_17=Working...
+ChangePassPrompt_18=Aborted
+ChangePassPrompt_19=Formatting was aborted.\nMaybe you did not press the FinalKey button in time, or you held it down.
+ChangePassPrompt_2=Repeat
+ChangePassPrompt_20=Re-encryption was aborted.\nMaybe you did not press the FinalKey button in time, or you held it down.
+ChangePassPrompt_21=Error
+ChangePassPrompt_22=Format complete.
+ChangePassPrompt_23=Re-encryption complete.
+ChangePassPrompt_24=Press FinalKey button to re-encrypt.\nPress and hold to abort.
+ChangePassPrompt_26=Press button to format.\nPress and hold to abort.
+ChangePassPrompt_27=Press button again.
+ChangePassPrompt_3=Abort
+ChangePassPrompt_30=Writing header...
+ChangePassPrompt_4=Short password
+ChangePassPrompt_5=Secure passwords need to be long and complex. Your password can be up to 32 characters long, do you want to continue with the short password?
+ChangePassPrompt_6=Passwords do not match
+ChangePassPrompt_7=The new passwords you entered do not match, try again.
+ChangePassPrompt_8=Format
+ChangePassPrompt_9=Format your FinalKey
 MainWin_0=Already checking for updates...
 MainWin_1=accounts ready.
 MainWin_10=Search... (Ctrl+f)
@@ -11,6 +88,7 @@ MainWin_15=Connect
 MainWin_16=Opening browser to 
 MainWin_17=You should close this program and download/use the new one.
 MainWin_18=Password
+MainWin_19=Quit
 MainWin_2=account ready.
 MainWin_20=Error\: Was not able to visit website.
 MainWin_21=The following exception caused the error\:
@@ -19,15 +97,25 @@ MainWin_25=User + Pass
 MainWin_26=User
 MainWin_27=Pass
 MainWin_3=Checking for updates is disabled.
+MainWin_30=Danger ahead
+MainWin_31=Changing your password will re-encrypt all accounts on your FinalKey.\nThis may take a while, and if the process is interrupted, data may be unaccessible.\nIt is highly recommended that you backup your FinalKey before proceeding.\nBe sure to remember the new password, your FinalKey can not be unlocked without it\!\nDo you wish to continue ?
 MainWin_32=\ of 256 free.
 MainWin_33=Final Key - 
 MainWin_34=Disconnect
+MainWin_35=Re-encrypt with new password
+MainWin_36=Aborted
+MainWin_37=Not changing the password.
+MainWin_38=Danger ahead
+MainWin_39=Formatting your FinalKey overwrites all stored data, all accounts will be lost and unrecoverable. Are you sure you want to erase all data ?
 MainWin_4=Port
+MainWin_40=Format The FinalKey
 MainWin_41=Final Key (Connecting...)
 MainWin_42=Final Key (Not connected)
 MainWin_43=Connect
 MainWin_45=Accounts
+MainWin_46=Aborted
 MainWin_47=New Account
+MainWin_48=Format aborted.
 MainWin_5=Open Account
 MainWin_52=FinalKey GUI Version 
 MainWin_53=\ available.
@@ -37,10 +125,8 @@ MainWin_7=Show FinalKey
 MainWin_8=Hide FinalKey
 MainWin_9=Sort by account id
 MainWin_btnBackupYourFinalkey_text=Backup
-MainWin_btnChange_text=Re-encrypt
 MainWin_btnCheckButton_text=Hide to System Tray instead of closing
 MainWin_btnCheckForUpdates_text=Check for updates on start
-MainWin_btnF_text=F
 MainWin_btnFormatMyFinalkey_text=Format my FinalKey
 MainWin_btnHideToTrayOnClose_toolTipText=Instead of closing the application completely when the close button is pressed, close only the main window and keep running in the System Tray icon.
 MainWin_btnNewButton_1_text=Format
@@ -49,7 +135,13 @@ MainWin_btnReencrypt_text=Re-Encrypt
 MainWin_btnSaveBanner_text=Save
 MainWin_btnSave_text=Save
 MainWin_btnShowAccountId_text=Show account id
+MainWin_btnShowSystrayName_toolTipText=Show the banner text of your FinalKey when hovering over the icon. This is convenient if you are connected to more than one FinalKey.
 MainWin_btnShowaccountsReady_text=Show "Accounts Ready" status popup after connection
+MainWin_btnShowaccountsReady_toolTipText=Disable this if it annoyes you to see the "acocunts ready" popup on the systemtray when connection has been made to your FinalKey.
+MainWin_chkAutoHide_toolTipText=This is convenient if you mostly use FinalKey GUI from the systemtray and do not want another window in your way.
+MainWin_chkCheckForUpdates_toolTipText=Contact http\://finalkey.net/ to check if there are new versions available for your platform.
+MainWin_chkShowAccountId_toolTipText=Show the unique account-id in front of each account-name. Convenient if you are used to using your FinalKey from a terinal, or if you have different accounts with the same name.
+MainWin_chkSortByAccountId_toolTipText=Sort the account list in the same way as they are stored internally on the FinalKey. Convenient if you are used to using your FinalKey from a terminal.
 MainWin_group_1_text=Security
 MainWin_group_text=General settings
 MainWin_grpBackupAndRestore_text=Backup and Restore
@@ -58,18 +150,9 @@ MainWin_grpFormat_text=Format
 MainWin_lblAlwaysUseA_text=Always use a secure password, but don't forget it, you can not unlock your FinalKey without it\!\nChanging the password can result in data-loss if the process is interrupted,\nYou should take a backup before changing your password.\nChanging master-password takes a while as it re-encrypts all accounts.
 MainWin_lblBannerName_text=Banner Name
 MainWin_lblF_text=Banner Text
-MainWin_lblKeyb_text=Keyb
 MainWin_lblKeyboardLayout_text=Keyboard Layout
 MainWin_lblMakeSureYou_text=Make sure you have a backup of your FinalKey so you\ndon't lose everything if it breaks or is lost.\nAlways keep backup-files in a safe place\!\nBackup-files should not be stored on your computer
-MainWin_lblNewLabel_1_text=Current Pass
-MainWin_lblNewLabel_1_text_1=It's nice to have a backup so you don't lose everything\nif your Finalkey is lost or breaks.\n\nAlways keep your backups in a safe place.
-MainWin_lblNewLabel_text=Always use a secure master-password, but don't forget it, you can not unlock\nyour FinalKey without it\! Changing the password is risky, it can result in data-loss\nif the process is interrupted, you should take a backup before changing your\nmaster-password. Changing master-password takes a while as it re-encrypts accounts.
 MainWin_lblNewLabel_text_1=Delete everything and set a new password.\nThis makes all previous data unrecoverable.
-MainWin_lblNewPassword_text=New Password
-MainWin_lblNewPsw1_text=New Pass
-MainWin_lblRepeat_text=Repeat
-MainWin_lblY_text=Y
-MainWin_lblYouHaveNever_text=You have never taken a backup of your FinalKey.
 MainWin_tbtmSettings_text=Settings
 MainWin_tbtmThisFinalkey_text=This Finalkey
 MainWin_text_1_text=01234567890123456789012345678912
@@ -139,6 +222,31 @@ NewAccountDialog_8=Cancel
 NewAccountDialog_9=Next
 NewAccountDialog_btnNoSpecialSymbols_text=No special symbols
 PermitCountDownDialog_0=\ seconds left.
+SaveSettingsDialog_0=Save Settings, Save the keyboard layout
+SaveSettingsDialog_1=Save Settings, step 2/2\: Save the keyboard layout
+SaveSettingsDialog_10=Press the button now.
+SaveSettingsDialog_12=Saved
+SaveSettingsDialog_13=Banner is set to 
+SaveSettingsDialog_14=Set banner was aborted
+SaveSettingsDialog_15=The banner was not saved. You did not press the button in time, or you held it down to cancel saving the banner. Do you want to try again ?
+SaveSettingsDialog_16=Continue saving layout
+SaveSettingsDialog_17=You said no to save the banner, but you also wanted to change the keyboard layout. Do you want save the keyboard layout ?
+SaveSettingsDialog_2=Ready to set the keyboard layout.\nWhen you press GO, The FinalKey will start blinking.\nPress the button on the FinalKey to proceed.
+SaveSettingsDialog_20=Saved
+SaveSettingsDialog_21=Layout verified.
+SaveSettingsDialog_22=Saved
+SaveSettingsDialog_23=The layout was saved, but it did not look right, maybe the FinalKey application runs with a different input-language setting than the application you want to use, but if your FinalKey is writing the wrong letters then try another layout.
+SaveSettingsDialog_24=Error - All changes may not have been saved
+SaveSettingsDialog_25=Something went wrong, here is the output\: 
+SaveSettingsDialog_26=State Error - All changes may not have been saved
+SaveSettingsDialog_27=Something went wrong, here is the output\: 
+SaveSettingsDialog_3=GO
+SaveSettingsDialog_4=Press the button now.
+SaveSettingsDialog_5=Test\:
+SaveSettingsDialog_6=Save Settings, Save the banner text
+SaveSettingsDialog_7=Save Settings, step 1/2\: Save the banner text
+SaveSettingsDialog_8=Ready to set the banner text.\nWhen you press GO, The FinalKey will start blinking, and you have 5 seconds\nto press the button on your FinalKey to confirm saving the new banner.\n
+SaveSettingsDialog_9=GO
 SerialWorker_0=Connecting to 
 SerialWorker_10=Error while reading from port.
 SerialWorker_11=\nAccess Granted.
@@ -170,7 +278,7 @@ SerialWorker_46=Reason\: FinalKey was disconnected during an operation.
 SerialWorker_47=Solution\: Ensure that FinalKey is properly connected (Check your cable). Then try again.
 SerialWorker_48=Reason\: SerialPortException\:
 SerialWorker_49=Solution\: Disconnect and reconnect FinalKey. Then try again.
-SerialWorker_5=State error, disconnect and reconnect FinalKey and try again.
+SerialWorker_5=State error\: Disconnect and reconnect FinalKey and try again.
 SerialWorker_50=Alternative solution\: Restart FinalKeyGUI. Then try again.
 SerialWorker_6=Error\: Excption thrown while disconnecting.
 SerialWorker_7=Logging in...
@@ -210,3 +318,5 @@ TriggerDialog_6=Username + Password
 TriggerDialog_7=\: Ready with username
 TriggerDialog_8=Focus username field and press FinalKey Switch.\nPress and hold to cancel.
 TriggerDialog_9=FinalKey is not ready for this action, press and hold FinalKey switch until it stops blinking, then try again.
+UpdateChecker_11=Checking for new version\: 
+UpdateChecker_16=Trouble checking for new version\: 
\ No newline at end of file
index 1ad77cf..94945a7 100644 (file)
-#Eclipse modern messages class
-#Thu Sep 18 13:35:00 EEST 2014
-MainWin_0=Checker allerede om der er opdateringer...
+Backup_0=FinalKey - Genskab
+Backup_1=FinalKey - Backup
+Backup_10=Fil findes
+Backup_11=Vil ikke overskrive eksisterende fil.\nVælg et nyt filnavn eller slet eksisterende fil.
+Backup_14=Kunne ikke oprette fil
+Backup_15=Filen kunne ikke oprettes: 
+Backup_16=Klar til at genskabe
+Backup_17=Tryk ja for at ligge backuppen tilbage på FinalKey. Du får 5 sekunder til at trykke på FinalKey knappen og tillade genskab..\nHvis du ikke vil overskrive din FinalKey, tryk nej for at afbryde.
+Backup_18=Afbrudt
+Backup_19=Genskabelse blev afbudt
+Backup_2=Om backup:\nDet er en god ide at tage backup af din FinalKey så du ikke't\nmister dine konti hvis du mister din FinalKey.\n\nSikkerhed:\nFinalKey backup filer er krypteret, men du bør ikke\nopbevare dem på din computer, eller et sted hvor andre kan\nkopiere dem. Gem din backup på et\noffline lagermedie på et stikkert sted.
+Backup_20=Kunne ikke læse fil
+Backup_21=Den valgte fil kunne ikke læses.\nCheck adgangsrettigheder på filen.
+Backup_24=Kunne ikke åbne fil
+Backup_25=Filen kunne ikke åbnes: 
+Backup_27=Gem indholdet af FinalKey til en fil
+Backup_28=Genskab en FinalKey fra en backup fil.
+Backup_29=Fil:
+Backup_3=Vigtigt\! Læs først\!\nDette vil overskrive alt data på din FinalKey med data fra\nbackup-filen du vælger\!\n\nAdgangskoden der skal bruges til at låse din FinalKey op bliver\nadgangskoden der blev brugt da backuppen blev lavet.\nHvis du ikke kender koden der blev brugt til backup-filen\nkan du ikke låse din FinalKey op igen\!
+Backup_33=FinalKey Backup Filer
+Backup_34=Alle Filer
+Backup_37=Backup fejlede
+Backup_38=Du trykkede ikke på knappen indenfor 5 sekunder, eller du holdte den inde og afbrudte backuppen. Prøv igen ?
+Backup_39=Valid: Nej \u2013 Validering fejlede
+Backup_4=Backup
+Backup_40=Checksum Fejl
+Backup_41=Der var en eller flere fejl under verificeringen af backup data, dette kan indikere en dårlig forbindelse eller en hardware-fejl på FinalKey.\nBackup filen kan IKKE ligges tilbage på FinalKey, men den kan måske repareres manuelt af nogen med en hex-editor og alt for meget fritid. Vil du slette den korrupte fil ?
+Backup_44=Valid: Ja
+Backup_45=Backup gennemført
+Backup_46=Backup blev verificeret og gemt.
+Backup_47=Tryk på FinalKey knap for at tillade backup.\nHold nede, eller vent, for at afbryde.
+Backup_48=Foretager backup...
+Backup_49=Genskabelse afbrudt
+Backup_50=Du trykkede ikke på FinalKey knap indenfor 5 sekunder, afbrudt.
+Backup_51=Genskab Fejl
+Backup_52=Noget gik galt, backuppen blev ikke genskabt, fejlbesked: 
+Backup_53=Genskab gennemført.
+Backup_54=FinalKey blev genskabt
+Backup_55=Backuppen blev lagt over på din FinalKey.\nTryk på FinalKey knap nu, så den holder op med at blinke.
+Backup_56=Tryk på FinalKey knap for at tillade genskab.\nHold inde, eller vent, for at afbryde.
+Backup_57=Skriver data til FinalKey...
+Backup_58=Genskab afbrudt
+Backup_59=Der var et problem med backup-filen: 
+Backup_6=Genskab
+Backup_60=Tilstands fejl
+Backup_61=FinalKey var i en uventet tilstand, handlingen fejlede.
+Backup_62=Fremgang
+Backup_63=Valid: Ikke valideret endnu
+Backup_64=OK
+Backup_8=Klar til backup
+Backup_9=Når du trykker OK begynder FinalKey at blinke, derefter har du 5 sekunder til at trykke på knappen for at tillade backup.
+ChangePassPrompt_1=Ny Adgangskode
+ChangePassPrompt_10=Omkryptér
+ChangePassPrompt_11=Ændr adgangskode
+ChangePassPrompt_12=Formaterer Lager...
+ChangePassPrompt_13=Omkrypterer... Tag ikke stikket ud\!
+ChangePassPrompt_14=Færdig
+ChangePassPrompt_15=Afbryder
+ChangePassPrompt_16=Din FinalKey er blevet formateret med den nye kode.\nDu skal forbinde til den igen hvis du vil bruge den.
+ChangePassPrompt_17=Arbejder...
+ChangePassPrompt_18=Afbrudt
+ChangePassPrompt_19=Formatering afbrudt.\nEnten trykkede du ikke på FinalKey knap i tide, eller du holdte den inde.
+ChangePassPrompt_2=Gentag
+ChangePassPrompt_20=Omkryptering blev afbrudt.\nMåske trykkede du ikke på FinalKey knap i tide, eller du holdt den inde.
+ChangePassPrompt_21=Fejl
+ChangePassPrompt_22=Formatering gennemført.
+ChangePassPrompt_23=Omkryptering gennemført.
+ChangePassPrompt_24=Tryk FinalKey knap for at omkryptere.\nHold nede for at afbryde.
+ChangePassPrompt_26=Tryk FinalKey knap for at formatere.\nHold nede for at afbryde.
+ChangePassPrompt_27=Tryk på FinalKey knap igen.
+ChangePassPrompt_3=Afbryd
+ChangePassPrompt_30=Skriver indledning...
+ChangePassPrompt_4=Kort kode
+ChangePassPrompt_5=Sikre adgangskoder er både lange og komplekse. Du kan have op til 32 tegn i din adgangskode. Ønsker du at fortsætte med den korte kode ?
+ChangePassPrompt_6=Adgangskoder ikke ens
+ChangePassPrompt_7=De nye koder du indtastede er ikke ens, prøv igen.
+ChangePassPrompt_8=Formater
+ChangePassPrompt_9=Formater din FinalKey
+ChangePassPrompt_0=Nuværende kode
+MainWin_0=Checker allerede for opdateringer...
 MainWin_1=konti klar.
 MainWin_10=Søg... (Ctrl+f)
-MainWin_11=\nBesøger ikke hjemmesiden.
+MainWin_11=\nNot visiting the website.
 MainWin_12=Forbindelse
-MainWin_13=Besøg hjemmesiden nu?
-MainWin_14=Vis navn når musen holdes over systembakke ikonet
+MainWin_13=Besøg webstedet nu?
+MainWin_14=Vis navn når markøren er over FinalKey ikonet
 MainWin_15=Forbind
 MainWin_16=Åbner browser til 
-MainWin_17=Du kan lukke dette program nu og hente/bruge den nye version.
+MainWin_17=Luk dette program og hent det nye i stedet.
 MainWin_18=Kode
-MainWin_2=konto klar.
-MainWin_20=Fejl\: Kunne ikke åbne hjemmesiden.
-MainWin_21=Den følgende undtagelse forårsagede fejlen\:
-MainWin_22=Indtast adgangskoden til FinalKey og tryk Forbind.\n----------\n
+MainWin_19=Afslut
+MainWin_2=konti klar.
+MainWin_20=Fejl\: Kunne ikke besøge webstedet.
+MainWin_21=Den følgende undtagelse var årsag til fejlen\:
+MainWin_22=Indtast kode og tryk Forbind.\n----------\n
 MainWin_25=Bruger + Kode
 MainWin_26=Bruger
 MainWin_27=Kode
-MainWin_3=Check efter opdateringer er slået fra.
-MainWin_32=\ af 256 fri.
+MainWin_3=Check for opdateringer er slået fra.
+MainWin_30=Fare forude
+MainWin_31=Ændring af adgangskode vil omkryptere alle konti på din FinalKey.\n Dette tager et stykke tid, og hvis handlingen afbrydes kan data blive utilgængeligt.\nAnbefales derfor at du tager backup af din FinalKey før du fortsætter.\nHusk på den nye kode, din FinalKey kan ikke låses op uden den\!\nØnsker du at fortsætte ?
+MainWin_32=\ of 256 fri.
 MainWin_33=Final Key - 
 MainWin_34=Afbryd
+MainWin_35=Omkrypter med ny kode
+MainWin_36=Afbrudt
+MainWin_37=Ændrer ikke koden.
+MainWin_38=Fare forude
+MainWin_39=Formatering overskriver alt data på din FinalKey så det ikke kan genskabes. Husk på koden, din FinalKey kan ikke låses op uden..\nØnsker du at fortsætte ?
 MainWin_4=Port
+MainWin_40=Formater FinalKey
 MainWin_41=Final Key (Forbinder...)
 MainWin_42=Final Key (Ikke forbundet)
 MainWin_43=Forbind
 MainWin_45=Konti
+MainWin_46=Afbrudt
 MainWin_47=Ny Konto
+MainWin_48=Formatering afbrudt.
 MainWin_5=Åbn Konto
 MainWin_52=FinalKey GUI Version 
 MainWin_53=\ er tilgængelig.
@@ -36,10 +124,40 @@ MainWin_6=Skjul efter forbindelse
 MainWin_7=Vis FinalKey
 MainWin_8=Skjul FinalKey
 MainWin_9=Sorter efter konto id
+MainWin_btnBackupYourFinalkey_text=Backup
+MainWin_btnCheckButton_text=Gem til systembakken i stedet for at lukke.
 MainWin_btnCheckForUpdates_text=Check efter opdateringer når programmet starter
+MainWin_btnFormatMyFinalkey_text=Formater min FinalKey
+MainWin_btnHideToTrayOnClose_toolTipText=I stedet for at afslutte programmet når der trykkes på luk-knappen, forsvinder FinalKey ned i systembakken.
+MainWin_btnNewButton_1_text=Formater
+MainWin_btnNewButton_text=Genskab
+MainWin_btnReencrypt_text=Omkrypter
+MainWin_btnSaveBanner_text=Gem
+MainWin_btnSave_text=Gem
 MainWin_btnShowAccountId_text=Vis kontoid
+MainWin_btnShowSystrayName_toolTipText=Vis banner-teksten fra din FinalKey når musen holdes over ikonet i systembakken. Praktisk hvis man har flere FinalKeys.
 MainWin_btnShowaccountsReady_text=Vis "Konti klar" besked når efter forbindelse
+MainWin_btnShowaccountsReady_toolTipText=Deaktiver denne hvis du finder popup beskeden fra systembakken om hvor mange konti der er indlæst irriterende når der er forbunder til FinalKey.
+MainWin_chkAutoHide_toolTipText=Praktisk hvis du oftest bruger FinalKey GUI fra systembakken og ikke vil have endnu et vindue på din desktop.
+MainWin_chkCheckForUpdates_toolTipText=Kontakt automatisk http\://finalkey.net/ for at checke om der er ny version tilgængelig.
+MainWin_chkShowAccountId_toolTipText=Vis det unikke konti-id, praktisk hvis du ofte bruger FinalKey fra en terminal.
+MainWin_chkSortByAccountId_toolTipText=Sorter listen over konti efter konto id i stedet for alfabetisk. Praktisk hvis du ofte bruger FinalKey fra en terminal.
+MainWin_group_1_text=Sikkerhed
+MainWin_group_text=Generelt
+MainWin_grpBackupAndRestore_text=Backup og Genskab
+MainWin_grpChangePassword_text=Ændr kode
+MainWin_grpFormat_text=Formater
+MainWin_lblAlwaysUseA_text=Brug altid en sikker kode, men glem den ikke, du kan ikke låse din FinalKey op uden den\!\nÆndring af koden kan resultere i data-tab hvis handlingen afbrydes.\nDu bør derfor tage backup før du ændrer din kode.\nDet tager et stykke tid at ændre koden da den omkrypterer alle konti.
+MainWin_lblBannerName_text=Banner Navn
+MainWin_lblF_text=Banner Navn
+MainWin_lblKeyboardLayout_text=Keyboard Layout
+MainWin_lblMakeSureYou_text=Tag backup af din FinalKey så du ikke mister alting\nhvis den går i stykker eller bliver væk.\nOpbevar altid backup filer på et sikkert sted\!\nBackup filer bør ikke opbevares på din computer
+MainWin_lblNewLabel_text_1=Slet alt og sæt en ny kode.\nDenne handling fjerner alt eksisterende data på din FinalKey.
 MainWin_tbtmSettings_text=Indstillinger
+MainWin_tbtmThisFinalkey_text=Denne Finalkey
+MainWin_text_1_text=01234567890123456789012345678912
+MainWin_text_1_text_1=noname
+MainWin_text_1_toolTipText=Navnet på denne FinalKey
 NewAccountDialog_0=Fejl\: FinalKey er ikke klar.
 NewAccountDialog_1=Konto blev ikke oprettet.
 NewAccountDialog_10=Næste trin: Lav en sikker kode\!\nDu har to muligheder: Indtast selv en kode\neller lad Final Key lave en sikker kode automatisk,\ndet anbefales at lade Final Key lave tilfældig kode.
@@ -104,6 +222,31 @@ NewAccountDialog_8=Fortryd
 NewAccountDialog_9=Næste
 NewAccountDialog_btnNoSpecialSymbols_text=Ingen symboler
 PermitCountDownDialog_0=\ sekunder tilbage.
+SaveSettingsDialog_0=Gem Indstillinger, Gem kayboard layout
+SaveSettingsDialog_1=Gem Indstillinger trin 2/2: Gem kayboard layout
+SaveSettingsDialog_10=Tryk FinalKey knap nu.
+SaveSettingsDialog_12=Gemt
+SaveSettingsDialog_13=Banner sat til 
+SaveSettingsDialog_14=Set banner afbrudt.
+SaveSettingsDialog_15=Banner blev ikke sat, du trykkede ikke på FinalKey knap i tide eller du holdte den nede for at afbryde, Vil du forsøge igen ?
+SaveSettingsDialog_16=Gem keyboard layout
+SaveSettingsDialog_17=Du sagde nej til at gemme banneret, men du har også ændret keyboard-layout, ønsker du fortsat at gemme keyboard layout ?
+SaveSettingsDialog_2=Klar til at gemme keyboard layout.\nNår du trykker fortsæt begynder FinalKey og blinke, så skal du trykke på FinalKey knap for at fortsætte.
+SaveSettingsDialog_20=Gemt
+SaveSettingsDialog_21=Layout verificeret.
+SaveSettingsDialog_22=Gemt
+SaveSettingsDialog_23=Det valgte layout blev gemt, men det ser ikke ud til at det er korrekt. Hvis din FinalKey skriver de forkerte tegn eller bogstaver så skal du ændre dit layout igen.
+SaveSettingsDialog_24=Fejl, det er ikke sikkert at alle indstillinger blev gemt.
+SaveSettingsDialog_25=Der gik noget galt, her er fejlbeskeden: 
+SaveSettingsDialog_26=Tilstands fejl, det er ikke sikkert alle indstillinger blev gemt.
+SaveSettingsDialog_27=Noget gik galt, her er fejlbeskeden: 
+SaveSettingsDialog_3= Fortsæt
+SaveSettingsDialog_4=Tryk på FinalKey knap nu.
+SaveSettingsDialog_5=Test:
+SaveSettingsDialog_6=Gem Indstillinger, Gem banner tekst
+SaveSettingsDialog_7=Gem Indstillinger, trin 1/2: Gem banner tekst
+SaveSettingsDialog_8=Klar til at sætte banner teksten.\nNår du trykker forsæt begynder FinalKey at blinke, og du har 5 sekunder til\n at trykke på FinalKey knap og bekræfte at du vil ændre banner teksten.\n
+SaveSettingsDialog_9=Fortsæt
 SerialWorker_0=Forbinder til 
 SerialWorker_10=Fejl ved læsning fra port.
 SerialWorker_11=\nDer er givet adgang.
@@ -141,6 +284,7 @@ SerialWorker_6=Fejl\: Der skete en undtagelse mens forbindelsen fors
 SerialWorker_7=Logger ind...
 SerialWorker_8=Fejl\: Blev ikke bedt om adgangskode fra FinalKey, afbryd og forbind FinalKey og prøv igen.
 SerialWorker_9=Afbrudt.
+TriggerDialog_1=Returning result\:
 TriggerDialog_10=Brugernavn
 TriggerDialog_11=: Klar med kode
 TriggerDialog_12=Set cursor i kode feltet og tryk på FinalKey Knap\nHold den inde for at fortryde.
@@ -174,3 +318,5 @@ TriggerDialog_6=Brugernavn + Kode
 TriggerDialog_7=: Klar med brugernavn
 TriggerDialog_8=Set cursor i brugernavn feltet og tryk på FinalKey Knap\nHold den inde for at fortryde.
 TriggerDialog_9=FinalKey er ikke klar til at udføre handlingen. Tryk på FinalKey knap indtil den stopper med at blinke.
+UpdateChecker_11=Checker efter ny version: 
+UpdateChecker_16=Problem med at checke efter ny version: 
\ No newline at end of file
index 8b6d4cc..f9670f7 100644 (file)
@@ -232,7 +232,7 @@ public class SWTResourceManager {
         */
        public static Image decorateImage(final Image baseImage, final Image decorator, final int corner) {
                if (corner <= 0 || corner >= LAST_CORNER_KEY) {
-                       throw new IllegalArgumentException("Wrong decorate corner");
+                       throw new IllegalArgumentException("Wrong decorate corner"); //$NON-NLS-1$
                }
                Map<Image, Map<Image, Image>> cornerDecoratedImageMap = m_decoratedImageMap[corner];
                if (cornerDecoratedImageMap == null) {