Don't split resource strings, remove unused resources

9 files changed, 43 insertions, 100 deletions

diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java
index 9956785..bb888ad 100644
--- a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java
@@ -737,8 +737,7 @@ public class CertificateServiceImpl
                         propNames.add(propName);
 
                         message =
-                            R.getI18NString("service.gui."
-                                + "CERT_DIALOG_DESCRIPTION_TXT_NOHOST",
+                            R.getI18NString("service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST",
                                 new String[] {
                                     appName
                                 }
@@ -762,8 +761,7 @@ public class CertificateServiceImpl
                         {
                             message =
                                 R.getI18NString(
-                                    "service.gui."
-                                    + "CERT_DIALOG_DESCRIPTION_TXT",
+                                    "service.gui.CERT_DIALOG_DESCRIPTION_TXT",
                                     new String[] {
                                         appName,
                                         identitiesToTest.toString()
@@ -774,8 +772,7 @@ public class CertificateServiceImpl
                         {
                             message =
                                 R.getI18NString(
-                                    "service.gui."
-                                    + "CERT_DIALOG_PEER_DESCRIPTION_TXT",
+                                    "service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT",
                                     new String[] {
                                         appName,
                                         identitiesToTest.toString()
diff --git a/src/net/java/sip/communicator/impl/neomedia/AbstractDeviceConfigurationListener.java b/src/net/java/sip/communicator/impl/neomedia/AbstractDeviceConfigurationListener.java
index a1814e8..3c84aa2 100644
--- a/src/net/java/sip/communicator/impl/neomedia/AbstractDeviceConfigurationListener.java
+++ b/src/net/java/sip/communicator/impl/neomedia/AbstractDeviceConfigurationListener.java
@@ -187,8 +187,7 @@ public abstract class AbstractDeviceConfigurationListener
                         body
                         + "\r\n\r\n"
                         + NeomediaActivator.getResources().getI18NString(
-                                "impl.media.configform"
-                                    + ".AUDIO_DEVICE_CONFIG_MANAGMENT_CLICK"),
+                            "impl.media.configform.AUDIO_DEVICE_CONFIG_MANAGMENT_CLICK"),
                         null,
                         extras);
             }
diff --git a/src/net/java/sip/communicator/impl/neomedia/AudioDeviceConfigurationListener.java b/src/net/java/sip/communicator/impl/neomedia/AudioDeviceConfigurationListener.java
index 75f1fc3..fe06f15 100644
--- a/src/net/java/sip/communicator/impl/neomedia/AudioDeviceConfigurationListener.java
+++ b/src/net/java/sip/communicator/impl/neomedia/AudioDeviceConfigurationListener.java
@@ -159,10 +159,8 @@ public class AudioDeviceConfigurationListener
                                     capturePropertyChangeEvent.getOldValue()))
                     {
                         body.append("\r\n")
-                            .append(
-                                    r.getI18NString(
-                                            "impl.media.configform"
-                                                + ".AUDIO_DEVICE_SELECTED_AUDIO_IN"))
+                            .append(r.getI18NString(
+                                "impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_IN"))
                             .append("\r\n\t")
                             .append(cdi.getName());
                         selectedHasChanged = true;
@@ -179,10 +177,8 @@ public class AudioDeviceConfigurationListener
                                     playbackPropertyChangeEvent.getOldValue()))
                     {
                         body.append("\r\n")
-                            .append(
-                                    r.getI18NString(
-                                            "impl.media.configform"
-                                                + ".AUDIO_DEVICE_SELECTED_AUDIO_OUT"))
+                            .append(r.getI18NString(
+                                "impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_OUT"))
                             .append("\r\n\t")
                             .append(cdi.getName());
                         selectedHasChanged = true;
@@ -199,10 +195,8 @@ public class AudioDeviceConfigurationListener
                                     notifyPropertyChangeEvent.getOldValue()))
                     {
                         body.append("\r\n")
-                            .append(
-                                    r.getI18NString(
-                                            "impl.media.configform"
-                                                + ".AUDIO_DEVICE_SELECTED_AUDIO_NOTIFICATIONS"))
+                            .append(r.getI18NString(
+                                "impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_NOTIFICATIONS"))
                             .append("\r\n\t")
                             .append(cdi.getName());
                         selectedHasChanged = true;
diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
index d561c92..00e8aac 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaConfigurationImpl.java
@@ -1773,8 +1773,7 @@ public class MediaConfigurationImpl
                     {
                         String noAvailableAudioDevice
                             = NeomediaActivator.getResources().getI18NString(
-                                    "impl.media.configform"
-                                        + ".NO_AVAILABLE_AUDIO_DEVICE");
+                                "impl.media.configform.NO_AVAILABLE_AUDIO_DEVICE");
 
                         preview = new TransparentPanel(new GridBagLayout());
                         preview.add(new JLabel(noAvailableAudioDevice));
diff --git a/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java b/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
index 1381d21..a3ea318 100644
--- a/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/neomedia/codec/video/h264/ConfigurationPanel.java
@@ -150,8 +150,7 @@ public class ConfigurationPanel
         JCheckBox defaultIntraRefreshCheckBox
             = new SIPCommCheckBox(
                     r.getI18NString(
-                            "impl.neomedia.configform.H264"
-                                + ".defaultIntraRefresh"));
+                        "impl.neomedia.configform.H264.defaultIntraRefresh"));
         cnstrnts.gridwidth = GridBagConstraints.REMAINDER;
         cnstrnts.gridx = 0;
         cnstrnts.gridy = 3;
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java
index 0467033..c046348 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/AccountPanel.java
@@ -140,7 +140,7 @@ public class AccountPanel
         userIDPassPanel.setBorder(
                 BorderFactory.createTitledBorder(
                         Resources.getString(
-                                "plugin.sipaccregwizz.USERNAME_AND_PASSWORD")));
+                            "plugin.jabberaccregwizz.USERNAME_AND_PASSWORD")));
 
         JPanel southPanel = new TransparentPanel(new BorderLayout());
         southPanel.add(rememberPassBox, BorderLayout.WEST);
