Continue on i18n support

Signed-off-by: Oliver Metz <oliver@freetz.org>

lang/fbeditor_de_DE.properties

@@ -1,49 +1,57 @@
 #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-box.not_found = Fritz\!Box wurde nicht gefunden.\nBitte die Einstellungen prüfen.
-box.get_config =Hole Konfiguration von Fritz\!Box.\nBitte warten...
-box.affirmation = Sind sie sicher, dass sie die Konfiguration auf die Fritz\!Box zurückspielen wollen?\nDer Autor dieses Programms übernimmt keine Haftung für defekte Boxen!
-box.restart = Die Einstellungen wurden erfolgreich wiederhergestellt.\nDie Fritz\!Box startet jetzt neu.\n
-settings.backup = Einstellungen wiederherstellen
-box.settings_error = Die Konfiguration ist fehlerhaft und konnte nicht zurückgespielt werden!
-export.file = Export-Datei
+
+box.affirmation    = Sind sie sicher, dass sie die Konfiguration auf die Fritz!Box zur\u00FCckspielen wollen?\nDer Autor dieses Programms \u00FCbernimmt keine Haftung f\u00FCr defekte Boxen!
+box.get_config     = Hole Konfiguration von Fritz!Box.\nBitte warten...
+box.not_found      = Fritz!Box wurde nicht gefunden.\nBitte die Einstellungen pr\u00FCfen.
+box.restart        = Die Einstellungen wurden erfolgreich wiederhergestellt.\nDie Fritz!Box startet jetzt neu.\n
+box.settings_error = Die Konfiguration ist fehlerhaft und konnte nicht zur\u00FCckgespielt werden!
+
+boxinfo.firmware   = Firmware:
+boxinfo.hardware   = Hardware: 
+boxinfo.modversion = Mod-Version: 
+boxinfo.nomod      = original Firmware
+
+export.file       = Export-Datei
 export.load.error = Fehler: Datei konnte nicht geladen werden.
 export.save.error = Fehler: Datei konnte nicht gespeichert werden.
-main.error = Fehler
-main.thanks = Mein Dank geht an Enrik Berkhan, Andreas Bühmann \nund an das JFritz-Team.\n
-menu.about = Über
-settings.host_ip = Hostname / IP-Adresse:
-settings.password = Passwort:
-menu.file = Datei
-menu.new = Neu
-menu.open = Öffnen
-menu.config_read = Konfiguration einlesen
-menu.config_save = Speichern
-menu.config_write = Konfiguration zurückspielen
-menu.reconnect = Neu verbinden
-menu.exit = Beenden
-menu.edit = Bearbeiten
-menu.revert = Rückgängig
-menu.restore = Wiederherstellen
-menu.cut = Ausschneiden
-menu.copy = Kopieren
-menu.insert = Einfügen
-menu.delete = Löschen
-menu.search = Suchen
-menu.replace = Ersetzen
-menu.help = Hilfe
-menu.boxinfo = Boxinfo
-menu.settings = Einstellungen
-menu.host_ip = Hostname / IP-Adresse
-menu.password = Passwort
-menu.config_auto_read = Konfiguration automatisch einlesen
-menu.nochecks = NoChecks
-menu.line = Zeile
-menu.markall = Alles markieren
-menu.close = Schließen
-window.close = Fenster schließen
-boxinfo.nomod = original Firmware
-boxinfo.hardware = Hardware: 
-boxinfo.firmware = Firmware:
-boxinfo.modversion = Mod-Version: 
+
+main.error        = Fehler
+main.thanks       = Mein Dank geht an Enrik Berkhan, Andreas B\u00FChmann \nund an das JFritz-Team.\n
 main.unknown_file = unbenannt
