diff --git a/resources/languages/plugin/aimaccregwizz/resources.properties b/resources/languages/plugin/aimaccregwizz/resources.properties index 015bd422e..d8a2069a1 100644 --- a/resources/languages/plugin/aimaccregwizz/resources.properties +++ b/resources/languages/plugin/aimaccregwizz/resources.properties @@ -14,4 +14,5 @@ proxyPort=Proxy port proxyType=Proxy type proxyUsername=Proxy username proxyPassword=Proxy password -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/gibberishaccregwizz/resources.properties b/resources/languages/plugin/gibberishaccregwizz/resources.properties index dec8992ca..1b97d7156 100644 --- a/resources/languages/plugin/gibberishaccregwizz/resources.properties +++ b/resources/languages/plugin/gibberishaccregwizz/resources.properties @@ -5,4 +5,5 @@ password=Password: rememberPassword=Remember password userAndPassword=Identification existingAccount=* The account you entered is already installed. -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/icqaccregwizz/resources.properties b/resources/languages/plugin/icqaccregwizz/resources.properties index 595f6a20e..236565885 100644 --- a/resources/languages/plugin/icqaccregwizz/resources.properties +++ b/resources/languages/plugin/icqaccregwizz/resources.properties @@ -14,4 +14,5 @@ proxyPort=Proxy port proxyType=Proxy type proxyUsername=Proxy username proxyPassword=Proxy password -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/ircaccregwizz/resources.properties b/resources/languages/plugin/ircaccregwizz/resources.properties index eef79cf33..97ea35b8f 100644 --- a/resources/languages/plugin/ircaccregwizz/resources.properties +++ b/resources/languages/plugin/ircaccregwizz/resources.properties @@ -13,4 +13,5 @@ userAndPassword=Identification serverIRC=Server options=Options existingAccount=* The account you entered is already installed. -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/jabberaccregwizz/resources.properties b/resources/languages/plugin/jabberaccregwizz/resources.properties index cf8abf254..f1cfcf00b 100644 --- a/resources/languages/plugin/jabberaccregwizz/resources.properties +++ b/resources/languages/plugin/jabberaccregwizz/resources.properties @@ -30,4 +30,5 @@ userExist=This user already exist on this server. Choose another user or server. unknownXmppError=Unknown XMPP error. Verify that the server name is correct. notSamePassword=The two entered password aren't the same. -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/msnaccregwizz/resources.properties b/resources/languages/plugin/msnaccregwizz/resources.properties index 1ff05aa2b..0e100d546 100644 --- a/resources/languages/plugin/msnaccregwizz/resources.properties +++ b/resources/languages/plugin/msnaccregwizz/resources.properties @@ -5,4 +5,5 @@ password=Password: rememberPassword=Remember password uinAndPassword=ID and Password existingAccount=* The account you entered is already installed. -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/rssaccregwizz/resources.properties b/resources/languages/plugin/rssaccregwizz/resources.properties index 101c36e31..fb522eeab 100644 --- a/resources/languages/plugin/rssaccregwizz/resources.properties +++ b/resources/languages/plugin/rssaccregwizz/resources.properties @@ -6,4 +6,5 @@ rssAccountInfo=This wizard will create an RSS account for you.\n\n\ Note that you could have only one RSS account!\n\n\ You can add RSS feeds to your contact list using the "Add contact" wizard. Fill in the contact address field with the URI of the RSS feed you would like to add. rssAccountInfoTitle=RSS Account Information -rssAccountAttention=Please read attentively the information provided below! \ No newline at end of file +rssAccountAttention=Please read attentively the information provided below! +activate=Activate \ No newline at end of file diff --git a/resources/languages/plugin/sipaccregwizz/resources.properties b/resources/languages/plugin/sipaccregwizz/resources.properties index 957dcc9a9..925ef8a9c 100644 --- a/resources/languages/plugin/sipaccregwizz/resources.properties +++ b/resources/languages/plugin/sipaccregwizz/resources.properties @@ -26,4 +26,5 @@ keepAliveMethod=Keep alive method keepAliveInterval=Keep alive interval keepAliveIntervalEx=Between 1 and 3600 seconds register=REGISTER -options=OPTIONS \ No newline at end of file +options=OPTIONS +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/sshaccregwizz/resources.properties b/resources/languages/plugin/sshaccregwizz/resources.properties index 9fe77355d..c64511535 100644 --- a/resources/languages/plugin/sshaccregwizz/resources.properties +++ b/resources/languages/plugin/sshaccregwizz/resources.properties @@ -4,4 +4,5 @@ accountID=Account ID: identityFile=Identitity File: knownHosts=Known Hosts: accountDetails=SSH Account Details -existingAccount=* The account you entered is already installed. \ No newline at end of file +existingAccount=* The account you entered is already installed. +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/yahooaccregwizz/resources.properties b/resources/languages/plugin/yahooaccregwizz/resources.properties index e7b14838d..49517b0d3 100644 --- a/resources/languages/plugin/yahooaccregwizz/resources.properties +++ b/resources/languages/plugin/yahooaccregwizz/resources.properties @@ -5,4 +5,5 @@ password=Password: rememberPassword=Remember password uinAndPassword=ID and Password existingAccount=* The account you entered is already installed. -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/resources/languages/plugin/zeroconfaccregwizz/resources.properties b/resources/languages/plugin/zeroconfaccregwizz/resources.properties index 9395a3ab9..a77625a81 100644 --- a/resources/languages/plugin/zeroconfaccregwizz/resources.properties +++ b/resources/languages/plugin/zeroconfaccregwizz/resources.properties @@ -6,4 +6,5 @@ password=Password: rememberPassword=Remember password userAndPassword=Identification existingAccount=* A Bonjour account already exists. You can only install a single Bonjour account. -error=Error \ No newline at end of file +error=Error +signin=Sign in \ No newline at end of file diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java index ab8a4a79e..bbadee6b0 100644 --- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java +++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java @@ -621,4 +621,12 @@ public void refresh() this.pack(); this.repaint(); } + + /** + * Implements the WizardContainer.setFinishButtonText() method. + */ + public void setFinishButtonText(String text) + { + FINISH_TEXT = text; + } } diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java index 0b3c3ba26..1ad24edea 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomWizard.java @@ -50,6 +50,8 @@ public CreateChatRoomWizard(MainFrame mainFrame) this.setTitle(Messages.getI18NString("createChatRoomWizard").getText()); + this.setFinishButtonText(Messages.getI18NString("create").getText()); + page1 = new CreateChatRoomWizardPage1(this, newChatRoom, mainFrame.getProtocolProviders()); diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java index d235ebae4..18a0657ba 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomWizard.java @@ -42,13 +42,15 @@ public class JoinChatRoomWizard public JoinChatRoomWizard(MainFrame mainFrame) { super(mainFrame); - + this.mainFrame = mainFrame; - + super.addWizardListener(this); - + this.setTitle(Messages.getI18NString("joinChatRoomWizard").getText()); + this.setFinishButtonText(Messages.getI18NString("join").getText()); + page1 = new JoinChatRoomWizardPage1(this, newChatRoom, mainFrame.getProtocolProviders()); diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java index cd7b601c4..a6674052e 100644 --- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java +++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactWizard.java @@ -43,13 +43,15 @@ public class AddContactWizard public AddContactWizard(MainFrame mainFrame) { super(mainFrame); - + this.mainFrame = mainFrame; - + super.addWizardListener(this); - + this.setTitle(Messages.getI18NString("addContactWizard").getText()); + this.setFinishButtonText(Messages.getI18NString("addContact").getText()); + Vector pps = new Vector(); Iterator iter = mainFrame.getProtocolProviders(); while (iter.hasNext()) diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java index 634c653bd..72e4456ad 100644 --- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java @@ -41,6 +41,8 @@ public class AimAccountRegistrationWizard public AimAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java index 76d08a592..6cfe05791 100644 --- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java @@ -54,6 +54,8 @@ public class GibberishAccountRegistrationWizard public GibberishAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java index 01bff6b52..25b6d0149 100644 --- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java @@ -41,6 +41,8 @@ public class IcqAccountRegistrationWizard public IcqAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java index a532fb64a..dc0433ca5 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java @@ -51,6 +51,8 @@ public class IrcAccountRegistrationWizard public IrcAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java index e749d7a6d..78bc1ace0 100644 --- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java @@ -50,6 +50,8 @@ public class JabberAccountRegistrationWizard public JabberAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java index abcb1a532..d6a58f28a 100644 --- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java @@ -45,6 +45,8 @@ public class MsnAccountRegistrationWizard public MsnAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java index 6aa4f46bc..de92f8207 100644 --- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java @@ -11,6 +11,7 @@ import org.osgi.framework.*; import net.java.sip.communicator.impl.gui.customcontrols.*; + import net.java.sip.communicator.service.gui.*; import net.java.sip.communicator.service.protocol.*; @@ -53,6 +54,9 @@ public class RssAccountRegistrationWizard public RssAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer + .setFinishButtonText(Resources.getString("activate")); } /** diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java index ce8e2e932..80c8dbc4a 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java @@ -47,8 +47,11 @@ public class SIPAccountRegistrationWizard * @param wizardContainer the wizard container, where this wizard * is added */ - public SIPAccountRegistrationWizard(WizardContainer wizardContainer) { + public SIPAccountRegistrationWizard(WizardContainer wizardContainer) + { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java index afab7c788..c04a3ce9b 100644 --- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java @@ -59,8 +59,11 @@ public class SSHAccountRegistrationWizard * @param wizardContainer the wizard container, where this wizard * is added */ - public SSHAccountRegistrationWizard(WizardContainer wizardContainer) { + public SSHAccountRegistrationWizard(WizardContainer wizardContainer) + { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java index 21a160c31..5f6e91532 100644 --- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java @@ -46,6 +46,8 @@ public class YahooAccountRegistrationWizard public YahooAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java index 6b031b3f7..6da3c02c1 100644 --- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java +++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java @@ -55,6 +55,8 @@ public class ZeroconfAccountRegistrationWizard public ZeroconfAccountRegistrationWizard(WizardContainer wizardContainer) { this.wizardContainer = wizardContainer; + + this.wizardContainer.setFinishButtonText(Resources.getString("signin")); } /** diff --git a/src/net/java/sip/communicator/service/gui/WizardContainer.java b/src/net/java/sip/communicator/service/gui/WizardContainer.java index 257e78735..5ffc1f526 100644 --- a/src/net/java/sip/communicator/service/gui/WizardContainer.java +++ b/src/net/java/sip/communicator/service/gui/WizardContainer.java @@ -58,7 +58,16 @@ public interface WizardContainer { * disable it. */ public void setCancelButtonEnabled(boolean newValue); - + + /** + * Sets the text label of the "Finish" wizard button. The default value of + * the "Finish" button is still defined by the implementation of this + * WizardContainer interface, but calling this method would allow + * wizards to specify their own finish button. + * @param text the new label of the button + */ + public void setFinishButtonText(String text); + /** * Refreshes the current content of this wizard container. */