diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index d5383076b..557eed591 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -281,7 +281,6 @@ service.gui.OPEN=Open service.gui.OPEN_FILE_FROM_IMAGE=Double click to open file. service.gui.OPEN_FOLDER=Open folder service.gui.OPEN_IN_BROWSER=Open in &browser -service.gui.OPEN_TOOLS=Open Tools Menu service.gui.OPTIONS=Options service.gui.OR=or service.gui.OR_ENTER_PHONE_NUMBER=Or enter phone number here... @@ -425,8 +424,6 @@ impl.protocol.ssh.DETAILS_SEPARATOR=~ # systray impl.systray.SET_STATUS=Set Status -impl.systray.ONLINE_STATUS=Online -impl.systray.OFFLINE_STATUS=Offline impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=Failed to open the "Add Contact" dialog. impl.systray.POPUP_MESSAGE_HANDLER=Systray balloon messages impl.swingnotification.POPUP_MESSAGE_HANDLER=SIP Communicator popups @@ -441,7 +438,6 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=select network # account info plugin.accountinfo.TITLE=Account Info -plugin.accountinfo.BROWSE=Browse plugin.accountinfo.EXTENDED=Extended plugin.accountinfo.NOT_SUPPORTED=Account info not available. plugin.accountinfo.FIRST_NAME=First Name: @@ -524,7 +520,6 @@ plugin.dictaccregwizz.CLOSING_CONNECTION=Closing connection # call history form plugin.callhistoryform.TITLE=&Call history -plugin.callhistoryform.SEARCH=Search plugin.callhistoryform.CONTACT_NAME=Contact Name plugin.callhistoryform.SINCE=Since plugin.callhistoryform.UNTIL=Until @@ -534,7 +529,6 @@ plugin.callhistoryform.OUTGOING=Outgoing # facebookaccregwizz plugin.facebookaccregwizz.DESCRIPTION=
In order to use Facebook Chat you need to create a "Username"
from your "Account Settings" page on Facebook.

Note: When you create username you must logout from the webpage
and it can take a while before you are able to login with your new username!
-plugin.facebookaccregwizz.INVALID_EMAIL_ADDRESS=Invalid username plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=The Facebook Chat protocol plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook plugin.facebookaccregwizz.USERNAME=Username: @@ -618,7 +612,6 @@ plugin.jabberaccregwizz.ADVANCED_OPTIONS=Advanced options # mailbox plugin.mailbox.OUTGOING=Outgoing Message: plugin.mailbox.INCOMING=Incoming Messages: -plugin.mailbox.BROWSE=Browse plugin.mailbox.WAIT_TIME=Delay Until Call Sent to Voicemail plugin.mailbox.MAX_MESSAGE_TIME=Maximum Incoming Message Duration plugin.mailbox.CONFIRM=Confirm @@ -690,7 +683,6 @@ plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=A Protocol to connect to remote machin plugin.sshaccregwizz.USERNAME=Account ID: plugin.sshaccregwizz.IDENTITY_FILE=Identitity File: plugin.sshaccregwizz.KNOWN_HOSTS=Known Hosts: -plugin.sshaccregwizz.ACCOUNT_INFO_TITLE=SSH Account Details plugin.sshaccregwizz.OPTIONAL=Optional plugin.sshaccregwizz.ACCOUNT_DETAILS=Account details diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSimpleSelector.java b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSimpleSelector.java index 53898f17e..46b8fa700 100644 --- a/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSimpleSelector.java +++ b/src/net/java/sip/communicator/impl/osdependent/jdic/StatusSimpleSelector.java @@ -51,8 +51,8 @@ public StatusSimpleSelector( updateStatus(); /* the menu itself */ - createMenuItem("impl.systray.ONLINE_STATUS", "online"); - createMenuItem("impl.systray.OFFLINE_STATUS", "offline"); + createMenuItem("service.gui.ONLINE", "online"); + createMenuItem("service.gui.OFFLINE", "offline"); } private void createMenuItem(String textKey, String name) diff --git a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationPanel.java b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationPanel.java index 03f4e3e92..472d141e4 100644 --- a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationPanel.java +++ b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationPanel.java @@ -32,7 +32,7 @@ public class MailboxConfigurationPanel private JFileChooser jfcOutgoingMessage = new JFileChooser(); private JButton jbtnOutgoingMessage - = new JButton(Resources.getString("plugin.mailbox.BROWSE")); + = new JButton(Resources.getString("service.gui.BROWSE")); private JTextField jtfOutgoingMessage = new JTextField(); @@ -45,7 +45,7 @@ public class MailboxConfigurationPanel private JFileChooser jfcIncomingMessage = new JFileChooser(); private JButton jbtnIncomingMessage - = new JButton(Resources.getString("plugin.mailbox.BROWSE")); + = new JButton(Resources.getString("service.gui.BROWSE")); private JTextField jtfIncomingMessage = new JTextField();