-utils.restore_error = Beim Zurückspielen ist ein Fehler aufgetreten!
+
+menu.about            = \u00DCber
+menu.boxinfo          = Boxinfo
+menu.close            = Schlie\u00DFen
+menu.config_auto_read = Konfiguration automatisch einlesen
+menu.config_read      = Konfiguration einlesen
+menu.config_save      = Speichern
+menu.config_write     = Konfiguration zur\u00FCckspielen
+menu.copy             = Kopieren
+menu.cut              = Ausschneiden
+menu.delete           = L\u00F6schen
+menu.edit             = Bearbeiten
+menu.exit             = Beenden
+menu.file             = Datei
+menu.help             = Hilfe
+menu.host_ip          = Hostname / IP-Adresse
+menu.insert           = Einf\u00FCgen
+menu.line             = Zeile
+menu.markall          = Alles markieren
+menu.new              = Neu
+menu.nochecks         = NoChecks
+menu.open             = \u00D6ffnen
+menu.password         = Passwort
+menu.reconnect        = Neu verbinden
+menu.replace          = Ersetzen
+menu.restore          = Wiederherstellen
+menu.revert           = R\u00FCckg\u00E4ngig
+menu.search           = Suchen
+menu.settings         = Einstellungen
+
+settings.backup   = Einstellungen wiederherstellen
+settings.host_ip  = Hostname / IP-Adresse:
+settings.password = Passwort:
+
+utils.restore_error = Beim Zur\u00FCckspielen ist ein Fehler aufgetreten!
+
+window.close = Fenster schlie\u00DFen

lang/fbeditor_en_US.properties

@@ -1,49 +1,57 @@
 #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-box.not_found = Fritz\!Box not found.\nPlease check your settings.
-box.get_config = Getting configuration from Fritz\!Box.\nPlease wait...
-box.affirmation = Are you sure that you want to Upload this configuration to your Fritz\!Box?\nThe author will not assume responsibility for bricked devices!
-box.restart = The settings were restored sucessfully .\nYour Fritz\!Box reboots now.\n
-settings.backup = Restore configuration
+
+box.affirmation    = Are you sure that you want to Upload this configuration to your Fritz!Box?\nThe author will not assume responsibility for bricked devices!
+box.get_config     = Getting configuration from Fritz!Box.\nPlease wait...
+box.not_found      = Fritz!Box not found.\nPlease check your settings.
+box.restart        = The settings were restored sucessfully .\nYour Fritz!Box reboots now.\n
 box.settings_error = The configuration is incorrect and could not be restored.
-export.file = Exportfile
+
+boxinfo.firmware   = Firmware:
+boxinfo.hardware   = Hardware: 
+boxinfo.modversion = Mod-Version: 
+boxinfo.nomod      = original firmware
+
+export.file       = Exportfile
 export.load.error = Error: Could not load file
 export.save.error = Error: Could not save file
-main.error = Error
-main.thanks = My thanks go to Enrik Berkhan, Andreas Bühmann \nand the JFritz-Team.\n
-menu.about = About
-settings.host_ip = Hostname / IP-Address:
-settings.password = Password
-menu.file = File
-menu.new = New
-menu.open = Open
-menu.config_read = Read configuration
-menu.config_save = Save
-menu.config_write = Restore configuration
-menu.reconnect = Reconnect
-menu.exit = Exit
-menu.edit = Edit
-menu.revert = Revert
-menu.restore = Restore
-menu.cut = Cut
-menu.copy = Copy
-menu.insert = Insert
-menu.delete = Delete
-menu.search = Search
-menu.replace = Replace
-menu.help = Help
-menu.boxinfo = Boxinfo
-menu.settings = Settings
-menu.host_ip = Hostname / IP-Address
-menu.password = Password
+
+main.error        = Error
+main.thanks       = My thanks go to Enrik Berkhan, Andreas B\u00FChmann \nand the JFritz-Team.\n
+main.unknown_file = unnamed
+
+menu.about            = About
+menu.boxinfo          = Boxinfo
+menu.close            = Close
 menu.config_auto_read = Read configuration on startup
-menu.nochecks = NoChecks
-menu.line = line
-menu.markall = Mark all
-menu.close = Close
+menu.config_read      = Read configuration
+menu.config_save      = Save
+menu.config_write     = Restore configuration
+menu.copy             = Copy
+menu.cut              = Cut
+menu.delete           = Delete
+menu.edit             = Edit
+menu.exit             = Exit
+menu.file             = File
+menu.help             = Help
+menu.host_ip          = Hostname / IP-Address
+menu.insert           = Insert
+menu.line             = line
+menu.markall          = Mark all
+menu.new              = New
+menu.nochecks         = NoChecks
+menu.open             = Open
+menu.password         = Password
+menu.reconnect        = Reconnect
+menu.replace          = Replace
+menu.restore          = Restore
+menu.revert           = Revert
+menu.search           = Search
+menu.settings         = Settings
+
+settings.backup   = Restore configuration
+settings.host_ip  = Hostname / IP-Address:
+settings.password = Password
+
+utils.restore_error = An error occured while restoring configuration!
+
 window.close = Close window
