Add placeholders and fix spelling miskates

resources/languages/resources.properties

@@ -57,15 +57,15 @@ service.gui.ADVANCED=&Advanced
 service.gui.ALL=&All
 service.gui.ALL_CONTACTS=&All contacts
 service.gui.APPLY=&Apply
-service.gui.ARE_CALLING=are calling...
+service.gui.ARE_CALLING={0} are calling...
 service.gui.ARE_NOW=You are now {0}
 service.gui.AT=at
 service.gui.AUTHORIZE=&Authorize
-service.gui.AUTHORIZATION_ACCEPTED=contact has accepted your authorization request.
+service.gui.AUTHORIZATION_ACCEPTED={0} has accepted your authorization request.
 service.gui.AUTHENTICATION_FAILED=Authentication failed for {0}. The password you entered is not valid.
 service.gui.AUTHENTICATION_REQUESTED=Authentication requested
 service.gui.AUTHENTICATION_REQUESTED_SERVER=The {0} server has requested your authentication.
-service.gui.AUTHENTICATION_REJECTED=contact has rejected your authorization request.
+service.gui.AUTHENTICATION_REJECTED={0} has rejected your authorization request.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} authentication
 service.gui.AUTHORIZATION_REQUESTED=Authorization requested
 service.gui.AUTHORIZATION_REQUESTED_INFO=The {0} contact requests your authorization.
@@ -99,22 +99,22 @@ service.gui.CHANGE_ROOM_SUBJECT_LABEL=In the field below, you can enter the new
 service.gui.CHANGE_NICK=Change nickname
 service.gui.CHANGE_NICKNAME=Change nickname...
 service.gui.CHANGE_NICKNAME_LABEL=In the field below, you can enter your new nickname.
-service.gui.CHANGE_NICKNAME_ERROR=Error Changing nickname
-service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nickname already exist
+service.gui.CHANGE_NICKNAME_ERROR=Error changing nickname
+service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nickname already exists
 service.gui.CHANGE_VIDEO_QUALITY=Change remote video quality
 service.gui.CHAT_CONFERENCE_LABEL=Conferences
-service.gui.CHAT_CONFERENCE_ITEM_LABEL='s conference
+service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}'s conference
 service.gui.CHAT_ROOM_ALREADY_JOINED=The {0} chat room is already joined.
 service.gui.CHAT_ROOM_CONFIGURATION={0} chat room configuration
 service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Failed to obtain the {0} chat room configuration form.
-service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Could not obtain the {0} chat room configuration form. Only owners of the chat room could see and change the configuration form.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Could not obtain the {0} chat room configuration form. Only owners of the chat room can see and change the configuration form.
 service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=An error occurred while trying to submit the configuration form for chat room {0}.
 service.gui.CHAT_ROOM_USER_JOINED=has joined {0}
 service.gui.CHAT_ROOM_USER_LEFT=has left {0}
 service.gui.CHAT_ROOM_USER_KICKED=has been kicked from {0}
 service.gui.CHAT_ROOM_USER_QUIT=has quit {0}
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Saves chat room for future use
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Removes selected room from the list of saved rooms
+service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Saves the chat room for future use
+service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Removes the selected room from the list of saved rooms
 service.gui.CHAT_ROOM_NAME=Chat room name
 service.gui.CLEAR_CUSTOM_MESSAGES=Clear custom messages
 service.gui.ROOM_NAME=Chat Room
@@ -245,7 +245,7 @@ service.gui.FONT_ITALIC=Italic
 service.gui.FONT_SIZE=Size
 service.gui.FONT_STYLE=Style
 service.gui.FONT_UNDERLINE=Underline
-service.gui.FROM=from
+service.gui.FROM={0} from {1}
 service.gui.GRANT_OWNERSHIP=Grant ownership...
 service.gui.GRANT_ADMIN=Grant administrator...
 service.gui.GRANT_MODERATOR=Grant moderator
@@ -291,7 +291,7 @@ service.gui.INVITE_CONTACT_TO_CHAT=Invite contacts to chat
 service.gui.INVITE_CONTACT_TO_CALL=Invite contacts to call
 service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Invite contacts to video bridge
 service.gui.INVITE_REASON=Invite reason
-service.gui.IS_CALLING=is calling...
+service.gui.IS_CALLING={0} is calling...
 service.gui.IS_NOW={0} is now {1}
 service.gui.JITSI_WARNING=SIP Communicator has recently been renamed to Jitsi.<br/>\
  If you want your version to remain up-to-date, then please download Jitsi now.\
@@ -422,7 +422,7 @@ service.gui.PUT_ON_HOLD=Put on hold
 service.gui.QUIT=&Quit
 service.gui.READY=Ready
 service.gui.REASON=Reason
-service.gui.RECEIVED=received
+service.gui.RECEIVED={0} received
 service.gui.RECONNECTION_LIMIT_EXCEEDED=You have have been disconnecting and reconnecting to the server too fast. The following account: User name: {0}, Server name: {1} is temporarily banned and would have to wait a bit before trying to login again.
 service.gui.RE_REQUEST_AUTHORIZATION=Re-request authorization
 service.gui.REFERRED_STATUS=Referred
