Don't split resource strings, remove unused resources

10 files changed, 56 insertions, 202 deletions

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 89de334..4897b99 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -43,7 +43,6 @@ service.gui.ACCOUNT_ME=Me
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Account Registration Wizard
 service.gui.ACCOUNTS=Accounts
 service.gui.ADD=&Add
-service.gui.ADD_ACCOUNT=Add account
 service.gui.ADD_CONTACT=&Add contact
 service.gui.ADD_AUTHORIZED_CONTACT=Add {0} to your contact list
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Add the contact to your contact list
@@ -53,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Add contact Error
 service.gui.ADD_CONTACT_EXIST_ERROR=The contact {0} already exists in your contact list.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Server did not respond to our request adding contact with id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Failed to add contact with id: {0}. Operation not supported.
-service.gui.ADD_CONTACT_IDENTIFIER=In the field below enter the identifier of the contact you would like to add.
-service.gui.ADD_CONTACT_WIZARD=Add contact wizard
 service.gui.ADD_CONTACT_NOT_CONNECTED=You need to be connected in in order to add a contact. Please sign in to the selected provider and try again.
 service.gui.ADD_GROUP_LOCAL_ERROR=Failed to add group with name: {0}. The problem occurred during a local IO operation.
 service.gui.ADD_GROUP_EXIST_ERROR=The group {0} already exists in your contact list. Please choose another name.
 service.gui.ADD_GROUP_NET_ERROR=Failed to add group with name: {0}. The problem occurred due to a network failure. Please check your network connection and try again.
 service.gui.ADD_GROUP_ERROR=Failed to add group with name: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=The group name must not be empty.
-service.gui.ADD_GROUP=Create group
-service.gui.ADD_SUBCONTACT=&Add subcontact
 service.gui.ADDRESS=Address
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=&Advanced
-service.gui.ALL=&All
 service.gui.ALL_CONTACTS=&All contacts
 service.gui.ALTERNATE_ADDRESS=Alternate address
 service.gui.APPLY=&Apply
@@ -76,7 +70,6 @@ service.gui.AT=at
 service.gui.AUTHORIZE=&Authorize
 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={0} has rejected your authorization request.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} authentication