@@ -564,8 +564,7 @@ public class AccountPanel
                 OperationSetChangePassword.class).supportsPasswordChange())
             {
                 changePasswordMessagePane.setText(Resources.getString(
-                                "plugin.jabberaccregwizz."
-                                + "SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
+                    "plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
             }
             else
             {
@@ -683,8 +682,7 @@ public class AccountPanel
                                             getAccountID().getAccountAddress(),
                                         ex);
                                 displayPopupError(Resources.getString(
-                                    "plugin.jabberaccregwizz."
-                                        + "PASSWORD_NOT_STORED"));
+                                    "plugin.jabberaccregwizz.PASSWORD_NOT_STORED"));
                             }
                         }
                         //now update the password field in AccountPanel,
@@ -705,8 +703,7 @@ public class AccountPanel
                     }
                     catch (OperationFailedException ex) {
                         displayPopupError(Resources.getString(
-                                "plugin.jabberaccregwizz."
-                                + "SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
+                            "plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE"));
                     }
                 }
             }
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingChooser.java b/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingChooser.java
index bd8ff0d..12ba3e2 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingChooser.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/chooser/BindingChooser.java
@@ -24,6 +24,7 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.plugin.desktoputil.*;
+import net.java.sip.communicator.plugin.keybindingchooser.KeybindingChooserActivator;
 import net.java.sip.communicator.service.keybindings.*;
 
 /**
@@ -51,36 +52,12 @@ public class BindingChooser
     // can be selected
     private BindingEntry selectedEntry = null; // None selected when null
 
-    private String selectedText = "Press shortcut...";
-
     /**
      * Keybinding set.
      */
     private KeybindingSet set = null;
 
     /**
-     * Displays a dialog allowing the user to redefine the keystroke component
-     * of key bindings. The top has light blue labels describing the fields and
-     * the bottom provides an 'OK' and 'Cancel' option. This uses the default
-     * color scheme and indent style. If no entries are selected then the enter
-     * key is equivalent to pressing 'OK' and escape is the same as 'Cancel'.
-     *
-     * @param parent frame to which to apply modal property and center within
-     *            (centers within screen if null)
-     * @param bindings initial mapping of keystrokes to their actions
-     * @return redefined mapping of keystrokes to their actions, null if cancel
-     *         is pressed
-     */
-    public static LinkedHashMap<KeyStroke, String> showDialog(Component parent,
-        Map<KeyStroke, String> bindings)
-    {
-        BindingChooser display = new BindingChooser();
-        display.putAllBindings(bindings);
-        return showDialog(parent, display, "Key Bindings", true, display
-            .makeAdaptor());
-    }
-
-    /**
      * Adds a collection of new key binding mappings to the end of the listing.
      * If any shortcuts are already contained then the previous entries are
      * replaced (not triggering the onUpdate method). Disabled shortcuts trigger
@@ -269,22 +246,6 @@ public class BindingChooser
     }
 
     /**
-     * Sets the message of the selected shortcut field when awaiting user input.
-     * By default this is "Press shortcut...".
-     *
-     * @param message prompt for user input
-     */
-    public void setSelectedText(String message)
-    {
-        if (this.selectedEntry != null)
-        {
-            this.selectedEntry.getField(BindingEntry.Field.SHORTCUT).setText(
-                message);
-        }
-        this.selectedText = message;
-    }
-
-    /**
      * Returns if a binding is currently awaiting input or not.
      *
      * @return true if a binding is awaiting input, false otherwise
@@ -344,7 +305,8 @@ public class BindingChooser
             onUpdate(getBindingIndex(this.selectedEntry), this.selectedEntry,
                 false);
             this.selectedEntry.getField(BindingEntry.Field.SHORTCUT).setText(
-                " " + this.selectedText);
+                    KeybindingChooserActivator.getResources().getI18NString(
+                            "plugin.keybindings.WAITING"));
         }
     }
 
diff --git a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
index c330879..8e4a235 100644
--- a/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
+++ b/src/net/java/sip/communicator/plugin/otr/ScOtrEngineImpl.java
@@ -654,15 +654,14 @@ public class ScOtrEngineImpl
 
                         String unverifiedSessionWarning
                             = OtrActivator.resourceService.getI18NString(
-                                    "plugin.otr.activator"
-                                        + ".unverifiedsessionwarning",
-                                    new String[]
-                                    {
-                                        contact.getDisplayName() + resourceName,
-                                        this.getClass().getName(),
-                                        "AUTHENTIFICATION",
-                                        sessionGuid.toString()
-                                    });
+                                "plugin.otr.activator.unverifiedsessionwarning",
+                                new String[]
+                                {
+                                    contact.getDisplayName() + resourceName,
+                                    this.getClass().getName(),
+                                    "AUTHENTIFICATION",
+                                    sessionGuid.toString()
+                                });
                         OtrActivator.uiService.getChat(contact).addMessage(
                             contact.getDisplayName(),
                             new Date(), Chat.SYSTEM_MESSAGE,
@@ -727,8 +726,7 @@ public class ScOtrEngineImpl
                                 OtrActivator.scOtrKeyManager.isVerified(
                                     contact, remoteFingerprint)
                                     ? "plugin.otr.activator.sessionstared"
-                                    : "plugin.otr.activator"
-                                        + ".unverifiedsessionstared",
+                                    : "plugin.otr.activator.unverifiedsessionstared",
                                 new String[]
                                     {contact.getDisplayName() + resourceName});
 
diff --git a/src/net/java/sip/communicator/plugin/update/UpdateServiceImpl.java b/src/net/java/sip/communicator/plugin/update/UpdateServiceImpl.java
index 53dde17..d0c908e 100644
--- a/src/net/java/sip/communicator/plugin/update/UpdateServiceImpl.java
+++ b/src/net/java/sip/communicator/plugin/update/UpdateServiceImpl.java
@@ -545,24 +545,22 @@ public class UpdateServiceImpl
             if(notifyAboutNewestVersion)
             {
                 SwingUtilities.invokeLater(
-                        new Runnable()
+                    new Runnable()
+                    {
+                        public void run()
                         {
-                            public void run()
-                            {
-                                UIService ui = UpdateActivator.getUIService();
-                                ResourceManagementService r
-                                    = Resources.getResources();
-
-                                ui.getPopupDialog().showMessagePopupDialog(
-                                        r.getI18NString(
-                                                "plugin.updatechecker."
-                                                    + "DIALOG_NOUPDATE"),
-                                        r.getI18NString(
-                                                "plugin.updatechecker."
-                                                    + "DIALOG_NOUPDATE_TITLE"),
-                                        PopupDialog.INFORMATION_MESSAGE);
-                            }
-                        });
+                            UIService ui = UpdateActivator.getUIService();
+                            ResourceManagementService r
+                                = Resources.getResources();
+
+                            ui.getPopupDialog().showMessagePopupDialog(
+                                    r.getI18NString(
+                                        "plugin.updatechecker.DIALOG_NOUPDATE"),
+                                    r.getI18NString(
+                                        "plugin.updatechecker.DIALOG_NOUPDATE_TITLE"),
+                                    PopupDialog.INFORMATION_MESSAGE);
+                        }
+                    });
             }
         }
         else