@@ -484,7 +484,7 @@ service.gui.SEND_VIA=Send via
 service.gui.SENT=sent
 service.gui.SET_GLOBAL_STATUS=Set global status
 service.gui.SET_STATUS_MESSAGE=Set status message
-service.gui.SET_SUBJECT=Set Subject
+service.gui.SET_SUBJECT=Set subject
 service.gui.SETTINGS=&Options
 service.gui.SHARE_DESKTOP=&Share desktop
 service.gui.SHARE_DESKTOP_WITH_CONTACT=Share desktop with contact

src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java

@@ -88,15 +88,15 @@ public AuthorizationResponseDialog( MainFrame mainFrame,
 
         if(responseCode.equals(AuthorizationResponse.ACCEPT))
         {
-            infoTextArea.setText(contact.getDisplayName() + " "
-                + GuiActivator.getResources().getI18NString(
-                    "service.gui.AUTHORIZATION_ACCEPTED"));
+            infoTextArea.setText(GuiActivator.getResources().getI18NString(
+                    "service.gui.AUTHORIZATION_ACCEPTED",
+                    new String[]{contact.getDisplayName()}));
         }
         else if(responseCode.equals(AuthorizationResponse.REJECT))
         {
-            infoTextArea.setText(contact.getDisplayName() + " "
-                + GuiActivator.getResources()
-                    .getI18NString("service.gui.AUTHENTICATION_REJECTED"));
+            infoTextArea.setText(GuiActivator.getResources()
+                    .getI18NString("service.gui.AUTHENTICATION_REJECTED",
+                        new String[]{contact.getDisplayName()}));
         }
 
         if(response.getReason() != null && !response.getReason().equals(""))

src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java

@@ -104,11 +104,10 @@ private void initCallLabel(final JLabel callLabel[])
             // Only one peer.
             else
             {
-                textDisplayName = callLabel[1].getText()
-                    + CallManager.getPeerDisplayName(peer)
-                    + " "
-                    + GuiActivator.getResources()
-                        .getI18NString("service.gui.IS_CALLING");
+                textDisplayName = GuiActivator.getResources()
+                        .getI18NString("service.gui.IS_CALLING",
+                            new String[]{
+                                CallManager.getPeerDisplayName(peer) });
 
                 String peerAddress = getPeerDisplayAddress(peer);
 
@@ -137,8 +136,9 @@ public void run()
         }
 
         if (hasMorePeers)
-            textDisplayName += GuiActivator.getResources()
-                .getI18NString("service.gui.ARE_CALLING");
+            textDisplayName = GuiActivator.getResources()
+                .getI18NString("service.gui.ARE_CALLING",
+                    new String[]{textDisplayName});
 
         callLabel[0].setIcon(imageIcon);
 

src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatConferenceCallDialog.java

@@ -139,10 +139,10 @@ private void initPanels()
         name.setEditable(true);
         name.setColumns(30);
         if(chatRoom != null)
-            name.setText(chatRoom.getUserNickname() + 
-                GuiActivator.getResources()
-                    .getI18NString("service.gui.CHAT_CONFERENCE_ITEM_LABEL"));
-        
+            name.setText(GuiActivator.getResources()
+                    .getI18NString("service.gui.CHAT_CONFERENCE_ITEM_LABEL",
+                        new String[]{chatRoom.getUserNickname()}));
+
         createPanel.add(conferenceNamePanel,BorderLayout.CENTER);
         createPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
         

src/net/java/sip/communicator/impl/gui/main/chat/filetransfer/ReceiveFileConversationComponent.java

@@ -377,8 +377,8 @@ public void finished()
     @Override
     protected String getProgressLabel(String bytesString)
     {
-        return bytesString
-            + " " + resources.getI18NString("service.gui.RECEIVED");
+        return resources.getI18NString("service.gui.RECEIVED",
+            new String[]{bytesString});
     }
 
     public void fileTransferCreated(FileTransferCreatedEvent event)

src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java

@@ -1744,8 +1744,9 @@ public ConferenceDescription publishConference(ConferenceDescription cd,
             String displayName;
             if(name == null)
             {
-                displayName = nickname + JabberActivator.getResources()
-                    .getI18NString("service.gui.CHAT_CONFERENCE_ITEM_LABEL");
+                displayName = JabberActivator.getResources()
+                    .getI18NString("service.gui.CHAT_CONFERENCE_ITEM_LABEL",
+                        new String[]{nickname});
             }
             else
             {

src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicInstantMessagingJabberImpl.java

@@ -783,11 +783,13 @@ public void processPacket(Packet packet)
             String address = fromUserID;
             if(isPrivateMessaging)
             {
-                address = StringUtils.parseResource(msg.getFrom()) + " " + 
-                    JabberActivator.getResources().getI18NString(
-                        "service.gui.FROM") + " " + fromUserID;
+                address = JabberActivator.getResources().getI18NString(
+                        "service.gui.FROM",
+                        new String[]{
+                            StringUtils.parseResource(msg.getFrom()),
+                            fromUserID} );
             }
-           
+
             putJidForAddress(address, msg.getFrom());
 
             if (logger.isTraceEnabled())