-boxinfo.nomod = original firmware
-boxinfo.hardware = Hardware: 
-boxinfo.firmware = Firmware:
-boxinfo.modversion = Mod-Version: 
-main.unknown_file = unnamed
-utils.restore_error = An error occured while restoring configuration!

src/de/FBEditor/BoxInfo.java

@@ -44,7 +44,7 @@ public BoxInfo(String boxName, String firmwareVersion, String modVersion) {
 		super();
 
 		this.setSize(500, 300);
-		this.setTitle("BoxInfo");
+		this.setTitle(FBEdit.getMessage("menu.boxinfo"));
 		this.setIconImage(FBEdit.getInstance().getImageFromJAR("/icon.gif"));
 		this.setContentPane(getJPanel());
 		this.setLocationRelativeTo(FBEdit.getInstance().getframe());
@@ -100,8 +100,8 @@ private JButton getJButton() {
 		if (jButton == null) {
 			jButton = new JButton();
 			jButton.setPreferredSize(new java.awt.Dimension(115, 35));
-			jButton.setText("Schließen");
-			jButton.setToolTipText("Fenster schließen");
+			jButton.setText(FBEdit.getMessage("menu.close"));
+			jButton.setToolTipText(FBEdit.getMessage("window.close"));
 			jButton.setName("close");
 			jButton.addActionListener(new java.awt.event.ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -152,19 +152,19 @@ private JPanel getJPanel1() {
 		if (jPanel1 == null) {
 			jPanel1 = new JPanel();
 			jPanel1.setLayout(new GridLayout(4, 2));
-			JLabel jLabel = new JLabel(" Hardware:");
+			JLabel jLabel = new JLabel(FBEdit.getMessage("boxinfo.hardware"));
 			jLabel.setPreferredSize(new Dimension(100, 26));
 			jPanel1.add(jLabel);
 			jLabel2 = new JLabel();
 			jLabel2.setPreferredSize(new Dimension(100, 26));
 			jPanel1.add(jLabel2);
-			jLabel = new JLabel(" Firmware: ");
+			jLabel = new JLabel(FBEdit.getMessage("boxinfo.firmware"));
 			jLabel.setPreferredSize(new Dimension(100, 26));
 			jPanel1.add(jLabel);
 			jLabel4 = new JLabel();
 			jLabel4.setPreferredSize(new Dimension(100, 26));
 			jPanel1.add(jLabel4);
-			jLabel = new JLabel(" Mod-Version: ");
+			jLabel = new JLabel(FBEdit.getMessage("boxinfo.modversion"));
 			jLabel.setPreferredSize(new Dimension(100, 26));
 			jPanel1.add(jLabel);
 			jLabel6 = new JLabel();
@@ -177,6 +177,9 @@ private JPanel getJPanel1() {
 	public void setPanelText(String boxName, String firmwareVersion, String modVersion) {
 		jLabel2.setText(boxName);
 		jLabel4.setText(firmwareVersion);
-		jLabel6.setText(modVersion);
+		if (modVersion.equals(""))
+			jLabel6.setText(FBEdit.getMessage("boxinfo.nomod"));
+		else
+			jLabel6.setText(modVersion);
 	}
 }

src/de/FBEditor/CutAndPastePopup.java

@@ -22,15 +22,15 @@ public class CutAndPastePopup extends JComponent implements ClipboardOwner {
 	public CutAndPastePopup(ActionListen action) {
 
 		popupMenu = new JPopupMenu();
-		popupMenu.setLabel("Edit");
+		popupMenu.setLabel(FBEdit.getMessage("menu.edit"));
 
 		// hier noch nicht implementiert
 		// revert = new JMenuItem("Rückgängig");
-		cut = new JMenuItem("Ausschneiden");
-		copy = new JMenuItem("Kopieren");
-		insert = new JMenuItem("Einfügen");
-		delete = new JMenuItem("Löschen");
-		markall = new JMenuItem("Alles markieren");
+		cut = new JMenuItem(FBEdit.getMessage("menu.cut"));
+		copy = new JMenuItem(FBEdit.getMessage("menu.copy"));
+		insert = new JMenuItem(FBEdit.getMessage("menu.insert"));
+		delete = new JMenuItem(FBEdit.getMessage("menu.delete"));
+		markall = new JMenuItem(FBEdit.getMessage("menu.markall"));
 
 		clipbd  = getToolkit().getSystemClipboard();
 		// undoManager = fbedit.getUndoManager();