@@ -118,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=In the field below, you can enter your new nic
 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={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
@@ -132,18 +124,14 @@ 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_SEND_MSG_FORBIDDEN=Message sending is forbidden (voice revoked)
-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
-service.gui.AUTOJOIN=Autojoin
 service.gui.CHANGE_PASSWORD=Change password
 service.gui.CHAT_ROOM_NAME_INFO=In the field below enter the name of the chat room that you would like to create.
 service.gui.CHAT_ROOM_NOT_EXIST=The {0} room was not found in the {1} server. Please verify if the name you typed is correct.
 service.gui.CHAT_ROOM_NOT_CONNECTED=You need to be logged in in order to join the {0} chat room.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=You need to be logged in in order to leave a chat room.
-service.gui.CHAT_ROOM_NOT_JOINED=You need to be joined to the chat room in order to do further operations with it.
 service.gui.CHAT_ROOM_OPTIONS=Chat room options
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=The {0} chat room requires registration to be joined.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=The {0} chat room has requested a password.
@@ -168,18 +156,15 @@ service.gui.CONNECTING=Connecting...
 service.gui.CONNECTING_STATUS=Connecting
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Connecting*
 service.gui.CONNECTION=Connection
-service.gui.CONNECTION_FAILED_MSG=Connection failed for the following account: User name: {0}, Server name: {1}. Please check your network connection or contact your network administrator for more information.
 service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from the {0} server.
 service.gui.CONTACT_NAME=ID or Number
 service.gui.CONTACT_NAME_PROMPT=jane.doe@example.com
 service.gui.CONTACT_NAME_INFO=Add either an instant messaging address (such as jane.doe@example.com) or a VoIP number
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The chosen {0} contact doesn''t support telephony.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=The chosen {0} contact doesn''t support chat conferencing.
 service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message
 service.gui.CONTACT_TYPING={0} is typing a message
 service.gui.CONTACT_TYPING_SEND_FAILED=uh-oh...we couldn''t tell {0} that you were writing
 service.gui.CONTACT_INFO=&Contact info
-service.gui.CONTACTLIST=Contactlist
 service.gui.CONTACTS=Contacts
 service.gui.COPY=&Copy
 service.gui.COPY_LINK=Copy &link
@@ -189,17 +174,14 @@ service.gui.CREATE_CHAT_ROOM=&Create chat room...
 service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create {0} chat room.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard
 service.gui.CREATE_CONFERENCE_CALL=&Create a conference call...
-service.gui.CREATE_CONFERENCE_CHAT=&Create a conference chat...
 service.gui.CREATE_GROUP=&Create group...
 service.gui.CREATE_GROUP_NAME=In the field below enter the name of the group you would like to create.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Your contact list doesn't contain any groups. Please create a group first (File/Create group).
 service.gui.CREATE_VIDEO_BRIDGE=Create a &video bridge...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Create a &video bridge
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Create / Join video conference
 service.gui.CREATE_VIDEO_CONFERENCE=Create a new video conference for this chat room
 service.gui.CONTACT_INFO_NOT_SUPPORTED=This contact doesn't support web contact info
 service.gui.CUT=C&ut
-service.gui.DATE=Date
 service.gui.DELETE=Delete
 service.gui.DENY=&Deny
 service.gui.DESKTOP_SHARING_WARNING=<b>Are you sure you want to start screen sharing?</b> <br> Clicking OK will let people on this call see your screen.
@@ -212,7 +194,6 @@ service.gui.DISCONNECTED_STATUS=Disconnected
 service.gui.DND_STATUS=Do not disturb
 service.gui.DO_NOT_ASK_AGAIN=Don't ask again
 service.gui.DO_NOT_SHOW_AGAIN=Don't show this message again
-service.gui.DOWNLOAD_NOW=&Download now
 service.gui.DRAG_FOR_SHARING=Drag here anything you want to share...
 service.gui.DURATION=duration
 service.gui.DESTROY_CHATROOM=Destroy chat room
@@ -233,7 +214,6 @@ service.gui.ERROR_RECEIVED_FROM=Error received from {0}
 service.gui.ESTIMATED_TIME=Estimated time:
 service.gui.EVENTS=Events
 service.gui.EXIT=E&xit
-service.gui.EXTENDED_CRITERIA=Extended criteria
 service.gui.GENERAL=General
 service.gui.GENERAL_ERROR=General error
 service.gui.GROUP_NAME=Group name
@@ -275,7 +255,6 @@ service.gui.FONT_ITALIC=Italic
 service.gui.FONT_SIZE=Size
 service.gui.FONT_STYLE=Style
 service.gui.FONT_UNDERLINE=Underline
-service.gui.FROM={0} from {1}
 service.gui.GRANT_OWNERSHIP=Grant ownership...
 service.gui.GRANT_ADMIN=Grant administrator...
 service.gui.GRANT_MODERATOR=Grant moderator
@@ -302,7 +281,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Are you sure you want to permanently remo
 service.gui.HISTORY_REMOVE_ERROR=Error removing locally stored messages.
 service.gui.HOME=Home
 service.gui.HOME_PAGE=Home page
-service.gui.HOUR=Hour
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifier
 service.gui.IGNORE=&Ignore
@@ -330,7 +308,6 @@ service.gui.JOIN=&Join
 service.gui.JOIN_AS=J&oin as
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Join an existing video conference
 service.gui.JOIN_VIDEO=Join video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=C&lose
 service.gui.JOB_TITLE=Job title
 service.gui.JOIN_CHAT_ROOM=&Join chat room...
 service.gui.JOIN_CHAT_ROOM_TITLE=Join chat room
@@ -343,7 +320,6 @@ service.gui.KICK_FAILED=Kick failed
 service.gui.KICK_FAILED_GENERAL_ERROR=Failed to kick {0}. A general server error occurred.
 service.gui.KICK_FAILED_NOT_ALLOWED=Failed to kick {0}. The owner and the administrator of the room could not be kicked.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Failed to kick {0}. You don''t have enough privileges to do that.
-service.gui.LAST=Last
 service.gui.LAST_NAME=Last name
 service.gui.LEAVE=&Leave
 service.gui.LIMIT_REACHED_FOR_IP=You have too many existing registrations from the local IP address and the {0} server doesn''t allow to open any more of them.
@@ -363,7 +339,6 @@ service.gui.MESSAGE=Message
 service.gui.MISSED_CALLS_TOOL_TIP=Missed calls from:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= and {0} more
 service.gui.MODERATOR=moderator
-service.gui.MORE=See more
 service.gui.MORE_LABEL=More
 service.gui.MOVE=Move
 service.gui.MOVE_SUBCONTACT=M&ove contact
@@ -372,7 +347,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=The contact you have chosen is the same as \n
 service.gui.MOVE_SUBCONTACT_QUESTION=Are you sure you want to move {0} to {1}?
 service.gui.MOVE_TO_GROUP=&Move to group
 service.gui.MOVE_CONTACT=Move Contact
-service.gui.MOVE_CONTACT_ERROR=&Contact cannot be moved
 service.gui.MSG_DELIVERY_FAILURE=The above message could not be delivered
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=The protocol you are using doesn''t \
 support offline messages. You could try to reach {0} through another \
@@ -388,7 +362,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=You should be connected to be able to se
 service.gui.MULTIPLE_LOGINS=You have logged in more than once with the same account. The following account: User name: {0}, Server name: {1} is currently disconnected.
 service.gui.MY_CHAT_ROOMS=Add chat room
 service.gui.MY_CHAT_ROOMS_TITLE=Add chat room
-service.gui.MUTE=Mute
 service.gui.MUTUALLY_ON_HOLD_STATUS=Mutually On Hold
 service.gui.NAME=Name
 service.gui.NETWORK=Network
@@ -420,7 +393,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=NotInContactList
 service.gui.SD_QUALITY=Standard quality
 service.gui.OFFLINE=Offline
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Older calls
 service.gui.ONLINE=Online
 service.gui.OPEN=Open
 service.gui.OPEN_FILE_FROM_IMAGE=Double click to open file.
@@ -432,7 +404,6 @@ service.gui.OPEN_ON_ACTIVITY=Open on activity
 service.gui.OPEN_ON_MESSAGE=Open on message only
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Open on important messages only
 service.gui.OR=or
-service.gui.OR_ENTER_PHONE_NUMBER=Or enter phone number here...
 service.gui.ORGANIZATION=Organization
 service.gui.OTHER=Other
 service.gui.chat.role.OWNER=Owner
@@ -458,7 +429,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' for suggestions
 service.gui.PRESS_FOR_CALL_INFO=Press for call info
 service.gui.PRESS_TO_OPEN_CRM=Press to open CRM application
 service.gui.PREVIOUS=Previous
-service.gui.PREVIOUS_TOOLTIP=Browse older conversations
 service.gui.PRINT=&Print
 service.gui.PROACTIVE_NOTIFICATION=is writing a message
 service.gui.PROBLEMS_ENCOUNTERED=Problems encountered
@@ -474,7 +444,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=You have have been disconnecting and rec
 service.gui.RE_REQUEST_AUTHORIZATION=Re-request authorization
 service.gui.REFERRED_STATUS=Referred
 service.gui.REJECT=&Reject
-service.gui.REMIND_ME_LATER=Remind me later
 service.gui.REMEMBER_PASSWORD=Remember password
 service.gui.REMOVE=&Remove
 service.gui.REMOVE_ACCOUNT=&Remove account
@@ -500,9 +469,7 @@ service.gui.REVOKE_ADMIN=Revoke admin
 service.gui.REVOKE_MODERATOR=Revoke moderator
 service.gui.REVOKE_MEMBERSHIP=Revoke membership
 service.gui.REVOKE_VOICE=Revoke voice
-service.gui.ROOT_GROUP=Root group
 service.gui.SAVE=&Save
-service.gui.SAVE_AS_DEFAULT=Save as default
 service.gui.SEARCH=&Search
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Click the below button to show all chat rooms existing in the selected server. Then select the one you would like to join and click the join button.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Searched contact
@@ -512,19 +479,13 @@ service.gui.SELECT_ACCOUNT_INFO=Which account do you want to use to communicate
 service.gui.SELECT_COLOR=Select color
 service.gui.SELECT_GROUP=Select group
 service.gui.SELECT_GROUP_INFO=Which group do you want to display this contact under? (Optional)
-service.gui.SELECT_GROUP_WIZARD_MSG=The list below contains all groups in your Contact List. Select the one, where you would like to add the new contact.
 service.gui.SELECT_NO_GROUP=No group
-service.gui.SELECT_GROUP_WIZARD=Specify group
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=The list below contains all accounts that support the multi user chat feature. Select the one you would like to use to create your chat room.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=The list below contains all registered accounts. Select the one you would like to use to communicate with the new contact.
-service.gui.SELECT_PROVIDERS_WIZARD=Select account
 service.gui.SELECT_VIDEO_CONFERENCE=Select video conference
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Select chat room from the list and press OK to add it.
 service.gui.SEND=&Send
 service.gui.SEND_FILE=Send &file
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=There is no info for this contact.
 service.gui.SEND_MESSAGE=&Send a message
-service.gui.SEND_AS_SMS=Send as SMS
 service.gui.SEND_PRIVATE_MESSAGE=Send private message
 service.gui.SEND_SMS=S&end SMS
 service.gui.SEND_SMS_DETAILS=Remember that you need to enter the number in international \
@@ -564,7 +525,6 @@ service.gui.STREET=Street
 service.gui.SUBJECT=Subject
 service.gui.SUMMARY=Summary
 service.gui.TELEPHONY=Telephony
-service.gui.TODAY=Today
 service.gui.TOOLS=&Tools
 service.gui.TRANSFER=Trans&fer
 service.gui.TO=&To:
@@ -574,7 +534,6 @@ service.gui.TRANSFER_CALL_TO=Transfer to:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparency is not supported by your current configuration.
 service.gui.TYPE_YOUR_REQUEST=Type your request here
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=We were not able to change video quality for this call.
-service.gui.UNMUTE=Unmute
 service.gui.USER_IDENTIFIER=User identifier:
 service.gui.USER_EXISTS_ERROR=This user already exists on the selected network. Please choose another user or network.
 service.gui.USERNAME_NULL=Please fill your username and password.
@@ -587,7 +546,6 @@ service.gui.USE_PROVISIONING=Use online provisioning
 service.gui.VALUE=Value
 service.gui.VIDEO_CALL=&Video call
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&View
 service.gui.VIEW_HISTORY=View &history
 service.gui.VIEW_SMILEYS=View &smileys
@@ -607,9 +565,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Adjust volume
 service.gui.WAITING_AUTHORIZATION=Waiting for authorization
 service.gui.WARNING=Warning
 service.gui.YES=Yes
-service.gui.YESTERDAY=Yesterday
-service.gui.EXISTING_ACCOUNT_ERROR=The account you entered is already installed.
-service.gui.NEW_MAIL=<b>You have one new Mail!</b><br/><b>From:</b> {0} {1} <br/><b>Subject:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=You have received a new mail message in your {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=You have received {2} new mail messages in your {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=one more unread conversation in your <a href="{0}">inbox</a>.<br/>
@@ -636,7 +591,6 @@ service.gui.SECURITY_ERROR=Security error
 service.gui.SPEED=Speed:
 service.gui.SILENT_MEMBER=silent member
 service.gui.NON_SECURE_CONNECTION=No secure connection can be made for account {0}. If you want to connect to non-secure server, please check \"Allow non-secure connections\" in your account configuration
-service.gui.UPDATE=Update
 service.gui.MOBILE_PHONE=Mobile
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Work
@@ -673,12 +627,10 @@ service.gui.callinfo.CALL_INFORMATION=Call information
 service.gui.callinfo.CALL_IDENTITY=Identity
 service.gui.callinfo.PEER_COUNT=Participant count
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Conference focus
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Encryption enabled
 service.gui.callinfo.CALL_TRANSPORT=Signalling call transport
 service.gui.callinfo.CALL_DURATION=Call duration
 service.gui.callinfo.TLS_PROTOCOL=TLS protocol
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS cipher suite
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=TLS server certificate chain
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=The content of the TLS server \
 certificate is displayed below.
 service.gui.callinfo.VIEW_CERTIFICATE=View certificate
@@ -699,10 +651,14 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Key exchange protocol
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE candidate extended type
 service.gui.callinfo.ICE_STATE=ICE Processing State
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Gather candidates
 service.gui.callinfo.ICE_STATE.RUNNING=Connectivity checks
 service.gui.callinfo.ICE_STATE.COMPLETED=Completed
 service.gui.callinfo.ICE_STATE.FAILED=Failed
+service.gui.callinfo.ICE_STATE.TERMINATED=Terminated
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Local host IP / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Local reflexive IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Local relayed IP / Port
@@ -734,12 +690,6 @@ The certificate is not trusted, which means that the server''s \
 identity cannot<br> be automatically verified. \
 Do you want to continue connecting?<br><br> \
 For more information, click "Show Certificate".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} can''t verify the identity \
-of the connecting client.<br><br> \
-The certificate is not trusted, which means that the client''s \
-identity cannot<br> be automatically verified. \
-Do you want to accept the connection?<br><br> \
-For more information, click "Show Certificate".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} can''t verify the identity \
 of the peer {1}.<br><br> \
 The certificate is not trusted, which means that the peer''s \
@@ -749,6 +699,8 @@ For more information, click "Show Certificate".</html>
 service.gui.CONTINUE_ANYWAY=Continue anyway
 service.gui.CERT_INFO_CHAIN=Certificate Chain:
 service.gui.CERT_INFO_ISSUED_TO=Issued To
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Common Name:
 service.gui.CERT_INFO_O=Organization:
 service.gui.CERT_INFO_C=Country Name:
@@ -767,12 +719,10 @@ service.gui.CERT_INFO_SIGN_ALG=Signature Algorithm:
 service.gui.CERT_INFO_PUB_KEY_INFO=Public Key Info
 service.gui.CERT_INFO_ALG=Algorithm:
 service.gui.CERT_INFO_PUB_KEY=Public Key:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Exponent:
 service.gui.CERT_INFO_KEY_SIZE=Key Size:
 service.gui.CERT_INFO_SIGN=Signature:
-service.gui.CONTINUE=Continue
 service.gui.SHOW_CERT=Show Certificate
 service.gui.HIDE_CERT=Hide Certificate
 
@@ -795,12 +745,9 @@ service.gui.security.SECURE_AUDIO=Secure audio
 service.gui.security.AUDIO_NOT_SECURED=Audio not secure
 service.gui.security.SECURE_VIDEO=Secure video
 service.gui.security.VIDEO_NOT_SECURED=Video not secure
-service.gui.security.NO_VIDEO=No video
-service.gui.security.CIPHER=Cipher: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Call secured. For more information click here.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Call not secure.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Press here to compare security secret with your partner.
-service.gui.security.COMPARE_WITH_PARTNER=Compare with partner and click the padlock to confirm.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Compare with partner:
 service.gui.security.STRING_COMPARED=String compared!
@@ -825,11 +772,9 @@ service.gui.avatar.imagepicker.CLICK=Click and Smile
 service.gui.avatar.imagepicker.IMAGE_FILES=Image files
 service.gui.avatar.imagepicker.IMAGE_PICKER=Picture
 service.gui.avatar.imagepicker.IMAGE_SIZE=Image size
-service.gui.avatar.imagepicker.INITIALIZING=Initializing
 service.gui.avatar.imagepicker.RESET=Reset
 service.gui.avatar.imagepicker.SET=Set
 service.gui.avatar.imagepicker.TAKE_PHOTO=Take a photo
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Webcam error
 
 service.gui.security.encryption.required=Encryption required!
 
@@ -844,11 +789,6 @@ service.systray.CLI_NOTE=If your choice does not work, you can start {0} with th
  This forces the mode to "Disabled" and shows the GUI. \
  Changing the tray implementation requires a restart.
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
-
 impl.protocol.sip.XCAP_ERROR_TITLE=Error in SIP contact list storage
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Resource cannot be read {0}. For {1}
 impl.protocol.sip.XCAP_ERROR_UNAUTHORIZED=Wrong username or password using xcap. For {0}.
@@ -877,9 +817,7 @@ impl.ldap.QUERY_CUSTOM=Custom query
 impl.ldap.QUERY_CUSTOM_HINT=Use {0} as a placeholder for the search term.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Automatically add wildcards to the query term
 impl.ldap.QUERY_PHOTO_INLINE=Fetch photo along with other attributes
-impl.ldap.NEW=New
 impl.ldap.EDIT=edit
-impl.ldap.REMOVE=Remove
 impl.ldap.ENABLED=Enabled
 impl.ldap.SERVER_NAME=Server name
 impl.ldap.SERVER_NAME_EXAMPLE=My LDAP server
@@ -925,7 +863,7 @@ plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=Enable Microsoft Outlook search
 plugin.addrbook.DESCRIPTION=If enabled everything you type in the search field \
  of the contact list will be also searched in your system address book and all \
  matching contacts from your address book will appear in your contact list.
- plugin.addrbook.DEFAULT_IM_APP=Make Jitsi the default Instant Messaging Provider (Outlook integration)
+plugin.addrbook.DEFAULT_IM_APP=Make Jitsi the default Instant Messaging Provider (Outlook integration)
 plugin.addrbook.PREFIX=Specific phone number prefix
 plugin.addrbook.PREFIX_EXAMPLE=Ex.: 00
 plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE=Error accessing your Microsoft Outlook contacts.
@@ -934,9 +872,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Make Outlook default mail clien
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google Contacts
-impl.googlecontacts.NEW=New
 impl.googlecontacts.EDIT=edit
-impl.googlecontacts.REMOVE=Remove
 impl.googlecontacts.ENABLED=Enabled
 impl.googlecontacts.ACCOUNT_NAME=Account name
 impl.googlecontacts.SAVE=Save
@@ -979,11 +915,8 @@ plugin.accountinfo.ORGANIZATION=Organization Name:
 plugin.accountinfo.JOB_TITLE=Job Title:
 plugin.accountinfo.ABOUT_ME=About Me:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=User Pictures
 plugin.accountinfo.GLOBAL_ICON=Use global icon
 plugin.accountinfo.LOCAL_ICON=Use this icon:
-plugin.accountinfo.CHANGE=Change
-plugin.accountinfo.ONLY_MESSAGE=Only messages
 
 # connection info
 plugin.connectioninfo.TITLE=Connection Info
@@ -1003,7 +936,6 @@ plugin.aimaccregwizz.USERNAME=AIM Screenname:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Screen Name and Password
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Register new account
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have an AIM account, click on this button to create a new one.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=About {0}
@@ -1025,9 +957,6 @@ plugin.generalconfig.SHOW_HISTORY=Show
 plugin.generalconfig.HISTORY_SIZE=recent messages in new chats
 plugin.generalconfig.SEND_MESSAGES_WITH=Send messages with:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Bring chat window to front
-plugin.generalconfig.ERROR_PERMISSION=You don't have enough privileges to remove autostart
-plugin.generalconfig.TRANSPARENCY=Transparency
-plugin.generalconfig.ENABLE_TRANSPARENCY=Enable transparency
 plugin.generalconfig.DEFAULT_LANGUAGE=Interface Language
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Your changes will take effect on next restart.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% translated
@@ -1117,13 +1046,10 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Comment
 plugin.jabberaccregwizz.RESOURCE=Resource
 plugin.jabberaccregwizz.AUTORESOURCE=Auto generate resource
 plugin.jabberaccregwizz.PRIORITY=Priority
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP Error
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unknown XMPP error ({0}). Verify that the server name is correct.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Your passwords did not match.
 plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Advanced options
 plugin.jabberaccregwizz.USE_ICE=Use ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Use Google's Jingle/ICE (experimental)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Auto discover STUN/TURN servers
 plugin.jabberaccregwizz.SUPPORT_TURN=Support TURN
 plugin.jabberaccregwizz.TURN_USERNAME=TURN username
@@ -1151,11 +1077,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Disable message carbons
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Choose automatically between RTP and Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Server options
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Change account password
-plugin.jabberaccregwizz.NEW_PASSWORD=New password
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirm new password
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Please fill a valid port number in order to continue.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=The account has to be signed in before changing a password.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=The password is empty.
 plugin.jabberaccregwizz.TLS_REQUIRED=The connection does not use TLS, will not attempt a password change.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=The password has been successfully changed
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Your XMPP server does not support password changes.
@@ -1169,15 +1092,6 @@ plugin.jabberaccregwizz.RESET=Reset
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Reset to the global settings
 plugin.jabberaccregwizz.DISABLE_JINGLE=Disable Jingle (audio and video calls with XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Outgoing Message:
-plugin.mailbox.INCOMING=Incoming Messages:
-plugin.mailbox.WAIT_TIME=Delay Until Call Sent to Voicemail
-plugin.mailbox.MAX_MESSAGE_TIME=Maximum Incoming Message Duration
-plugin.mailbox.CONFIRM=Confirm
-plugin.mailbox.DEFAULTS=Defaults
-plugin.mailbox.MAILBOX=Mailbox
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Install
 plugin.pluginmanager.UNINSTALL=Uninstall
@@ -1206,7 +1120,6 @@ plugin.sipaccregwizz.SERVER_PORT=Server port
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxy port
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Advanced options
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxy options
 plugin.sipaccregwizz.PROXY_AUTO=Configure proxy automatically
 plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Bypass proxy security check for HA scenarios (use only if needed)
@@ -1227,8 +1140,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Choose automatically between RTP and Inband
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Enable support to encrypt calls
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Indicate support of ZRTP in signalling protocol
 plugin.sipaccregwizz.AUTH_NAME=Authorization name
@@ -1249,10 +1160,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Voicemail check URI
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Your passwords did not match.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none> (use regular authentication)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP indication
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Off (indicate RTP/AVP only) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Mandatory (offer and accept only RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Optional (offer RTP/SAVP first, then RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Enable S-Descriptor (also known as SDES or SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Choose enabled encryption protocols and their priority (top protocol first):
 plugin.sipaccregwizz.CIPHER_SUITES=Enabled cipher suites:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} will automatically try to secure all \
@@ -1342,6 +1253,8 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Existing ippi account
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Create a free ippi account
 
 # key binding chooser
+plugin.keybindings.WAITING=Press shortcut...
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Close Chat Window
 plugin.keybindings.CHAT_COPY=Copy
 plugin.keybindings.CHAT_CUT=Cut
@@ -1364,10 +1277,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Name
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primary shortcut
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Second shortcut
 plugin.keybindings.globalchooser.PRESS_BTN=Press to set shortcut
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Waiting
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Push to talk
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Enable special key detection
 plugin.keybindings.PLUGIN_NAME=Keybindings
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Main
 plugin.keybindings.GLOBAL=Global shortcuts
@@ -1395,6 +1308,7 @@ plugin.notificationconfig.tableheader.SOUND=Play a sound through notification de
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Play a sound through playback device
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Play a sound through PC speaker device
 plugin.notificationconfig.tableheader.DESCRIPTION=Description of event
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Incoming Call
 plugin.notificationconfig.event.SecurityMessage=Security Message
 plugin.notificationconfig.event.IncomingFile=Incoming File
@@ -1501,6 +1415,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Periodic Intra Refresh
 impl.neomedia.configform.H264.defaultProfile=Default profile to encode into:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Baseline
 impl.neomedia.configform.H264.defaultProfile.high=High
 impl.neomedia.configform.H264.defaultProfile.main=Main
@@ -1531,7 +1446,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Current password:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Enter new password:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Re-enter password:
 plugin.securityconfig.masterpassword.MP_TITLE=Master Password
-plugin.securityconfig.masterpassword.MP_NOT_SET=(not set)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=You did not enter the correct current Master Password. Please try again.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=The Master Password is not correct!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Password Change Failed
@@ -1702,7 +1616,6 @@ plugin.provisioning.RESTART_WARNING=Note that your changes will only take effect
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Copy UUID to clipboard
 plugin.provisioning.CLIPBOARD_FAILED=Failed to copy UUID to clipboard
-plugin.provisioning.EXIT_ON_FAIL=Exit the application if the provisioning fails
 plugin.provisioning.CREDENTIALS=Last stored provisioning credentials
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Are you sure you want to remove provisioning password?
 plugin.provisioning.PROV_FAILED=Provisioning failed
@@ -1784,8 +1697,6 @@ inform them about the issue. \
 #plugin spellcheck
 plugin.spellcheck.TITLE=Spelling and Grammar
 plugin.spellcheck.MENU=Show Spelling and Grammar
-plugin.spellcheck.LANG=Language
-plugin.spellcheck.EDIT_PERSONAL_DICT=Edit
 plugin.spellcheck.ENABLE_SPELL_CHECK=Enable spell check
 plugin.spellcheck.dialog.FIND=Find Next
 plugin.spellcheck.dialog.REPLACE=Replace   
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