Language resources updated.

202 files changed, 5199 insertions, 6162 deletions

diff --git a/build.xml b/build.xml
index 18c8534..3f9ed01 100644
--- a/build.xml
+++ b/build.xml
@@ -788,7 +788,7 @@
         bundle-audionotifier,bundle-plugin-branding,
         bundle-systray,bundle-browserlauncher,bundle-gibberish,
         bundle-gibberish-slick,bundle-plugin-gibberishaccregwizz,
-        bundle-plugin-extended-callhistory-search,
+    	bundle-plugin-call-history-form,
         bundle-rss, bundle-rss-slick,bundle-plugin-rssaccregwizz,
         bundle-zeroconf,bundle-plugin-zeroconfaccregwizz,bundle-plugin-whiteboard,
         bundle-irc,bundle-plugin-ircaccregwizz,
@@ -1563,12 +1563,12 @@ javax.swing.event, javax.swing.border"/>
     </target>
 
     <!-- BUNDLE-PLUGIN-EXTENDED CALL HISTORY SEARCH -->
-    <target name="bundle-plugin-extended-callhistory-search">
+    <target name="bundle-plugin-call-history-form">
         <!-- Creates a bundle for a extended callhistory search-->
-        <jar compress="false" destfile="${bundles.dest}/extendedcallhistorysearch.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/extendedcallhistorysearch"
-                prefix="net/java/sip/communicator/plugin/extendedcallhistorysearch"/>
+        <jar compress="false" destfile="${bundles.dest}/callhistoryform.jar"
+            manifest="${src}/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/callhistoryform"
+                prefix="net/java/sip/communicator/plugin/callhistoryform"/>
             <zipfileset src="${lib.noinst}/jcalendar-1.3.2.jar" prefix=""/>
         </jar>
     </target>
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index fbe6ecb..7fb0cdb 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -138,7 +138,7 @@ felix.auto.start.67= \
  reference:file:sc-bundles/yahooaccregwizz.jar \
  reference:file:sc-bundles/gibberishaccregwizz.jar \
  reference:file:sc-bundles/sshaccregwizz.jar \
- reference:file:sc-bundles/extendedcallhistorysearch.jar \
+ reference:file:sc-bundles/callhistoryform.jar \
  reference:file:sc-bundles/rssaccregwizz.jar \
  reference:file:sc-bundles/zeroconfaccregwizz.jar \
  reference:file:sc-bundles/ircaccregwizz.jar \
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 1e79cb1..88ccbd9 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -25,746 +25,671 @@
 # The same rules apply to the properties files found in the other
 # directories.
 
-about=&About
-accept=&Accept
-account=Account
-accountMe=Me
-accountPreferences=Account preferences
-accountRegistrationWizard=Account Registration Wizard
-accounts=Accounts
-activateOnlyWhenMinimized=Activate only when minimized
-add=&Add
-addAccount=Add account
-addContact=&Add contact
-addContactError=Failed to add contact with id: {0}
-addContactErrorTitle=Add contact Error
-addContactExistError=The contact {0} already exists in your contact list.
-addContactIdentifier=In the field below enter the identifier of the contact you would like to add.
-addContactWizard=Add contact wizard
-addGroupLocalError=Failed to add group with name: {0}. The problem occured during a local IO operation.
-addGroupNetError=Failed to add group with name: {0}. The problem occured due to a network failure. Please check your network connection and try again.
-addGroupError=Failed to add group with name: {0}.
-addGroupErrorTitle=Add group Error
-addGroupExistError=The group {0} already exists in your contact list.
-addGroup=Create group
-addSubcontact=&Add subcontact
-advanced=&Advanced
-all=&All
-allContacts=&All contacts
-alwaysOnTop=Always on top
-appearance=Appearance
-application=Application
-apply=&Apply
-areCalling=are calling...
-at=at
-authAccepted=contact has accepted your authorization request.
-authenticationWindowTitle=Authentication requested
-authRejected=contact has rejected your authorization request.
-authorizationRequested=Authorization requested
-authorizationRequestedInfo=The {0} contact requests your authorization.
-authenticationFailed=Authentication failed. The password you entered is not valid.
-authorizationResponse=Authorization response
-autoPopup=Bring window to front
-awayStatus=Away
-back=&Back
-ban=&Ban
-banFailed=Ban failed
-banFailedGeneralError=Failed to ban {0}. A general server error occured.
-banFailedNotAllowed=Failed to ban {0}. The owner and the administratior of the room could not be banned.
-banFailedNotEnoughPermissions=Failed to ban {0}. You don't have enough privileges to do that.
-brbMessage=I'm gone right now, but I'll be back.
-busyMessage=Sorry, I'm busy right now.
-call=Call
-callVia=Call via:
-callList=Call list
-cancel=&Cancel
-chatRoomAlreadyJoined=The {0} chat room is already joined.
-chatRoomConfiguration={0} chat room configuration
-chatRoomOpenConfigFailed=Failed to obtain the {0} chat room configuration form.
-chatRoomOpenConfigForbidden=Could not obtain the {0} chat room configuration form. Only administrators of the chat room could see and change the configuration form.
-chatRoomConfigFormSubmitFailed=An error occured while trying to submit the configuration form for chat room {0}.
-chatRoomUserJoined=has joined {0}
-chatRoomUserLeft=has left {0}
-chatRoomUserKicked=has been kicked from {0}
-chatRoomUserQuit=has quit {0}
-chatRoomName=Chat room name
-chatRoomNameInfo=In the field below enter the name of the chat room that you would like to create.
-chatRoomNotExist=The {0} room was not found in the {1} server. Please verify if the name you typed is correct.
-chatRoomNotConnected=You need to be logged in in order to join the {0} chat room.
-chatRoomNotJoined=You need to be joined to the chat room in order to do further operations with it.
-chatRoomOptions=Chat room options
-chatRoomRegistrationRequired=The {0} chat room requires registration to be joined.
-chatRoomRequiresPassword=The {0} chat room has requested a password.
-chatRooms=Chat rooms
-chatRoomSubjectChanged={0} has changed the subject to {1}
-close=Cl&ose
-closeChatAfterNewMsg=You have received a new message less than 2 seconds ago. Are you sure you want to close this chat?
-conference=Conference
-configure=&Options
-configuration=Options
-connectionFailed=Connection failed
-connectionFailedMessage=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.
-User name: {0} <BR>\
-Server name: {1}. <BR>\
-Please check your network connection or contact <BR>\
-your network administrator for more information.</DIV>
-connectionExpiredMessage=You are currently disconnected from the {0} server.
-contactAddress=Contact address
-contactNotSupportingTelephony=The choosen  {0} contact doesn't support telephony.
-contactPausedTyping={0} paused typing the message
-contactTyping={0} is typing a message
-contactTypingStateStale=typing state not updated
-contactInfo=&Contact info
-contacts=Contacts
-continue=&Continue
-copy=&Copy
-copyLink=Copy &link
-create=C&reate
-createChatRoom=&Create chat room...
-createChatRoomNotSupported=Failed to create chat room with name: {0}. The server you have choosen: {1} doesn't support this operation.
-createChatRoomError=Failed to create chat room with name: {0}.
-createChatRoomWizard=Create chat room wizard
-createGroup=&Create group
-createGroupName=In the field below enter the name of the group you would like to create.
-createFirstGroupWizard=Your contact list doesn't contain any groups. Please create a group first (File/Create group).
-cut=C&ut
-date=Date
-description=Description
-dial=&Dial
-dialpad=Dialpad
-dndStatus=Do not disturb
-doNotAskAgain=Don't ask again
-doNotShowAgain=Don't show this message again
-dontSupportWebInfo=This contact doesn't support web contact info
-duration=Duration
-edit=&Edit
-emptyHistory=&Empty history
-enableNotifications=Enable notifications
-enableTypingNotifications=Enable &typing notifications
-enterPhoneNumber=Enter phone number
-error=Error
-exit=E&xit
-extendedCriteria=Extended criteria
-general=General
-generalError=General error
-group=Group
-groupName=Group name
-failedToCreateChatRoom=Failed to create chat room with name: {0}.
-failedToJoinChatRoom=Failed to join chat room with name: {0}.
-ffcStatus=Free for chat
-file=&File
-findChatRoomError=Failed to find the "{0}" chat room.
-finish=&Finish
-first=First
-font=Font
-hangUp=Hang up
-haveToBeConnectedToJoin=You have to be connected in order to join a chat room. Please connect and then try again.
-haveToBeConnectedToLeave=You have to be connected in order to leave a chat room.
-help=?
-hideOffline=Hide
-hideOfflineContacts=Hide inactive contacts
-hideCallPanel=&Hide call panel
-hideMainWindow=<DIV>Clicking the X window button will not exit the application, \
+service.gui.ABOUT=&About
+service.gui.ACCEPT=&Accept
+service.gui.ACCOUNT=Account
+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_CONTACT_ERROR=Failed to add contact with id: {0}
+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=Failed to add contact with id: {0}. Network failure occured.
+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_GROUP_LOCAL_ERROR=Failed to add group with name: {0}. The problem occured 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 occured 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=Create group
+service.gui.ADD_SUBCONTACT=&Add subcontact
+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.AT=at
+service.gui.AUTHORIZATION_ACCEPTED=contact has accepted your authorization request.
+service.gui.AUTHENTICATION_FAILED=Authentication failed. The password you entered is not valid.
+service.gui.AUTHENTICATION_REQUESTED=Authentication requested
+service.gui.AUTHENTICATION_REJECTED=contact 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.
+service.gui.AUTHORIZATION_RESPONSE=Authorization response
+service.gui.AWAY_STATUS=Away
+service.gui.BAN=&Ban
+service.gui.BAN_FAILED=Ban failed
+service.gui.BAN_FAILED_GENERAL_ERROR=Failed to ban {0}. A general server error occured.
+service.gui.BAN_FAILED_NOT_ALLOWED=Failed to ban {0}. The owner and the administrator of the room could not be banned.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Failed to ban {0}. You don't have enough privileges to do that.
+service.gui.BRB_MESSAGE=I'm gone right now, but I'll be back.
+service.gui.BROWSE=Browse
+service.gui.BUSY_MESSAGE=Sorry, I'm busy right now.
+service.gui.CALL=Call
+service.gui.CALL_VIA=Call via:
+service.gui.CANCEL=&Cancel
+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 administrators of the chat room could see and change the configuration form.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=An error occured 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_NAME=Chat room name
+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.
+service.gui.CHAT_ROOMS=Chat rooms
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} has changed the subject to {1}
+service.gui.CLOSE=Cl&ose
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=You have received a new message less than 2 seconds ago. Are you sure you want to service.gui.CLOSE this chat?
+service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from the {0} server.
+service.gui.CONNECTION_REQUIRED_TO_service.gui.JOIN=You have to be connected in order to join a chat room. Please connect and then try again.
+service.gui.CONNECTION_REQUIRED_TO_LEAVE=You have to be connected in order to leave a chat room.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen  {0} contact doesn't support telephony.
+service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message
+service.gui.CONTACT_TYPING={0} is typing a message
+service.gui.CONTACT_TYPING_STATE_STALE=typing state not updated
+service.gui.CONTACT_INFO=&Contact info
+service.gui.CONTACTS=Contacts
+service.gui.COPY=&Copy
+service.gui.COPY_LINK=Copy &link
+service.gui.CREATE=C&reate
+service.gui.CREATE_CHAT_ROOM=&Create chat room...
+service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create chat room with name: {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard
+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.CONTACT_INFO_NOT_SUPPORTED=This contact doesn't support web contact info
+service.gui.CUT=C&ut
+service.gui.DATE=Date
+service.gui.DIALPAD=Dialpad
+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.DURATION=Duration
+service.gui.EDIT=&Edit
+service.gui.EMPTY_HISTORY=&Empty history
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Enable &typing notifications
+service.gui.ENTER_PHONE_NUMBER=Enter phone number
+service.gui.ERROR=Error
+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
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Failed to join chat room with name: {0}.
+service.gui.FFC_STATUS=Free for chat
+service.gui.FILE=&File
+service.gui.FINISH=&Finish
+service.gui.FONT=Font
+service.gui.HANG_UP=Hang up
+service.gui.HELP=?
+service.gui.HIDE_OFFLINE_CONTACTS=Hide inactive contacts
+service.gui.HIDE_MAIN_WINDOW=<DIV>Clicking the X window button will not exit the application, \
 but only <BR> hide it. If you wish to exit the application choose File/Quit.</DIV>
-history=&History
-historyContact=History - {0}
-hour=Hour
-identifier=Identifier
-ignore=&Ignore
-info=Info
-insertSmiley=Insert smiley
-invalidCall=Invalid call
-invitation=Invitation text
-invitationReceived=Invitation received
-invitationReceivedFormInfo={0} has invited you to join {1} chat room. You could accept, reject or ignore this invitation.
-invite=&Invite
-inviteContactFormInfo=Select the names of the contacts you would like to add to this conversation and then click Invite.
-inviteContactToChat=Invite contact to chat
-inviteReason=Invite reason
-isCalling=is calling...
-join=&Join
-joinAs=J&oin as
-joinChatRoom=&Join chat room...
-joinChatRoomTitle=Join chat room
-joinChatRoomName=Please enter the name of the chat room you would like to join.
-joinChatRoomWizard=Join chat room wizard
-kick=&Kick
-kickFailed=Kick failed
-kickFailedGeneralError=Failed to kick {0}. A general server error occured.
-kickFailedNotAllowed=Failed to kick {0}. The owner and the administratior of the room could not be kicked.
-kickFailedNotEnoughPermissions=Failed to kick {0}. You don't have enough privileges to do that.
-last=Last
-launchBrowserError=Error attempting to launch web browser.
-launchOnStartUp=Launch on start up
-leave=&Leave
-limitReachedForIp=You have too many existing registrations from the local IP address and the {0} server doesn't allow to open any more of them.
-login=&Login
-loginNetworkError=Unable to log in with account: User name: {0}, Server name: {1}, due to a network failure. Please check your network connection.
+service.gui.HISTORY=&History
+service.gui.HISTORY_CONTACT=History - {0}
+service.gui.HOUR=Hour
+service.gui.IDENTIFIER=Identifier
+service.gui.IGNORE=&Ignore
+service.gui.INSERT_SMILEY=Insert smiley
+service.gui.INVITATION=Invitation text
+service.gui.INVITATION_RECEIVED=Invitation received
+service.gui.INVITATION_RECEIVED_MSG={0} has invited you to join {1} chat room. You could accept, reject or ignore this invitation.
+service.gui.INVITE=&Invite
+service.gui.INVITE_CONTACT_MSG=Select the names of the contacts you would like to add to this conversation and then click Invite.
+service.gui.INVITE_CONTACT_TO_CHAT=Invite contact to chat
+service.gui.INVITE_REASON=Invite reason
+service.gui.IS_CALLING=is calling...
+service.gui.JOIN=&Join
+service.gui.JOIN_AS=J&oin as
+service.gui.JOIN_CHAT_ROOM=&Join chat room...
+service.gui.JOIN_CHAT_ROOM_TITLE=Join chat room
+service.gui.JOIN_CHAT_ROOM_NAME=Please enter the name of the chat room you would like to join.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Join chat room wizard
+service.gui.KICK=&Kick
+service.gui.KICK_FAILED=Kick failed
+service.gui.KICK_FAILED_GENERAL_ERROR=Failed to kick {0}. A general server error occured.
+service.gui.KICK_FAILED_NOT_ALLOWED=Failed to kick {0}. The owner and the administratior 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.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.
+service.gui.LOGIN=&Login
+service.gui.LOGIN_NETWORK_ERROR=Unable to log in with account: User name: {0}, Server name: {1}, due to a network failure. Please check your network connection.
 User name: {0}<BR>\
 Server name: {1}<BR>\
 due to a network failure. Please check your network connection.</DIV>
-loginGeneralError=An error occured while logging in with account: User name: {0}, Server name: {1}.
-loginInternalError=An error occured while logging in with account: User name: {0}, Server name: {1}. This is most probably an internal application error. You could report your problem to issues@sip-communicator.dev.java.net.
-loginInvalidPropsError=Unable to log in with account: User name: {0}, Server name: {1}, due to an account configuration problem. Please check your account configuration.
-loginWindowTitle=Login {0}
-logoffNotSucceeded=An error occured while logging off with the following account: User name: {0}, Server name: {1}.
-me=me
-modify=&Modify
-move=Move
-moveSubcontactMsg=Select the contact, where you would like to move.
-moveSubcontact=M&ove contact
-moveSubcontactInSameContact=The contact you have choosen is the same as \n the source one. Please choose another contact!
-moveSubcontactQuestion=<DIV>Are you sure you want to move <B> {0} </B> to <B> {1} </B> ?</DIV>
-moveToGroup=&Move to group
-moveContact=Move Contact
-moveContactError=&Contact cannot be moved
-msgDeliveryFailure=The above message could not be delivered
-msgDeliveryOfflineNotSupported=The protocol you are using doesn't support offline messages. You could try to reach this contact through another protocol or wait until he/she becomes online.
-msgDeliveryInternalError=An internal error occured. This is most probably a bug. Please report it here: http://www.sip-communicator.org/index.php/Development/BugsAndIssues. Server returned error: {0}
-msgDeliveryUnknownError=Your message could not be delivered due to the following problem: {0}.
-msgNotDelivered=A network problem occured. Please check your network configuration and try again. Server returned error: {0}.
-msgReceived={0} has sent you a message
-msgSendConnectionProblem=You should be connected to be able to send messages.
-multipleLogins=You have logged in more than once with the same account. The following account: User name: {0}, Server name: {1} is currently disconnected.
-myChatRooms=My chat rooms...
-name=Name
-network=Network
-networkFailure=Network failure
-next=&Next
-nextTooltip=Browse more recent conversations
-new=&New
-newAccount=Add &new account
-newMessage=New message...
-newName=New name:
-newStatusMessage=New status message
-no=No
-noAvailableRooms=The list of rooms for this server is currently not available.
-noMessage=No message
-noMultiChatAccountAvailable=No accounts, supporting multi user chat found. Check sip-communicator.org for more information on which protocols support multi user chat.
-nonEmptyChatWindowClose=You're trying to close a chat with a non-sent message. Are you sure you want to close this chat?
-nonExistingUserId=The {0} server does not recognize specified user id.
-notifications=Notifications
-ok=&OK
-offline=Offline
-olderCalls=Older calls
-online=Online
-openInBrowser=Open in &browser
-openTools=Open Tools Menu
-options=Options
-passwd=Password
-paste=&Paste
-previous=Previous
-previousTooltip=Browse older conversations
-print=&Print
-proactiveNotification=is writing a message
-protocol=Protocol
-providerNotConnected=You must be connected to be able to communicate.
-quit=&Quit
-ready=Ready
-reason=Reason
-reconnectionLimitExceeded=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.
-refresh=Refresh
-registrationTimeout=Registration timeout:
-reject=&Reject
-rememberPassword=Remember password
-remove=&Remove
-removeAccount=&Remove account
-removeAccountMessage=Are you sure you want to remove this account?
-removeContact=&Remove subcontact
-removeContactText=<DIV>Are you sure you want to remove <B> {0} </B><BR>from your contact list?</DIV>
-removeGroup=&Remove group
-rename=&Rename
-renameContact=Re&name contact
-renameContactWizard=In the field below you can specify the name you would like to use for the given contact.
-renameGroup=Re&name group
-renameGroupInfo=In the field below you can specify the name you would like to use for the given group.
-request=&Request
-requestAuthorization=&Request authorization
-requestAuthorizationInfo=Can't add {0} to your Contact List. {0} must authorize your request to add him/her. Please enter your request below.
-requestAuthReason=Request reason
-requestAuthReasonEnter=Enter request reason
-responseAuthReasonEnter=Enter response reason
-retry=Retry
-rootGroup=Root group
-save=&Save
-search=&Search
-searchForChatRooms=&Search for chat rooms
-searchForChatRoomsText=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.
-securityAuthorityRealm=The {0} server has requested your authentication.
-selectAccount=Select account
-selectAccountRegistration=From the list below select the account registration wizard to use for creating a new account.
-selectAccountRegWizardTitle=Select account registration
-selectGroup=Select group
-selectGroupWizard=The list below contains all groups in your Contact List. Select the one, where you would like to add the new contact.
-selectGroupWizardTitle=Specify group
-selectProvidersForChatRoom=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.
-selectProvidersWizard=The list below contains all registered accounts. Select the one you would like to use to communicate with the new contact.
-selectProvidersWizardTitle=Select account
-send=&Send
-sendFile=Send &file
-selectContactSupportingInfo=There is no info for this contact.
-sendMessage=&Send a message
-sendAsSms=Send as SMS
-sendSms=S&end SMS
-sendSmsDetails=Remember that you need to enter the number in international \
+service.gui.LOGIN_GENERAL_ERROR=An error occured while logging in with account: User name: {0}, Server name: {1}.
+service.gui.LOGIN_INTERNAL_ERROR=An error occured while logging in with account: User name: {0}, Server name: {1}. This is most probably an internal application error. You could report your problem to issues@sip-communicator.dev.java.net.
+service.gui.LOGIN_INVALID_PROPERTIES_ERROR=Unable to log in with account: User name: {0}, Server name: {1}, due to an account configuration problem. Please check your account configuration.
+service.gui.LOGIN_WINDOW_TITLE=Login {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=An error occured while logging off with the following account: User name: {0}, Server name: {1}.
+service.gui.ME=me
+service.gui.MODIFY=Modify
+service.gui.MOVE=Move
+service.gui.MOVE_SUBCONTACT=M&ove contact
+service.gui.MOVE_SUBCONTACT_MSG=Select the contact or the group, where you would like to move the selected contact.
+service.gui.MOVE_SUBCONTACT_FAILED=The contact you have chosen is the same as \n the source one. Please choose another contact!
+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 this contact through another protocol or wait until he/she becomes online.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=An internal error occured. This is most probably a bug. Please report it here: http://www.sip-communicator.org/index.php/Development/BugsAndIssues. Server returned error: {0}
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Your message could not be delivered due to the following problem: {0}.
+service.gui.MSG_NOT_DELIVERED=A network problem occured. Please check your network configuration and try again. Server returned error: {0}.
+service.gui.MSG_RECEIVED={0} has sent you a message
+service.gui.MSG_SEND_CONNECTION_PROBLEM=You should be connected to be able to send messages.
+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=My chat rooms...
+service.gui.NETWORK=Network
+service.gui.NETWORK_FAILURE=Network failure
+service.gui.NEXT=&Next
+service.gui.NEXT_TOOLTIP=Browse more recent conversations
+service.gui.NEW=&New
+service.gui.NEW_ACCOUNT=Add &new account
+service.gui.NEW_MESSAGE=New message
+service.gui.NEW_NAME=New name
+service.gui.NO=No
+service.gui.NO_AVAILABLE_ROOMS=The list of rooms for this server is currently not available.
+service.gui.NO_MESSAGE=No message
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=No service.gui.ACCOUNTS, supporting multi user chat found. Check sip-communicator.org for more information on which protocols support multi user chat.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=You're trying to service.gui.CLOSE a chat with a non-sent message. Are you sure you want to service.gui.CLOSE this chat?
+service.gui.NON_EXISTING_USER_ID=The {0} server does not recognize specified user id.
+service.gui.NOTIFICATIONS=Notifications
+service.gui.OK=&OK
+service.gui.OFFLINE=Offline
+service.gui.OLDER_CALLS=Older calls
+service.gui.ONLINE=Online
+service.gui.OPEN_IN_BROWSER=Open in &browser
+service.gui.OPEN_TOOLS=Open Tools Menu
+service.gui.OPTIONS=Options
+service.gui.PASSWORD=Password
+service.gui.PASTE=&Paste
+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.PROTOCOL=Protocol
+service.gui.QUIT=&Quit
+service.gui.READY=Ready
+service.gui.REASON=Reason
+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.REJECT=&Reject
+service.gui.REMEMBER_PASSWORD=Remember password
+service.gui.REMOVE=&Remove
+service.gui.REMOVE_ACCOUNT=&Remove account
+service.gui.REMOVE_ACCOUNT_MESSAGE=Are you sure you want to remove this account?
+service.gui.REMOVE_CONTACT=&Remove subcontact
+service.gui.REMOVE_CONTACT_TEXT=<DIV>Are you sure you want to remove <B> {0} </B><BR>from your contact list?</DIV>
+service.gui.REMOVE_GROUP=&Remove group
+service.gui.RENAME=&Rename
+service.gui.RENAME_CONTACT=Re&name contact
+service.gui.RENAME_CONTACT_WIZARD=In the field below you can specify the name you would like to use for the given contact.
+service.gui.RENAME_GROUP=Re&name group
+service.gui.RENAME_GROUP_INFO=In the field below you can specify the name you would like to use for the given group.
+service.gui.REQUEST=&Request
+service.gui.REQUEST_AUTHORIZATION=&Request authorization
+service.gui.REQUEST_AUTHORIZATION_MSG=Can't add {0} to your Contact List. {0} must authorize your request to add him/her. Please enter your request below.
+service.gui.RETRY=Retry
+service.gui.ROOT_GROUP=Root group
+service.gui.SAVE=&Save
+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.SECURITY_AUTHORITY_REALM=The {0} server has requested your authentication.
+service.gui.SELECT_ACCOUNT=Select account
+service.gui.SELECT_GROUP=Select group
+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_GROUP_WIZARD=Specify group
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=The list below contains all service.gui.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 service.gui.ACCOUNTS. Select the one you would like to use to communicate with the new contact.
+service.gui.SELECT_PROVIDERS_WIZARD=Select account
+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_SMS=S&end SMS
+service.gui.SEND_SMS_DETAILS=Remember that you need to enter the number in international \
 format e.g. starting with +44 for the UK for example, +447777000000
-sendSmsNotSupported=The protocol you have selected doesn't support SMS messages.
-sendVia=Send via
-setStatusMessage=Set status message
-settings=&Options
-showCallPanel=Show call panel
-showChannelsList=Show channels list
-showOffline=Show
-showOfflineContacts=Show inactive contacts
-signin=Sign in
-smiley=Smiley
-smsSuccessfullySent=SMS message successfully sent!
-smsSendConnectionProblem=You need to be connected before being able to send SMS messages. Please connect your SMS provider account.
-specifyReason=In the field below you could specify the reason of this operation.
-sound=Sound
-soundOnOff=Turn sound on/off
-statusChangedChatMessage=has become {0}
-statusChangeGeneralError=Failed to change status for account: User name: {0}, Server name: {1}, due to a general error.
-statusChangeNetworkFailure=Failed to change status for account: User name: {0}, Server name: {1}, due to a network problem.
-statusMessageInfo=In the field below you can specify the new message you would like to use.
-subject=Subject
-summary=Summary
-today=Today
-tools=&Tools
-transferCallButton=Trans&fer
-transferCallTargetLabel=&To:
-transferCallTitle=Transfer Call
-transparencyNotEnabled=Transparency is not supported by your current configuration.
-typeYourRequest=Type your request here
-uin=User identifier:
-unknown=Unknown user
-useCtrlEnterToSend=Use Ctrl-&Enter to send
-username=Username
-msgDeliveryFailedUnknownError=Unknown error has occured while delivering your message.
-unregisteredMessage=Unable to connect the following account: User name: {0}, Server name: {1}. You are currently offline.
-updateAutomatically=Automatically install new updates
-updates=Updates
-view=&View
-viewHistory=View &history
-warning=Warning
-yes=Yes
-yesterday=Yesterday
-
-january=Jan
-february=Feb
-march=Mar
-april=Apr
-may=May
-june=Jun
-july=Jul
-august=Aug
-september=Sep
-october=Oct
-november=Nov
-december=Dec
+service.gui.SEND_SMS_NOT_SUPPORTED=The protocol you have selected doesn't support SMS messages.
+service.gui.SEND_VIA=Send via
+service.gui.SET_STATUS_MESSAGE=Set status message
+service.gui.SETTINGS=&Options
+service.gui.SHOW_OFFLINE_CONTACTS=Show inactive contacts
+service.gui.SIGN_IN=Sign in
+service.gui.SMS_SUCCESSFULLY_SENT=SMS message successfully sent!
+service.gui.SMS_SEND_CONNECTION_PROBLEM=You need to be connected before being able to send SMS messages. Please connect your SMS provider account.
+service.gui.SPECIFY_REASON=In the field below you could specify the reason of this operation.
+service.gui.SOUND_ON_OFF=Turn sound on/off
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=has become {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Failed to change status for account: User name: {0}, Server name: {1}, due to a general error.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Failed to change status for account: User name: {0}, Server name: {1}, due to a network problem.
+service.gui.STATUS_MESSAGE_INFO=In the field below you can specify the new message you would like to use.
+service.gui.SUBJECT=Subject
+service.gui.SUMMARY=Summary
+service.gui.TODAY=Today
+service.gui.TOOLS=&Tools
+service.gui.TRANSFER=Trans&fer
+service.gui.TO=&To:
+service.gui.TRANSFER_CALL_TITLE=Transfer Call
+service.gui.TRANSPARENCY_NOT_ENABLED=Transparency is not supported by your current configuration.
+service.gui.TYPE_YOUR_REQUEST=Type your request here
+service.gui.USER_IDENTIFIER=User identifier:
+service.gui.UNKNOWN=Unknown user
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Unknown error has occured while delivering your message.
+service.gui.UNREGISTERED_MESSAGE=Unable to connect the following account: User name: {0}, Server name: {1}. You are currently offline.
+service.gui.VIEW=&View
+service.gui.VIEW_HISTORY=View &history
+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.ACTIVATE=Activate
+service.gui.DEACTIVATE=Deactivate
+service.gui.NEW=New
+service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Enter Fullscreen
+service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Exit Fullscreen
+service.gui.HOLD_BUTTON_TOOL_TIP=Toggle Hold
+service.gui.MUTE_BUTTON_TOOL_TIP=Toggle Mute
+service.gui.TRANSFER_BUTTON_TOOL_TIP=Transfer Call
+
+service.gui.JANUARY=Jan
+service.gui.FEBRUARY=Feb
+service.gui.MARCH=Mar
+service.gui.APRIL=Apr
+service.gui.MAY=May
+service.gui.JUNE=Jun
+service.gui.JULY=Jul
+service.gui.AUGUST=Aug
+service.gui.SEPTEMBER=Sep
+service.gui.OCTOBER=Oct
+service.gui.NOVEMBER=Nov
+service.gui.DECEMBER=Dec
+
+# impl.protocol.ssh
+#Contact Details Seperator(must not be part of contact data stored as persistent
+# data)
+impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 # systray
-setStatus=Set Status
-onlineStatus=Online
-offlineStatus=Offline
-messageReceived=Message received from
-failedToLoadAddContactDialog=Failed to load the "Add contact" wizard dialog.
-
-# account info
-accountInfo=Account info for 
-title=Account Info
-browse=Browse
-summaryDesc=Summary of account info for
-extended=Extended
-extendedDesc=Extended account info for
-notSupported=Account info not available.
-clickWeb=Click for Web Info
-webInfo=Web Info
-firstNameNS=First Name:
-middleNameNS=Middle Name:
-lastNameNS=Last Name:
-ageNS=Age:
-bdayNS=Birth Date:
-genderNS=Gender:
-emailNS=E-mail:
-phoneNS=Phone:
-userPictures=User Pictures
-change=Change
-onlyMessages=Only messages
+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.
+
+# 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:
+plugin.accountinfo.MIDDLE_NAME=Middle Name:
+plugin.accountinfo.LAST_NAME=Last Name:
+plugin.accountinfo.AGE=Age:
+plugin.accountinfo.BDAY=Birth Date:
+plugin.accountinfo.GENDER=Gender:
+plugin.accountinfo.EMAIL=E-mail:
+plugin.accountinfo.PHONE=Phone:
+plugin.accountinfo.USER_PICTURES=User Pictures
+plugin.accountinfo.CHANGE=Change
+plugin.accountinfo.ONLY_MESSAGE=Only messages
+
+# contact info
+plugin.contactinfo.TITLE=Contact details
+plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=Summary of contact info for
+plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=Extended contact info for
+plugin.contactinfo.NOT_SPECIFIED=[Not specified]
+plugin.contactinfo.USER_PICTURES=User pictures
 
 # aimaccregwizz
-protocolNameAim=AIM
-protocolDescriptionAim=The AIM service protocol
-id=AIM Screenname:
-password=Password:
-aimUinAndPassword=UIN and Password
-registerNewAccount=Register new account
-aimRegisterNewAccountText=In case you don't have an AIM account, click on this button to create a new one.
-existingAccount=* The account you entered is already installed.
-ovverideServerOps=Override server default options
-advancedOptions=Advanced Options
-proxy=Proxy
-proxyPort=Proxy port
-proxyType=Proxy type
-proxyUsername=Proxy username
-proxyPassword=Proxy password
+plugin.aimaccregwizz.PROTOCOL_NAME=AIM
+plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=The AIM service protocol
+plugin.aimaccregwizz.USERNAME=AIM Screenname:
+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=UIN 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
+plugin.aimaccregwizz.ADVANCED_OPTIONS=Advanced Options
+plugin.aimaccregwizz.PROXY=Proxy
+plugin.aimaccregwizz.PROXY_PORT=Proxy port
+plugin.aimaccregwizz.PROXY_TYPE=Proxy type
+plugin.aimaccregwizz.PROXY_USERNAME=Proxy username
+plugin.aimaccregwizz.PROXY_PASSWORD=Proxy password
 
 # branding
-aboutWindowTitle=About {0}
-logoMessage=Open Source VoIP & Instant Messaging
-loading=Loading
-aboutMenuEntry=About
-basedOn=based on
-welcomeMessage=<DIV color={0}>The {1} is currently under active development. \
+plugin.branding.ABOUT_WINDOW_TITLE=About {0}
+plugin.branding.LOGO_MESSAGE=Open Source VoIP & Instant Messaging
+plugin.branding.LOADING=Loading
+plugin.branding.ABOUT_MENU_ENTRY=About
+plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1} is currently under active development. \
                The version you are running is only experimental and MAY NOT \
                work as expected. Please refer to {2} for more information.</DIV>
-copyright=<DIV><font size=3 color={0}>(c)2003-2007 Copyright \
+plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2007 Copyright \
           <b>sip-communicator.org</b>. All rights reserved. Visit \
           <a href="http://sip-communicator.org">http://sip-communicator.org</a>.\
           </font></DIV>
-license=<DIV color={0}>The <b>SIP Communicator</b> is distributed under \
+plugin.branding.LICENSE=<DIV color={0}>The <b>SIP Communicator</b> is distributed under \
         the terms of the LGPL (<a href=\"http://www.gnu.org\">\
         http://www.gnu.org</a>).</DIV>
 
-# contact info
-contactDetails=Contact details
-selectUser=Select a user
-contactSummaryDesc=Summary of contact info for
-contactExtendedDesc=Extended contact info for
-contactInfoNotSupported=This protocol doesn't support server stored details for now. Try one of the other protocols.
-notSpecified=[Not specified]
-
 # Dict protocol
-dict.dictionaries=Dictionaries
-dict.anyDictionary=Any Dictionary
-dict.anyDictionaryFrom=Any Dictionary from {0}
-dict.firstMatch=First Match
-dict.noMatch=No match
-dict.matchResult=No definitions found for "{0}", perhaps you mean:\n
-dict.invalidDatabase=The current dictionary "{0}" doesn't exist anymore on the server.
-dict.invalidStrategy=The current strategy isn't available on the server.
-
-# DICT Protocol Account Wizard
-dict.protocolName=Dict
-dict.protocolDescription=The Dict service protocol
-dict.host=Host
-dict.port=Port
-dict.serverInformations=Server informations
-dict.strategy=Strategy
-dict.strategySelection=Strategy selection
-dict.strategyList=List of strategies:
-dict.strategyActu=Search strategies
-dict.strategyDesc=Strategie is use to search similar words,if a translation was not found, thanks to different approaches. For example the Prefix strategies will search words which begin like the word you would translate.
-dict.accountInfoTitle=Dict Account Information
-dict.firstAccount=This wizard will create your first Dict Account for you on dict.org.\n\n\
+service.protocol.DICTIONARIES=Dictionaries
+plugin.dictaccregwizz.ANY_DICTIONARY=Any Dictionary
+plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Any Dictionary from {0}
+plugin.dictaccregwizz.FIRST_MATCH=First Match
+plugin.dictaccregwizz.NO_MATCH=No match
+plugin.dictaccregwizz.MATCH_RESULT=No definitions found for "{0}", perhaps you mean:\n
+plugin.dictaccregwizz.INVALID_DATABASE=The current dictionary "{0}" doesn't exist anymore on the server.
+plugin.dictaccregwizz.INVALID_STRATEGY=The current strategy isn't available on the server.
+plugin.dictaccregwizz.PROTOCOL_NAME=Dict
+plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=The Dict service protocol
+plugin.dictaccregwizz.HOST=Host
+plugin.dictaccregwizz.PORT=Port
+plugin.dictaccregwizz.SERVER_INFO=Server informations
+plugin.dictaccregwizz.STRATEGY_SELECTION=Strategy selection
+plugin.dictaccregwizz.STRATEGY_LIST=List of strategies:
+plugin.dictaccregwizz.SEARCH_STRATEGIES=Search strategies
+plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategy is use to search similar words,if a translation was not found, thanks to different approaches. For example the Prefix strategies will search words which begin like the word you would translate.
+plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict Account Information
+plugin.dictaccregwizz.FIRST_ACCOUNT=This wizard will create your first Dict Account for you on dict.org.\n\n\
 You can add new dictionary by going on Account Registration Wizard. Fill the host Field with dictionnary you would like to add.
-dict.threadConnect=Trying to connect to server
-dict.threadConnectFailed=Connexion attempt failed, this isn't a dict server or the server is offline
-dict.retrievingStrategies=Retrieving strategies
-dict.noStrategiesFound=No strategy found on the server
-dict.populateList=Populating list
-dict.closingConnexion=Closing connexion
-
-
-# extendedcallsearchhistory
-advancedCallHistorySearch=&Advanced call history search
-search=Search
-contactName=Contact Name
-since=Since
-until=Until
-callType=Call Type
-incoming=Incoming
-outgoing=Outgoing
-olderCalls=Older Calls
-all=all
+plugin.dictaccregwizz.THREAD_CONNECT=Trying to connect to server
+plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Connexion attempt failed, this isn't a dict server or the server is offline
+plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Retrieving strategies
+plugin.dictaccregwizz.NO_STRATEGIES_FOUND=No strategy found on the server
+plugin.dictaccregwizz.POPULATE_LIST=Populating list
+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
+plugin.callhistoryform.CALLTYPE=Call Type
+plugin.callhistoryform.INCOMING=Incoming
+plugin.callhistoryform.OUTGOING=Outgoing
 
 # generalconfig
-autoStartOption=Auto - start {0} when computer restarts or reboots.
-groupChatMessages=Group chat messages in one window.
-logHistory=Log chat history
-showHistory=Show history
-historySize=recent messages in new chats
-sendMessagesWith=Send messages with:
-enableTypingNotifications=Enable typing notifications
-bringWindowToFront=Bring chat window to front
-errorPermission=You don't have enough privileges to remove autostart
-transparency=Transparency
-enableTransparency=Enable transparency
+plugin.generalconfig.AUTO_START=Auto - start {0} when computer restarts or reboots.
+plugin.generalconfig.GROUP_CHAT_MESSAGES=Group chat messages in one window.
+plugin.generalconfig.LOG_HISTORY=Log chat history
+plugin.generalconfig.SHOW_HISTORY=Show history
+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
 
 # gibberish accregwizz
-protocolNameGibberish=Gibberish
-protocolDescriptionGibberish=A SIP Communicator test protocol.
-userID=User ID:
-userAndPassword=Identification
+plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
+plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=A SIP Communicator test protocol.
+plugin.gibberishaccregwizz.USERNAME=User ID:
+plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=Identification
 
 # icqaccregwizz
-protocolNameIcq=ICQ
-protocolDescriptionIcq=The AOL ICQ service protocol
-uin=ICQ Number:
-icqRegisterNewAccountText=In case you don't have an ICQ account, click on this button to create a new one.
+plugin.icqaccregwizz.PROTOCOL_NAME=ICQ
+plugin.icqaccregwizz.PROTOCOL_DESCRIPTION=The AOL ICQ service protocol
+plugin.icqaccregwizz.USERNAME=ICQ Number:
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have an ICQ account, click on this button to create a new one.
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Register new account
+plugin.icqaccregwizz.PROXY=Proxy
+plugin.icqaccregwizz.PROXY_PORT=Proxy port
+plugin.icqaccregwizz.PROXY_USERNAME=Proxy username
+plugin.icqaccregwizz.PROXY_PASSWORD=Proxy password
+plugin.icqaccregwizz.PROXY_TYPE=Proxy type
 
 # irc accregwizz
-protocolNameIrc=IRC
-protocolDescriptionIrc=IRC protocol.
-nick=Nickname:
-infoPassword=Most IRC servers do not require password.
-autoNickChange=Automatically change nick when it's already used
-defaultPort=Use default port
-passwordNotRequired=My nickname doesn't require identification
-server=Hostname:
-port=Port:
-serverIRC=Server
+plugin.ircaccregwizz.PROTOCOL_NAME=IRC
+plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC protocol.
+plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN and password
+plugin.ircaccregwizz.USERNAME=Nickname:
+plugin.ircaccregwizz.INFO_PASSWORD=Most IRC servers do not require password.
+plugin.ircaccregwizz.AUTO_NICK_CHANGE=Automatically change nick when it's already used
+plugin.ircaccregwizz.USE_DEFAULT_PORT=Use default port
+plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=My nickname doesn't require identification
+plugin.ircaccregwizz.HOST=Hostname:
+plugin.ircaccregwizz.PORT=Port:
+plugin.ircaccregwizz.IRC_SERVER=Server
 
 # jabber accregwizz
-protocolNameJabber=JABBER
-protocolDescriptionJabber=The Jabber protocol
-jabberUsername=Jabber username
-password2=Confirm password
-userIDAndPassword=ID and Password
-cserver=Server
-server=Connect Server
-port=Port
-enableKeepAlive=Enable keep alive
-newAccountTitle=Jabber new account registration
-registerNewAccountText=In case you don't have a Jabber account, click on this button to create a new one.
-chooseTitle=Jabber new account server chooser
-chooseServerText=Choose the server for your new account in the list below.
-okLabel=&OK
-cancelLabel=C&ancel
-chooseLabel=&Choose
-serverColumn=Server
-commentColumn=Comment
-resource=Resource
-priority=Priority
-
-xmppError=XMPP Error
-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.
+plugin.jabberaccregwizz.PROTOCOL_NAME=JABBER
+plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=The Jabber protocol
+plugin.jabberaccregwizz.USERNAME=Jabber username
+plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirm password
+plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID and Password
+plugin.jabberaccregwizz.CSERVER=Server
+plugin.jabberaccregwizz.SERVER=Connect Server
+plugin.jabberaccregwizz.PORT=Port
+plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Enable keep alive
+plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=Jabber new account registration
+plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Jabber account, click on this button to create a new one.
+plugin.jabberaccregwizz.CHOOSE_SERVER_TITLE=Jabber new account server chooser
+plugin.jabberaccregwizz.CHOOSE_SERVER_TEXT=Choose the server for your new account in the list below.
+plugin.jabberaccregwizz.CHOOSE=&Choose
+plugin.jabberaccregwizz.SERVER_COLUMN=Server
+plugin.jabberaccregwizz.COMMENT_COLUMN=Comment
+plugin.jabberaccregwizz.RESOURCE=Resource
+plugin.jabberaccregwizz.PRIORITY=Priority
+plugin.jabberaccregwizz.XMPP_ERROR=XMPP Error
+plugin.jabberaccregwizz.USER_EXISTS_ERROR=This user already exist on this server. Choose another user or server.
+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unknown XMPP error. Verify that the server name is correct.
+plugin.jabberaccregwizz.NOT_SAME_PASSWORD=The two entered password aren't the same.
+plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
+plugin.jabberaccregwizz.ADVANCED_OPTIONS=Advanced options
 
 # mailbox
-outgoing=Outgoing Message:
-incoming=Incoming Messages:
-waitTime=Delay Until Call Sent to Voicemail
-maxMessageTime=Maximum Incoming Message Duration
-confirm=Confirm
-default=Defaults
-mailbox=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
+plugin.mailbox.DEFAULTS=Defaults
+plugin.mailbox.MAILBOX=Mailbox
 
 # msn accregwizz 
-protocolNameMsn=MSN
-protocolDescriptionMsn=A protocol to connect and chat on the  MSN Service.
-id=Email:
-msnUinAndPassword=ID and Password
+plugin.msnaccregwizz.PROTOCOL_NAME=MSN
+plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=A protocol to connect and chat on the  MSN Service.
+plugin.msnaccregwizz.USERNAME=Email:
+plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID and Password
 
 # plugin manager
-activate=Activate
-deactivate=Deactivate
-install=Install
-uninstall=Uninstall
-update=Update
-new=New
-plugins=Plug-ins
-cancel=Cancel
-url=Url
-chooseFile=Select File
-showSystemBundles=Show system bundles
-system=System
+plugin.pluginmanager.INSTALL=Install
+plugin.pluginmanager.UNINSTALL=Uninstall
+plugin.pluginmanager.UPDATE=Update
+plugin.pluginmanager.PLUGINS=Plug-ins
+plugin.pluginmanager.URL=Url
+plugin.pluginmanager.CHOOSE_FILE=Select File
+plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=Show system bundles
+plugin.pluginmanager.SYSTEM=System
+plugin.pluginmanager.NEW=New
 
 # rss accregwizz
-protocolNameRss=RSS
-protocolDescriptionRss=Add your preferred RSS feeds into SIP Communicator !
-rssAccountExist=RSS account already exists!
-rssAccountInfo=This wizard will create an RSS account for you.\n\n\
+plugin.rssaccregwizz.PROTOCOL_NAME=RSS
+plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into SIP Communicator !
+plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=RSS account already exists!
+plugin.rssaccregwizz.ACCOUNT_INFO=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!
-confirmRemoveMissingContactMessage=The folloing RSS flow seems to be no longer accessible. Would you like to remove it?\n\n Address: {0}
-confirmRemoveMissingContactTitle=Remove missing contactems to be no longer accessible. Would you like to remove it?\n\n 
+plugin.rssaccregwizz.ACCOUNT_INFO_TITLE=RSS Account Information
+plugin.rssaccregwizz.ACCOUNT_ATTENTION=Please read attentively the information provided below!
+plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL=The folloing RSS flow seems to be no longer accessible. Would you like to remove it?\n\n Address: {0}
+plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL_TITLE=Remove missing contactems to be no longer accessible. Would you like to remove it?\n\n 
 
 # simple accregwizz
-initialAccountRegistration=Configure all your favorite protocols in one click.
-signup=Not registered yet?
-specialSignup=Not registered yet ? - click here to get a new username
-cancel=Cancel
+plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION=Configure all your favorite protocols in one click.
+plugin.simpleaccregwizz.SIGNUP=Not registered yet?
+plugin.simpleaccregwizz.SPECIAL_SIGNUP=Not registered yet ? - click here to get a new username
 
 # sipaccregwizz
-protocolNameSip=SIP
-protocolDescriptionSip=The SIP protocol
-id=SIP id
-sipUinAndPassword=User name and password
-registrar=Registrar
-serverPort=Server port
-preferredTransport=Preferred transport
-enablePresence=Enable presence (SIMPLE)
-forceP2PPresence=Force peer-to-peer presence mode
-enableDefaultEncryption=Enable default call encryption 
-offlineContactPollingPeriod=Offline contacts polling period (in s.)
-subscriptionExpiration=Default subscription duration (in s.)
-presenceOptions=Presence Options
-keepAlive=Keep alive
-keepAliveMethod=Keep alive method
-keepAliveInterval=Keep alive interval
-keepAliveIntervalEx=Between 1 and 3600 seconds
-register=REGISTER
+plugin.sipaccregwizz.PROTOCOL_NAME=SIP
+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=The SIP protocol
+plugin.sipaccregwizz.USERNAME=SIP id
+plugin.sipaccregwizz.USERNAME_AND_PASSWORD=User name and password
+plugin.sipaccregwizz.REGISTRAR=Registrar
+plugin.sipaccregwizz.SERVER_PORT=Server port
+plugin.sipaccregwizz.PROXY=Proxy
+plugin.sipaccregwizz.PROXY_PORT=Proxy port
+plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport
+plugin.sipaccregwizz.ENABLE_PRESENCE=Enable presence (SIMPLE)
+plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Force peer-to-peer presence mode
+plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Offline contacts polling period (in s.)
+plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION=Default subscription duration (in s.)
+plugin.sipaccregwizz.PRESENCE_OPTIONS=Presence Options
+plugin.sipaccregwizz.KEEP_ALIVE=Keep alive
+plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Keep alive method
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Keep alive interval
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Between 1 and 3600 seconds
+plugin.sipaccregwizz.REGISTER=REGISTER
+plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
+plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Enable default call encryption 
 
 # ssh accregwizz
-protocolNameSsh=SSH
-protocolDescriptionSsh=A Protocol to connect to remote machines over SSH.
-accountID=Account ID:
-identityFile=Identitity File:
-knownHosts=Known Hosts:
-accountDetails=SSH Account Details
+plugin.sshaccregwizz.PROTOCOL_NAME=SSH
+plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=A Protocol to connect to remote machines over SSH.
+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
 
 # status update
-automaticStatus=Auto Away
-enableChangeStatus=Change status while away
-awayMinutes=Minutes before switching to away :
-infotext=Set "Idle", when your computer is not used for X minutes. The status is reset to the status before, when activity is detected.
+plugin.autoaway.AUTO_STATUS=Auto Away
+plugin.autoaway.ENABLE_CHANGE_STATUS=Change status while away
+plugin.autoaway.AWAY_MINUTES=Minutes before switching to away :
 
 # updatechecker
-dialogTitle=New version available
-dialogMessage1=<html>A new version of {0} is available for download.
-dialogMessage2=<br>{0} ({1}): <br>
-dialogMessageDebian=
-buttonDownload=Download
-buttonClose=Close
+plugin.updatechecker.DIALOG_TITLE=New version available
+plugin.updatechecker.DIALOG_MESSAGE=<html>A new version of {0} is available for download.
+plugin.updatechecker.DIALOG_MESSAGE_2=<br>{0} ({1}): <br>
+plugin.updatechecker.BUTTON_DOWNLOAD=Download
+plugin.updatechecker.BUTTON_CLOSE=service.gui.CLOSE
 
 # whiteboard
-invitationReceivedFormInfo={0} has invited you to join {1} whiteboard. You could accept, reject or ignore this invitation.
-whiteboardTitle=Whiteboard [Beta]
-whiteboardMenuItemText=Whiteboard
-whiteboardMenuItemNotSupportedTooltip=This contact does not support whiteboarding
-cancel=Cancel
-doNotAskAgain=Do not ask me again.
-closeSessionQuestion=Would you like to end current session ? If you choose "yes" the current session will be ended, otherwise only your whiteboard window will be closed.
-file=File
-draw=Draw
-new=New
-save=Save
-open=Open
-copy=Copy
-paste=Paste
-pen=Pen
-select=Select
-line=Line
-rectangle=Rectangle
-fillRectangle=Filled rectangle
-text=Text
-image=Image
-polygon=Polygon
-fillPolygon=Filled polygon
-polyline=Polyline
-circle=Circle
-fillCircle=Filled circle
-color=Color
-modification=Modification
-thickness=Thickness:
-send=Send
-print=Print
-exit=Exit
-edit=Edit
-grid=Grid
-deselect=Deselect
-delete=Delete
-properties=Properties
-help=Help
-About=About
+plugin.whiteboard.TITLE=Whiteboard [Beta]
+plugin.whiteboard.MENU_ITEM=Whiteboard
+plugin.whiteboard.NOT_SUPPORTED=This contact does not support whiteboarding
+plugin.whiteboard.DRAW=Draw
+plugin.whiteboard.OPEN=Open
+plugin.whiteboard.PEN=Pen
+plugin.whiteboard.SELECT=Select
+plugin.whiteboard.LINE=Line
+plugin.whiteboard.RECTANGLE=Rectangle
+plugin.whiteboard.FILLED_RECTANGLE=Filled rectangle
+plugin.whiteboard.TEXT=Text
+plugin.whiteboard.IMAGE=Image
+plugin.whiteboard.POLYGON=Polygon
+plugin.whiteboard.FILLEDPOLYGON=Filled polygon
+plugin.whiteboard.POLYLINE=Polyline
+plugin.whiteboard.CIRCLE=Circle
+plugin.whiteboard.FILLED_CIRCLE=Filled circle
+plugin.whiteboard.COLOR=Color
+plugin.whiteboard.MODIFICATION=Modification
+plugin.whiteboard.THICKNESS=Thickness:
+plugin.whiteboard.GRID=Grid
+plugin.whiteboard.DESELECT=Deselect
+plugin.whiteboard.DELETE=Delete
+plugin.whiteboard.PROPERTIES=Properties
 
 # yahoo accregwizz
-protocolNameYahoo=YAHOO
-protocolDescriptionYahoo=A protocol to connect and chat on the  Yahoo Service.
-id=Username:
-yahooUinAndPassword=ID and Password
+plugin.yahooaccregwizz.PROTOCOL_NAME=YAHOO
+plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=A protocol to connect and chat on the  Yahoo Service.
+plugin.yahooaccregwizz.USERNAME=Username:
+plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID and Password
 
 # zero accregwizz
-protocolNameZeroconf=Zeroconf
-protocolDescriptionZeroconf=The Zeroconf (Bonjour) service protocol.
-firstname=Firname:
-
-# ssh protocol
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-detailsSeperator=~
-
-# msn protocol
-newMail=<b>You have one new Mail!</b><br/><b>From:</b> {0} {1} <br/><b>Subject:</b> {2} <br/>{3};
-
-# yahoo protocol
-newYahooMail=New mail, subject
-fromYahoo=From
+plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
+plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=The Zeroconf (Bonjour) service protocol.
+plugin.zeroaccregwizz.FIRST_NAME=First name:
+plugin.zeroaccregwizz.LAST_NAME=Last name:
+plugin.zeroaccregwizz.EMAIL=Email:
+plugin.zeroaccregwizz.REMEMBER_CONTACTS=Remember Bonjour contacts?
+plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID and Password
+plugin.zeroaccregwizz.USERID=User ID
 
 # gtalk accregwizz
-protocolName=GOOGLE TALK
-protocolDescription=The Google Talk protocol
-gtalkUsername=Google Talk username
-gtalkRegisterNewAccountText=In case you don't have a Google Talk account, click on this button to create a new one.
+plugin.googletalkaccregwizz.PROTOCOL_NAME=GOOGLE TALK
+plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=The Google Talk protocol
+plugin.googletalkaccregwizz.USERNAME=Google Talk username
+plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Google Talk account, click on this button to create a new one.
+plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE=Google Talk new account registration
 
 # key binding chooser
-keybindings=Keybindings
-chat-nextTab=Next Chat Tab
-chat-previousTab=Previous Chat Tab
-chat-copy=Copy
-chat-paste=Paste
-chat-openSmilies=Show Smilies
-chat-openHistory=Show History
-chat-close=Close Chat Window
-chat-cut=Cut
-main-rename=Rename
-main-nextTab=Next Contact List Tab
-main-previousTab=Previous Contact List Tab
+plugin.keybindings.PLUGIN_NAME=Keybindings
+plugin.keybindings.NEXT_CHAT_TAB=Next Chat Tab
+plugin.keybindings.PREVIOUS_CHAT_TAB=Previous Chat Tab
+plugin.keybindings.OPEN_SMILIES=Show Smilies
+plugin.keybindings.OPEN_HISTORY=Show History
+plugin.keybindings.service.gui.CLOSE=service.gui.CLOSE Chat Window
+plugin.keybindings.NEXT_CONTACT_LIST_TAB=Next Contact List Tab
+plugin.keybindings.PREVIOUS_CONTACT_LIST_TAB=Previous Contact List Tab
+plugin.keybindings.MAIN_RENAME=Rename contact
+plugin.keybindings.CHAT_NEXT_TAB=Next tab
+plugin.keybindings.CHAT_PREVIOUS_TAB=Previous tab
+plugin.keybindings.CHAT_COPY=Copy
+plugin.keybindings.CHAT_PASTE=Paste
+plugin.keybindings.CHAT_CUT=Cut
+plugin.keybindings.CHAT_OPEN_SMILIES=Open smilies
+plugin.keybindings.CHAT_OPEN_HISTORY=Open history
 
 # Notification Configuration Form
-play=Play
-turnonall=Turn On All
-turnoffall=Turn Off All
-actions=Actions
-quickcontrols=Quick Controls
-restore=Restore Defaults
-playsound=Play a sound :
-execprog=Execute a program :
-displaypopup=Show a message in a pop-up window
+plugin.notificationconfig.TURN_ON_ALL=Turn On All
+plugin.notificationconfig.TURN_OFF_ALL=Turn Off All
+plugin.notificationconfig.ACTIONS=Actions
+plugin.notificationconfig.QUICK_CONTROLS=Quick Controls
+plugin.notificationconfig.RESTORE=Restore Defaults
+plugin.notificationconfig.PLAY_SOUND=Play a sound :
+plugin.notificationconfig.EXEC_PROG=Execute a program :
+plugin.notificationconfig.DISPLAY_POPUP=Show a message in a pop-up window
 
 # ZRTP Securing
-toggleOffSecurity=Toggle secure call mode off
-toggleOnSecurity=Try toggle secure call mode on
-engineInitFailure=Securing engine initialization failure
-allowClearRequestFailure=Peer doesn't support unsecuring the call
-defaultSASTooltip=Secure status field
-defaultSASMessage= Not in call 
-sasSecuredTooltip=Check this string by voice with your peer to verify secure comm link
-sasSecuredMessage=Secured: 
-sasNotSecuredTooltip=Secure mode not enabled
-sasNotSecuredMessage=Not secured
-sasEngineFailTooltip=Engine failed at initialization
-sasEngineFailMessage=Engine failure
-sasSecuringFailTooltip=Securing call failed
-sasUnsecuredAtRequestTooltip=Call unsecured at request
-peerUnsuportedSecurity=<html>You have enabled secure init mode<br/>You can't switch off this mode at this moment<br/>The call is not secured yet anyway</html>
-sasPeerUnsuportedTooltip=Securing call not supported/enabled by the other peer
-peerToggledOffSecurityMessage=Call peer toggled secure mode off
-peerToggledOffSecurityCaption=Secure Off
-sasUnsecuredAtPeerRequestTooltip=Call unsecured at peer request
+impl.media.security.TOGGLE_OFF_SECURITY=Toggle secure call mode off
+impl.media.security.TOGGLE_ON_SECURITY=Try toggle secure call mode on
+impl.media.security.ENGINE_INIT_FAILURE=Securing engine initialization failure
+impl.media.security.ALLOW_CLEAR_REQUEST_FAILURE=Peer doesn't support unsecuring the call
+impl.media.security.DEFAULT_TOOLTIP=Secure status field
+impl.media.security.DEFAULT_MESSAGE=Not in call 
+impl.media.security.SECURED_TOOLTIP=Check this string by voice with your peer to verify secure comm link
+impl.media.security.SECURED_MESSAGE=Secured: 
+impl.media.security.NOT_SECURED_TOOLTIP=Secure mode not enabled
+impl.media.security.NOT_SECURED_MESSAGE=Not secured
+impl.media.security.ENGINE_FAIL_TOOLTIP=Engine failed at initialization
+impl.media.security.ENGINE_FAIL_MESSAGE=Engine failure
+impl.media.security.SECURING_FAIL_TOOLTIP=Securing call failed
+impl.media.security.UNSECURED_AT_REQUEST=Call unsecured at request
+impl.media.security.PEER_UNSUPPORTED_SECURITY=<html>You have enabled secure init mode<br/>You can't switch off this mode at this moment<br/>The call is not secured yet anyway</html>
+impl.media.security.PEER_UNSUPPORTED_TOOLTIP=Securing call not supported/enabled by the other peer
+impl.media.security.PEER_TOGGLED_OFF_SECURITY_MESSAGE=Call peer toggled secure mode off
+impl.media.security.PEER_TOGGLED_OFF_SECURITY_SECTION=Secure Off
+impl.media.security.UNSECURED_AT_PEER_REQUEST_TOOLTIP=Call unsecured at peer request
 
 # Profiler4J
-profiler=Profiler4j
-
-CallParticipantPanel_enterFullScreenButtonToolTipText=Enter Fullscreen
-CallParticipantPanel_exitFullScreenButtonToolTipText=Exit Fullscreen
-
-DeviceConfigurationComboBoxModel_noDevice=<No Device>
-
-HoldButton_toolTipText=Toggle Hold
-
-MediaConfigurationForm_title=Media
-MediaConfigurationPanel_audio=&Audio:
-MediaConfigurationPanel_down=&Down
-MediaConfigurationPanel_encodings=&Encodings:
-MediaConfigurationPanel_noPreview=Preview
-MediaConfigurationPanel_up=&Up
-MediaConfigurationPanel_video=&Video:
-
-MuteButton_toolTipText=Toggle Mute
-
-TransferCallButton_toolTipText=Transfer Call
+plugin.profiler.PLUGIN_NAME=Profiler4j
+
+impl.media.configform.NO_DEVICE=<No Device>
+impl.media.configform.TITLE=Media
+impl.media.configform.AUDIO=&Audio:
+impl.media.configform.DOWN=&Down
+impl.media.configform.ENCODINGS=&Encodings:
+impl.media.configform.NO_PREVIEW=Preview
+impl.media.configform.UP=&Up
+impl.media.configform.VIDEO=&Video:
diff --git a/resources/languages/resources_bg.properties b/resources/languages/resources_bg.properties
index 1b3baf5..1af28e4 100644
--- a/resources/languages/resources_bg.properties
+++ b/resources/languages/resources_bg.properties
@@ -6,292 +6,244 @@
 # Incomplete Bulgarian translation.
 # Author: Yana Stamcheva
 
-about=Отно�но
-accept=&Приемам
-account=Сметка
-accountRegistrationWizard=Реги�траци� на �метка
-accounts=Сметки
-activateOnlyWhenMinimized=Activate only when minimized
-add=&Добави
-addContact=&Добави контакт
-addContactError=�еу�пешно добав�не на контакт � идентификатор: {0}
-addContactErrorTitle=Грешка при добав�не на контакт
-addContactExistError=Контактът {0} вече �ъще�твува във ваши�т �пи�ък � контакти.
-addContactIdentifier=В полето по-долу въведете идентификатора на контакта, който бихте и�кали да добавите.
-addContactWizard=Добав�не на контакт
-addGroupLocalError=�еу�пешно добав�не на група: {0}. Проблемът е възникнал по време на входно-изходно операци�.
-addGroupNetError=�еу�пешно добав�не на група: {0}. Проблемът е възникнал по време на мрежова операци�. Проверете мрежовите �и на�тройки и опитайте отново.
-addGroupError=�еу�пешно добав�не на група: {0}.
-addGroupErrorTitle=Грешка при добав�не на група
-addGroupExistError=Групата {0} е вече добавена към ваши� �пи�ък � контакти.
-addSubcontact=&Добав�не на подконтакт
-all=&В�ички
-allContacts=&В�ички контаки
-alwaysOnTop=Винаги на преден план
-appearance=Външен вид
-application=Приложение
-apply=&Приложи
-at=от
-authAccepted=контакт прие вашата молба за добав�не.
-authenticationWindowTitle=Проверка на �амолично�тта
-authRejected=контакт отказа вашата молба за добав�не.
-authorizationRequested=Молба за добав�не
-authorizationRequestedInfo=Контактът {0} пои�ка да ви добави.
-authenticationFailed=�еу�пешна проверка на �амолично�тта за потребител {0}, от �ървър {1}. Въвели �те невалидна парола.
-authorizationResponse=Отговор на молба за добав�не
-autoPopup=Изкарай прозореца на преден план.
-awayStatus=��ма ме
-back=&�азад
-ban=&Забрана
-banFailed=Забраната �е провали
-banFailedGeneralError=�еу�пешен опит за забран�ване на {0}. Възникна грешка на �ървъра.
-banFailedNotAllowed=�еу�пешен опит за забран�ване на {0}. Соб�твеникът и админи�тратора на �та�та не могат да бъдат забран�вани.
-banFailedNotEnoughPermissions=��мате нужните права за да о�ъще�твите забраната на {0}.
-brbMessage=В момента ме н�ма, но ще �е върна �коро.
-busyMessage=Сори, зает �ъм в момента.
-call=Обаждане
-callVia=Обаждане през:
-callList=Спи�ък на обажданиата
-cancel=&Отмени
-chatRoomAlreadyJoined=Вече �те влезли в �та� {0}.
-chatRoomConfiguration={0} конфигуриране на �та�
-chatRoomOpenConfigFailed=Грешка при изтегл�не на конфигурационните данни за �та� {0}.
-chatRoomOpenConfigForbidden=Грешка при изтегл�не на конфигурационните данни за �та� {0}. Само админи�траторите на �та�та могат да кон�ултират и промен�т нейните на�тройки.
-chatRoomConfigFormSubmitFailed=An error occured while trying to submit the configuration form for chat room {0}.
-chatRoomUserJoined=влезе в {0}
-chatRoomUserLeft=напу�на {0}
-chatRoomUserKicked=беше изритан от {0}
-chatRoomUserQuit=напу�на {0}
-chatRoomName=Име на �та�
-chatRoomNameInfo=Мол� въведете името на �та�та ко�то желаете да �ъздадете.
-chatRoomNotExist=�е у�п�х да намер� �та� {0} на �ървър {1}. Мол� проверете дали правилно �те напи�али името.
-chatRoomNotConnected=Тр�бва да �е включите към �ървъра (логнете) преди да може да влезете в �та� {0}.
-chatRoomNotJoined=Тр�бва да �те в �та�та за да можете да оперирате � не�.
-chatRoomOptions=�а�тройки на �та�та
-chatRoomRegistrationRequired=�ужно е да �е реги�трирате за да влезнете в �та� {0}.
-chatRoomRequiresPassword=�ужна е парола за �та� {0}.
-chatRooms=Стаи за разговори
-chatRoomSubjectChanged={0} �мени темата на {1}
-close=&Затвар�не
-closeChatAfterNewMsg=Получихте �ъобщение преди по-малко от 2 �екунди. Сигурни ли �те, че въпреки това желаете да затворите прозореца за този разговор?
-conference=Конференци�
-configure=&�а�тройване
-configuration=�а�тройки
-connectionFailed=Връзката е прекъ�ната
-connectionFailedMessage=Връзката към �ървър {1} е прекъ�ната за потребител {0}.
-connectionExpiredMessage=В момента не �те �вързани � {0}.
-contactAddress=�дре� на контакта
-contactNotSupportingTelephony={0} не поддържа телефонните разговори.
-contactPausedTyping={0} �пр� да пише
-contactTyping={0} пише �ъобщение
-contactTypingStateStale=�тату�ът на пи�ането не е обновен
-contacts=Контакти
-continue=&По-нататък
-copy=&Копирай
-copyLink=Копирай &връзка
-create=С&ъздай
-createChatRoom=&Създай �та� за разговори...
-createChatRoomNotSupported=�еу�пешен опит за �ъздаване на �та�: {0}. Сървър {1} не поддържа тази операци�.
-createChatRoomError=�еу�пешен опит за �ъздаване на �та�: {0}.
-createChatRoomWizard=Create chat room wizard
-createGroup=&Създай групa
-createGroupName=Въведете името на групата, ко�то бихте и�кали да �ъздадете.
-createFirstGroupWizard=Спи�ъкът ви � контакти не �ъдържа групи. Мол� добавете група от меню Файл/Добави група.
-cut=О&трежи
-date=Дата
-description=Опи�ан�
-dial=&�абери
-dialpad=Панел за набиране
-dndStatus=�е ме безпокойте
-doNotAskAgain=�е ме питай повече
-doNotShowAgain=Повече не ми показвай това �ъобщение
-dontSupportWebInfo=Контактът не поддържа уеб информаци�
-duration=Продължително�т
-edit=&Редактирай
-emptyHistory=&Изтрий и�тори�та
-enableNotifications=Включи изве�т�ваниата
-enableTypingNotifications=Включи �тату�а на &пи�ане
-error=Грешка
-exit=И&зход
-extendedCriteria=Допълнителни у�лови�
-general=Общи
-generalError=Обща грешка
-group=Група
-groupName=Име на групата
-failedToCreateChatRoom=�еу�пешен опит за �ъздаване на група: {0}.
-failedToJoinChatRoom=�еу�пешен опит за влизане в �та�: {0}.
-ffcStatus=Бъбри ми �е
-file=&Файл
-findChatRoomError=Ста�та {0} не е намерена.
-finish=&Приключи
-first=Първи
-font=Шрифт
-haveToBeConnectedToJoin=Тр�бва да �те �вързани �ъ� �ървъра преди да влезете в �та�та. Свържете �е и опитайте пак.
-haveToBeConnectedToLeave=Тр�бва да �е �вържете преди да напу�нете �та�та (парадок�ално, а :) ).
-help=?
-hideCallPanel=&Скрии панела за обажданиата
-hideMainWindow=Бутонът "X" н�ма да прекрати програмата а �амо ще � �крие.<br/>�ко желаете да излезнете можете да го направите от меню Файл/Изход.
-history=&И�тори�
-historyContact=И�тори� - {0}
-hour=Ча�
-identifier=Ключ
-ignore=&Пренебрегни
-insertSmiley=У�михнати човечета
-invalidCall=�евалидно обаждане
-invitation=Тек�т на поканата
-invitationReceived=Получена е покана
-invitationReceivedFormInfo={0} ви кани да влезете в �та� {1}. Можете да приемете, откажете или да пренебрегнете тази покана.
-invite=&Покана
-inviteContactFormInfo=Мол� въведете името на потребител� който бихте желали да поканите. �ко желаете можете да въведете и об��нение към поканата.
-inviteContactToChat=Покани контакт на чат
-join=&Влез
-joinAs=В&лез като
-joinChatRoom=&Влез в �та� за разговори...
-joinChatRoomTitle=Влизане в �та� за разговори
-joinChatRoomName=Мол�, въведете името на �та�та, в ко�то желаете да влезнете.
-joinChatRoomWizard=��и�тент за влизане в �та�.
-kick=&Изритай
-kickFailed=�еу�пешен опит за изритване
-kickFailedGeneralError=При опит за изритване на {0} възникна грешка на �ървъва. Опитът е неу�пешен.
-kickFailedNotAllowed=�еу�пешен опит за изритване на {0}. Соб�твениците и админи�траторите на една �та� не могат да бъдат изритвани.
-kickFailedNotEnoughPermissions=��мата правата необходими за изритването на {0}.
-last=По�ледно
-launchBrowserError=Грешка при опит за отвар�не на уеб браузър.
-launchOnStartUp=Пу�ни при �тартиране
-leave=&�апу�ни
-limitReachedForIp=Имате прекалено много реги�трации от текущи� ви адре� и �ървърт на {0} не разрешава отвар�нето на нови.
-login=&Включване
-loginNotSucceeded=Възникна грешка при �вързване на потребител {0} �ъ� �ървър: {1}.
-loginWindowTitle=Включване {0}
-logoffNotSucceeded=Възникна грешка при �вързване на потребител {0} �ъ� �ървър: {1}.
-me=аз
-modify=&Промени
-moveSubcontactMsg=Изберете контакта където желаете да преме�тите.
-moveSubcontact=Пре&ме�ти подконтакт
-moveSubcontactInSameContact=Подконтактът вече �е намира в този контакт. \n Мол� изберете друг отправен контакт!
-moveToGroup=Пре&ме�ти група
-msgDeliveryFailure=До�тавката на горното �ъобщение �е провали
-msgDeliveryOfflineNotSupported=Протоколът който използвате не позвол�ва �ъобщени�та към не включени потребители. Опитайте да �е �вържете � контакта чрез друг протокол или изчакайте да �е включи.
-msgDeliveryInternalError=Възникна грешка в програмата. Това най-веро�тно е бъг. Ще ви бъдем благодарни ако ни уведомите: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
-msgNotDelivered=Възникна проблем � мрежовата връзка.
-msgReceived=Получихте �ъобщение от {0}
-msgSendConnectionProblem=Тр�бва да �е �вържете за да можете да изпращате �ъобщени�.
-multipleLogins=Свързали �те �е повече от веднъж � един и �ъщ акаунт. Потребител {0} на �ървър {1} ше бъде изключен.
-name=Име
-networkFailure=Проблем � мрежата
-next=&�апред
-new=&�ов
-newAccount=&�ов акаунт
-newMessage=�ово �ъобщение...
-newName=�ово име:
-newStatusMessage=�ово �тату� �ъобщение
-no=�е
-noAccountFound=За да използвате СИП Комуникатор тр�бва да реги�трирате поне един акаунт (потребител). С този а�и�тент ще ви помогнем да го направите.
-noAvailableRooms=Спи�ъкът от �таи за този �ървър не е наличен в момента.
-noMessage=��ма �ъобщение
-noMultiChatAccountAvailable=��ма акаунт който да поддържа �таи за разговор. За да разберете кои протоколи поддържат тази функционално�т проверете на sip-communicator.org.
-nonEmptyChatWindowClose=Опитвате �е да затворите прозорец � неизпратено �ъобщение, \nкоето би довело до загубата му. Сигурни ли �те?
-nonExistingUserId=Сървърът на {0} не разпознава въведени� от ва� потребител.
-notifications=Изве�т�вани�
-ok=&ОК
-offline=Изключен
-olderCalls=Предишни обаждани�
-online=Включен
-openInBrowser=Отвори в &браузър
-options=�а�тройки
-passwd=Парола:
-paste=&Залепи
-previous=�а&зад
-print=&Печат
-protocol=Протокол
-providerNotConnected=Тр�бва да �е �вържете за да можете да комуникирате.
-quit=И&зход
-ready=Готов
-reason=Причина
-reconnectionLimitExceeded=О�ъще�твихте н�колко включвани� и изключвани� в прекалено кратък интервал от време. Потребител {0} е временно забранен на �ървър {1} и ще тр�бва да изчака преди да �е включи отново.
-refresh=Поднови
-registrationTimeout=Реги�траци�та е пре�рочена:
-reject=&Отказ
-rememberPassword=Запомни паролата
-remove=&Премахни
-removeAccount=&Премахни акаунт
-removeAccountMessage=Сигурен ли �те, че и�кате да премахне този акаунт?
-removeContact=Премахни под&контакт
-removeGroup=Премахни &група
-rename=Пре&именувай
-renameContact=Пре&именувай контакт
-renameContactWizard=Въведете иново име за избрани� контакт.
-renameGroup=Пре&именувай група
-renameGroupInfo=Въведете ново име за избраната група.
-request=&Молба
-requestAuthorization=&Молба за оторизиране
-requestAuthorizationInfo={0} не може да бъде добавен към �пи�ъка ви � контакта. {0} тр�бва да ви оторизира преди да бъде вкаран в �пи�ъка ви. Можл� въведете молба по-долу.
-requestAuthReason=Тек�т към молбата
-requestAuthReasonEnter=Въведете тек�т към молбата
-responseAuthReasonEnter=Въведете тек�т към отговора
-rootGroup=Група корен
-save=&Запази
-search=&Тър�и
-searchForChatRooms=&Тър�и �таи за разговор
-searchForChatRoomsText=Използвайе бутона за да видите в�ички �таи от избрани� �ървър и � бутона Влез, изберете тази, в ко�то и�кате да влезете.
-securityAuthorityRealm=Идентификаци� за �ървър {0}.
-selectAccount=Изберете потребител
-selectAccountRegistration=Изберете един от а�и�тентите в �пи�ъка по-долу за да можете да �ъздадете акаунт.
-selectAccountRegWizardTitle=Изберете реги�траци� на акаунт 
-selectGroup=Изберете група
-selectGroupWizard=Спи�ъкът по-долу �ъдържа в�ички групи от вашата контакт ли�та. Изберете тази, в ко�то и�кате да добавите нови� контакт.
-selectGroupWizardTitle=Изберете група
-selectProvidersForChatRoom=Спи�ъкът по-долу �ъдържа в�ички акаунти, които поддържат разговори � повече уча�тници. Изберете този, в който желаете да �ъздадете нова �та�.
-selectProvidersWizard=Спи�ъкът по-долу �ъдържа в�ички реги�трирани акаунти. Изберете този, който желаете да ползвате за разговори � нови� контакт.
-selectProvidersWizardTitle=Изберете акаунт(и)
-send=&Изпрати
-sendFile=Изпрати &файл
-selectContactSupportingInfo=��ма информаци� за този контакт.
-sendMessage=&Изпрати �ъобщение
-sendVia=Изпрати чрез:
-setStatusMessage=�а�тройка на �тату� �ъобщение
-settings=&�а�тройки
-showCallPanel=Покажи панела за обаждани�та
-showChannelsList=Покажи �пи�ъка �ъ� �таите
-showOfflineUsers=Показване/Скриване на изключените потребители
-sipCommunicator=СИП Комуникатор
-specifyReason=Мол� въведете причина за тази операци�.
-soundOnOff=Включване/Изключване на звука
-statusChangedChatMessage=премина в �тату� "{0}"
-statusChangeGeneralError=Грешка при �м�ната на �татуца за потребител {0} на �ървър {1}.
-statusChangeNetworkFailure=Грешка по мрежата при �м�ната на �татуца за потребител {0} на �ървър {1}.
-statusMessageInfo=Въведете новото �ъобщение, което желаете да ползвате.
-subject=Тема
-summary=Обобщение
-today=Дне�
-tools=&Ин�трументи
-typeYourRequest=Въведете молбата �и тук
-uin=�омер:
-unknown=�еизве�тен потребител
-useCtrlEnterToSend=Изпращане � Ctrl-&Enter
-msgDeliveryFailedUnknownError=Възникна грешка по време на изпращането на вашето �ъобщение.
-unregisteredMessage=Грешка при �вързването. Потребител�т {0} не е включен на �ървър {1}.
-updateAutomatically=�втоматично ин�талиране на ново�ти.
-updates=�ово�ти
-userInfo=&Информаци� за потребител
-view=&Преглед
-viewHistory=Преглед на &и�тори�та
-warning=Предупреждение
-yes=Да
-yesterday=Вчера
+service.gui.ABOUT=Отно�но
+service.gui.ACCEPT=&Приемам
+service.gui.ACCOUNT=Сметка
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Реги�траци� на �метка
+service.gui.ACCOUNTS=Сметки
+service.gui.ADD=&Добави
+service.gui.ADD_CONTACT=&Добави контакт
+service.gui.ADD_CONTACT_ERROR=�еу�пешно добав�не на контакт � идентификатор: {0}
+service.gui.ADD_CONTACT_ERROR_TITLE=Грешка при добав�не на контакт
+service.gui.ADD_CONTACT_EXIST_ERROR=Контактът {0} вече �ъще�твува във ваши�т �пи�ък � контакти.
+service.gui.ADD_CONTACT_IDENTIFIER=В полето по-долу въведете идентификатора на контакта, който бихте и�кали да добавите.
+service.gui.ADD_CONTACT_WIZARD=Добав�не на контакт
+service.gui.ADD_GROUP_LOCAL_ERROR=�еу�пешно добав�не на група: {0}. Проблемът е възникнал по време на входно-изходно операци�.
+service.gui.ADD_GROUP_NET_ERROR=�еу�пешно добав�не на група: {0}. Проблемът е възникнал по време на мрежова операци�. Проверете мрежовите �и на�тройки и опитайте отново.
+service.gui.ADD_GROUP_ERROR=�еу�пешно добав�не на група: {0}.
+service.gui.ADD_GROUP=Грешка при добав�не на група
+service.gui.ADD_GROUP_EXIST_ERROR=Групата {0} е вече добавена към ваши� �пи�ък � контакти.
+service.gui.ADD_SUBCONTACT=&Добав�не на подконтакт
+service.gui.ALL=&В�ички
+service.gui.ALL_CONTACTS=&В�ички контаки
+service.gui.APPLY=&Приложи
+service.gui.AT=от
+service.gui.AUTHORIZATION_ACCEPTED=контакт прие вашата молба за добав�не.
+service.gui.AUTHENTICATION_WINDOW_TITLE=Проверка на �амолично�тта
+service.gui.AUTHENTICATION_REJECTED=контакт отказа вашата молба за добав�не.
+service.gui.AUTHORIZATION_REQUESTED=Молба за добав�не
+service.gui.AUTHORIZATION_REQUESTED_INFO=Контактът {0} пои�ка да ви добави.
+service.gui.AUTHENTICATION_FAILED=�еу�пешна проверка на �амолично�тта за потребител {0}, от �ървър {1}. Въвели �те невалидна парола.
+service.gui.AUTHORIZATION_RESPONSE=Отговор на молба за добав�не
+service.gui.BAN=&Забрана
+service.gui.BAN_FAILED=Забраната �е провали
+service.gui.BAN_FAILED_GENERAL_ERROR=�еу�пешен опит за забран�ване на {0}. Възникна грешка на �ървъра.
+service.gui.BAN_FAILED_NOT_ALLOWED=�еу�пешен опит за забран�ване на {0}. Соб�твеникът и админи�тратора на �та�та не могат да бъдат забран�вани.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=��мате нужните права за да о�ъще�твите забраната на {0}.
+service.gui.BRB_MESSAGE=В момента ме н�ма, но ще �е върна �коро.
+service.gui.BUSY_MESSAGE=Сори, зает �ъм в момента.
+service.gui.CALL=Обаждане
+service.gui.CALL_VIA=Обаждане през:
+service.gui.CANCEL=&Отмени
+service.gui.CHAT_ROOM_ALREADY_JOINED=Вече �те влезли в �та� {0}.
+service.gui.CHAT_ROOM_CONFIGURATION={0} конфигуриране на �та�
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Грешка при изтегл�не на конфигурационните данни за �та� {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Грешка при изтегл�не на конфигурационните данни за �та� {0}. Само админи�траторите на �та�та могат да кон�ултират и промен�т нейните на�тройки.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=An error occured while trying to submit the configuration form for chat room {0}.
+service.gui.CHAT_ROOM_USER_JOINED=влезе в {0}
+service.gui.CHAT_ROOM_USER_LEFT=напу�на {0}
+service.gui.CHAT_ROOM_USER_KICKED=беше изритан от {0}
+service.gui.CHAT_ROOM_USER_QUIT=напу�на {0}
+service.gui.CHAT_ROOM_NAME=Име на �та�
+service.gui.CHAT_ROOM_NAME_INFO=Мол� въведете името на �та�та ко�то желаете да �ъздадете.
+service.gui.CHAT_ROOM_NOT_EXIST=�е у�п�х да намер� �та� {0} на �ървър {1}. Мол� проверете дали правилно �те напи�али името.
+service.gui.CHAT_ROOM_NOT_CONNECTED=Тр�бва да �е включите към �ървъра (логнете) преди да може да влезете в �та� {0}.
+service.gui.CHAT_ROOM_NOT_JOINED=Тр�бва да �те в �та�та за да можете да оперирате � не�.
+service.gui.CHAT_ROOM_OPTIONS=�а�тройки на �та�та
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=�ужно е да �е реги�трирате за да влезнете в �та� {0}.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=�ужна е парола за �та� {0}.
+service.gui.CHAT_ROOMS=Стаи за разговори
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} �мени темата на {1}
+service.gui.CLOSE=&Затвар�не
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Получихте �ъобщение преди по-малко от 2 �екунди. Сигурни ли �те, че въпреки това желаете да затворите прозореца за този разговор?
+service.gui.OPTIONS=&�а�тройване
+service.gui.CONNECTION_EXPIRED_MSG=В момента не �те �вързани � {0}.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY={0} не поддържа телефонните разговори.
+service.gui.CONTACT_PAUSED_TYPING={0} �пр� да пише
+service.gui.CONTACT_TYPING={0} пише �ъобщение
+service.gui.CONTACT_TYPING_STATE_STALE=�тату�ът на пи�ането не е обновен
+service.gui.CONTACTS=Контакти
+service.gui.COPY=&Копирай
+service.gui.COPY_LINK=Копирай &връзка
+service.gui.CREATE=С&ъздай
+service.gui.CREATE_CHAT_ROOM=&Създай �та� за разговори...
+service.gui.CREATE_CHAT_ROOM_ERROR=�еу�пешен опит за �ъздаване на �та�: {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard
+service.gui.CREATE_GROUP=&Създай групa
+service.gui.CREATE_GROUP_NAME=Въведете името на групата, ко�то бихте и�кали да �ъздадете.
+service.gui.CREATE_FIRST_GROUP_WIZARD=Спи�ъкът ви � контакти не �ъдържа групи. Мол� добавете група от меню Файл/Добави група.
+service.gui.CUT=О&трежи
+service.gui.DATE=Дата
+service.gui.DIALPAD=Панел за набиране
+service.gui.DND_STATUS=�е ме безпокойте
+service.gui.DO_NOT_ASK_AGAIN=�е ме питай повече
+service.gui.DO_NOT_SHOW_AGAIN=Повече не ми показвай това �ъобщение
+service.gui.CONTACT_INFO_NOT_SUPPORTED=Контактът не поддържа уеб информаци�
+service.gui.DURATION=Продължително�т
+service.gui.EDIT=&Редактирай
+service.gui.EMPTY_HISTORY=&Изтрий и�тори�та
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Включи �тату�а на &пи�ане
+service.gui.ERROR=Грешка
+service.gui.EXIT=И&зход
+service.gui.EXTENDED_CRITERIA=Допълнителни у�лови�
+service.gui.GENERAL=Общи
+service.gui.GENERAL_ERROR=Обща грешка
+service.gui.GROUP_NAME=Име на групата
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=�еу�пешен опит за влизане в �та�: {0}.
+service.gui.FFC_STATUS=Бъбри ми �е
+service.gui.FILE=&Файл
+service.gui.FINISH=&Приключи
+service.gui.FONT=Шрифт
+service.gui.CHAT_ROOM_NOT_CONNECTED=Тр�бва да �те �вързани �ъ� �ървъра преди да влезете в �та�та. Свържете �е и опитайте пак.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Тр�бва да �е �вържете преди да напу�нете �та�та (парадок�ално, а :) ).
+service.gui.HELP=?
+service.gui.HIDE_MAIN_WINDOW=Бутонът "X" н�ма да прекрати програмата а �амо ще � �крие.<br/>�ко желаете да излезнете можете да го направите от меню Файл/Изход.
+service.gui.HISTORY=&И�тори�
+service.gui.HISTORY_CONTACT=И�тори� - {0}
+service.gui.HOUR=Ча�
+service.gui.IDENTIFIER=Ключ
+service.gui.IGNORE=&Пренебрегни
+service.gui.INSERT_SMILEY=У�михнати човечета
+service.gui.INVITATION=Тек�т на поканата
+service.gui.INVITATION_RECEIVED=Получена е покана
+service.gui.INVITATION_RECEIVED_MSG={0} ви кани да влезете в �та� {1}. Можете да приемете, откажете или да пренебрегнете тази покана.
+service.gui.INVITE=&Покана
+service.gui.INVITE_CONTACT_MSG=Мол� въведете името на потребител� който бихте желали да поканите. �ко желаете можете да въведете и об��нение към поканата.
+service.gui.INVITE_CONTACT_TO_CHAT=Покани контакт на чат
+service.gui.JOIN=&Влез
+service.gui.JOIN_AS=В&лез като
+service.gui.JOIN_CHAT_ROOM=&Влез в �та� за разговори...
+service.gui.JOIN_CHAT_ROOM_TITLE=Влизане в �та� за разговори
+service.gui.JOIN_CHAT_ROOM_NAME=Мол�, въведете името на �та�та, в ко�то желаете да влезнете.
+service.gui.JOIN_CHAT_ROOM_WIZARD=��и�тент за влизане в �та�.
+service.gui.KICK=&Изритай
+service.gui.KICK_FAILED=�еу�пешен опит за изритване
+service.gui.KICK_FAILED_GENERAL_ERROR==При опит за изритване на {0} възникна грешка на �ървъва. Опитът е неу�пешен.
+service.gui.KICK_FAILED_NOT_ALLOWED=�еу�пешен опит за изритване на {0}. Соб�твениците и админи�траторите на една �та� не могат да бъдат изритвани.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=��мата правата необходими за изритването на {0}.
+service.gui.LAST=По�ледно
+service.gui.LEAVE=&�апу�ни
+service.gui.LIMIT_REACHED_FOR_IP=Имате прекалено много реги�трации от текущи� ви адре� и �ървърт на {0} не разрешава отвар�нето на нови.
+service.gui.LOGIN=&Включване
+service.gui.LOGIN_WINDOW_TITLE=Включване {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=Възникна грешка при �вързване на потребител {0} �ъ� �ървър: {1}.
+service.gui.ME=аз
+service.gui.MODIFY=&Промени
+service.gui.MOVE_SUBCONTACT_MSG=Изберете контакта където желаете да преме�тите.
+service.gui.MOVE_SUBCONTACT=Пре&ме�ти подконтакт
+service.gui.MOVE_SUBCONTACT_FAILED=Подконтактът вече �е намира в този контакт. \n Мол� изберете друг отправен контакт!
+service.gui.MOVE_TO_GROUP=Пре&ме�ти група
+service.gui.MSG_DELIVERY_FAILURE=До�тавката на горното �ъобщение �е провали
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=Протоколът който използвате не позвол�ва �ъобщени�та към не включени потребители. Опитайте да �е �вържете � контакта чрез друг протокол или изчакайте да �е включи.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=Възникна грешка в програмата. Това най-веро�тно е бъг. Ще ви бъдем благодарни ако ни уведомите: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
+service.gui.MSG_NOT_DELIVERED=Възникна проблем � мрежовата връзка.
+service.gui.MSG_RECEIVED=Получихте �ъобщение от {0}
+service.gui.MSG_SEND_CONNECTION_PROBLEM=Тр�бва да �е �вържете за да можете да изпращате �ъобщени�.
+service.gui.MULTIPLE_LOGINS=Свързали �те �е повече от веднъж � един и �ъщ акаунт. Потребител {0} на �ървър {1} ше бъде изключен.
+service.gui.NETWORK_FAILURE=Проблем � мрежата
+service.gui.NEXT=&�апред
+service.gui.NEW=&�ов
+service.gui.NEW_ACCOUNT=&�ов акаунт
+service.gui.NEW_MESSAGE=�ово �ъобщение...
+service.gui.NEW_NAME=�ово име:
+service.gui.NO=�е
+service.gui.NO_AVAILABLE_ROOMS=Спи�ъкът от �таи за този �ървър не е наличен в момента.
+service.gui.NO_MESSAGE=��ма �ъобщение
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=��ма акаунт който да поддържа �таи за разговор. За да разберете кои протоколи поддържат тази функционално�т проверете на sip-communicator.org.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Опитвате �е да затворите прозорец � неизпратено �ъобщение, \nкоето би довело до загубата му. Сигурни ли �те?
+service.gui.NON_EXISTING_USER_ID=Сървърът на {0} не разпознава въведени� от ва� потребител.
+service.gui.NOTIFICATIONS=Изве�т�вани�
+service.gui.OK=&ОК
+service.gui.OFFLINE=Изключен
+service.gui.OLDER_CALLS=Предишни обаждани�
+service.gui.ONLINE=Включен
+service.gui.OPEN_IN_BROWSER=Отвори в &браузър
+service.gui.PASSWORD=Парола:
+service.gui.PASTE=&Залепи
+service.gui.PREVIOUS=�а&зад
+service.gui.PRINT=&Печат
+service.gui.PROTOCOL=Протокол
+service.gui.QUIT=И&зход
+service.gui.READY=Готов
+service.gui.REASON=Причина
+service.gui.RECONNECTION_LIMIT_EXCEEDED=О�ъще�твихте н�колко включвани� и изключвани� в прекалено кратък интервал от време. Потребител {0} е временно забранен на �ървър {1} и ще тр�бва да изчака преди да �е включи отново.
+service.gui.REJECT=&Отказ
+service.gui.REMEMBER_PASSWORD=Запомни паролата
+service.gui.REMOVE=&Премахни
+service.gui.REMOVE_ACCOUNT=&Премахни акаунт
+service.gui.REMOVE_ACCOUNT_MESSAGE=Сигурен ли �те, че и�кате да премахне този акаунт?
+service.gui.REMOVE_CONTACT=Премахни под&контакт
+service.gui.REMOVE_GROUP=Премахни &група
+service.gui.RENAME=Пре&именувай
+service.gui.RENAME_CONTACT=Пре&именувай контакт
+service.gui.RENAME_CONTACT_WIZARD=Въведете иново име за избрани� контакт.
+service.gui.RENAME_GROUP=Пре&именувай група
+service.gui.RENAME_GROUP_INFO=Въведете ново име за избраната група.
+service.gui.REQUEST=&Молба
+service.gui.REQUEST_AUTHORIZATION=&Молба за оторизиране
+service.gui.REQUEST_AUTHORIZATION_MSG={0} не може да бъде добавен към �пи�ъка ви � контакта. {0} тр�бва да ви оторизира преди да бъде вкаран в �пи�ъка ви. Можл� въведете молба по-долу.
+service.gui.ROOT_GROUP=Група корен
+service.gui.SAVE=&Запази
+service.gui.SEARCH=&Тър�и
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Използвайе бутона за да видите в�ички �таи от избрани� �ървър и � бутона Влез, изберете тази, в ко�то и�кате да влезете.
+service.gui.SECURITY_AUTHORITY_REALM=Идентификаци� за �ървър {0}.
+service.gui.SELECT_ACCOUNT=Изберете потребител
+service.gui.SELECT_GROUP=Изберете група
+service.gui.SELECT_GROUP_WIZARD_MSG=Спи�ъкът по-долу �ъдържа в�ички групи от вашата контакт ли�та. Изберете тази, в ко�то и�кате да добавите нови� контакт.
+service.gui.SELECT_GROUP_WIZARD=Изберете група
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Спи�ъкът по-долу �ъдържа в�ички акаунти, които поддържат разговори � повече уча�тници. Изберете този, в който желаете да �ъздадете нова �та�.
+service.gui.SELECT_PROVIDERS_WIZARD_MSG=Спи�ъкът по-долу �ъдържа в�ички реги�трирани акаунти. Изберете този, който желаете да ползвате за разговори � нови� контакт.
+service.gui.SELECT_PROVIDERS_WIZARD=Изберете акаунт(и)
+service.gui.SEND=&Изпрати
+service.gui.SEND_FILE=Изпрати &файл
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=��ма информаци� за този контакт.
+service.gui.SEND_MESSAGE=&Изпрати �ъобщение
+service.gui.SEND_VIA=Изпрати чрез:
+service.gui.SET_STATUS_MESSAGE=�а�тройка на �тату� �ъобщение
+service.gui.SETTINGS=&�а�тройки
+service.gui.SPECIFY_REASON==Мол� въведете причина за тази операци�.
+service.gui.SOUND_ON_OFF=Включване/Изключване на звука
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=премина в �тату� "{0}"
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Грешка при �м�ната на �татуца за потребител {0} на �ървър {1}.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Грешка по мрежата при �м�ната на �татуца за потребител {0} на �ървър {1}.
+service.gui.STATUS_MESSAGE_INFO=Въведете новото �ъобщение, което желаете да ползвате.
+service.gui.SUBJECT=Тема
+service.gui.SUMMARY=Обобщение
+service.gui.TODAY=Дне�
+service.gui.TOOLS=&Ин�трументи
+service.gui.TYPE_YOUR_REQUEST=Въведете молбата �и тук
+service.gui.USER_IDENTIFIER=�омер:
+service.gui.UNKNOWN=�еизве�тен потребител
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Възникна грешка по време на изпращането на вашето �ъобщение.
+service.gui.UNREGISTERED_MESSAGE=Грешка при �вързването. Потребител�т {0} не е включен на �ървър {1}.
+service.gui.VIEW=&Преглед
+service.gui.VIEW_HISTORY=Преглед на &и�тори�та
+service.gui.WARNING=Предупреждение
+service.gui.YES=Да
+service.gui.YESTERDAY=Вчера
 
-january=Ян
-february=Фев
-march=Мар
-april=�пр
-may=Май
-june=Юни
-july=Юли
-august=�вг
-september=Сеп
-october=Окт
-november=�ов
-december=Дек
+service.gui.JANUARY=Ян
+service.gui.FEBRUARY=Фев
+service.gui.MARCH=Мар
+service.gui.APRIL=Apr�пр
+service.gui.MAY=MayМай
+service.gui.JUNE=JunЮни
+service.gui.JULY=JulЮли
+service.gui.AUGUST=Aug�вг
+service.gui.SEPTEMBER=SepСеп
+service.gui.OCTOBER=OctОкт
+service.gui.NOVEMBER=Nov�ов
+service.gui.DECEMBER=DecДек
 
 # systray
 
diff --git a/resources/languages/resources_de.properties b/resources/languages/resources_de.properties
index e022880..a010fbf 100644
--- a/resources/languages/resources_de.properties
+++ b/resources/languages/resources_de.properties
@@ -5,633 +5,536 @@
 

 # German translation

 # Author: Thomas Hofer

-about=&Ãœber

-accept=&OK

-account=Benutzerkonto

-accountRegistrationWizard=Kontoverwaltung

-accounts=Benutzerkonten

-activateOnlyWhenMinimized=Nur aktivieren wenn minimiert

-add=&Hinzufügen

-addAccount=Konto hinzufügen

-addContact=Kontakt &hinzufügen

-addContactError=Kann Kontakt mit id {0} nicht hinzufügen

-addContactErrorTitle=Fehler beim Kontakthinzufügen

-addContactExistError=Der Kontakt {0} existierte bereits

-addContactIdentifier=Geben Sie die Informationen des Kontaktes, den Sie hinzufügen wollen, in das Feld unten ein

-addContactWizard=Kontakt hinzufügen...

-addGroupLocalError=Kann Gruppe "{0}" nicht hinzufügen. Das Problem ist bei einer lokalen Lese/Schreiboperation aufgetreten. (Festplatte voll? Fehlende Rechte?)

-addGroupNetError=Kann Gruppe "{0}" nicht hinzufügen. Überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie es erneut.

-addGroupError=Kann Gruppe "{0}" nicht hinzufügen.

-addGroupErrorTitle=Fehler beim "Gruppe hinzufügen"

-addGroupExistError=Die Gruppe "{0}" existiert bereits in Ihrer Kontaktliste

-addGroup=Gruppe erstellen

-addSubcontact=&Unterkontakt hinzügen

-advanced=Erweitert

-all=&Alle

-allContacts=&Alle Kontakte

-alwaysOnTop=immer im Vordergrund

-appearance=Ansicht

-application=Anwendung

-apply=&Anwenden

-at=at

-authAccepted=Der Kontakt hat die Authorisierungsanfrage akzeptiert.

-authenticationWindowTitle=Authorisierungsanfrage

-authRejected=Der Kontakt hat die Authorisierungsanfrage zurückgewiesen.

-authorizationRequested=Authorisierung angefragt

-authorizationRequestedInfo=Der {0} Kontakt erbittet Ihre Authorisierung

-authenticationFailed=Folgenes Konto konnte nicht verbunden werden: Benutzername: {0}, Servername: {1}. Das Passwort ist ungültig.

-authorizationResponse=Authorisierungsantwort

-autoPopup=Bringe das Fenster nach vorne

-awayStatus=Abwesend

-back=&Zurück

-ban=&Verbannen

-banFailed=Verbannung nicht erfolgreich.

-banFailedGeneralError=Verbannung von {0} nicht erfolgreich. Es ist ein Fehler am Server aufgetreten.

-banFailedNotAllowed=Verbannung von {0} nicht erfolgreich. Der Ersteller und der Administrator des Raumens können nicht verbannt werden.

-banFailedNotEnoughPermissions=Verbannung von {0} nicht erfolgreich. Sie haben nicht die erforderlichen Rechte.

-brbMessage=Ich komme gleich wieder.

-busyMessage=Ich bin gerade beschäftigt.

-call=Anrufen

-callVia=Anrufen über:

-callList=Gesprächsliste

-cancel=&Abbrechen

-chatRoomAlreadyJoined=Sie nehmen bereits an der Gesprächsrunde {0} teil.

-chatRoomConfiguration=Konfiguration der Gesprächsrunde {0}

-chatRoomOpenConfigFailed=Konnte die Konfiguration der Gesprächsrunde {0} nicht starten.

-chatRoomOpenConfigForbidden=onnte die Konfiguration der Gesprächsrunde {0} nicht starten. Nur deren Administratoren dürfen diese Einstellungen sehen und ändern.

-chatRoomConfigFormSubmitFailed=Beim speichern der geänderteten Konfiguration der Gesprächsrunde {0} ist ein fehler aufgetreten. 

-chatRoomUserJoined=ist hereingekommen {0}

-chatRoomUserLeft=ist gegangen {0}

-chatRoomUserKicked=ist von {0} hinausgeschmissen worde

-chatRoomUserQuit=hat uns verlassen {0}

-chatRoomName=Name der Gesprächsrunde

-chatRoomNameInfo=Geben Sie den Namen der Gesprächsrunde ein, die Sie erstellen wollen.

-chatRoomNotExist=Die Runde {0} konne nicht am Server {1} gefunden werden. Bitte überprüfen Sie die Eingabe.

-chatRoomNotConnected=Sie müssen verbunden sein, bevor sie der Gesprächsrunde {0} beitreten können.

-chatRoomNotJoined=Sie müssen der Gesprächsrunde beigetreten sein, bevor Sie weitere Operationen damit ausführen können.

-chatRoomOptions=Einstellungen der Gesprächsrunde

-chatRoomRegistrationRequired=Die Gesprächsrunde {0} verlangt eine Registrierung zum Beitritt.

-chatRoomRequiresPassword=Die Gesprächsrunde {0} benötigt ein Passwort.

-chatRooms=Gesprächsrunden

-chatRoomSubjectChanged={0} hat das Thema auf {1} geändert

-close=&Schließen

-closeChatAfterNewMsg=Sie haben gerade eine Nachricht erhalten. Sind Sie sicher, dass Sie die Gesprächsrunde verlassen wollen?

-conference=Konferenz

-configure=&Konfigurieren

-configuration=Konfiguration

-connectionFailed=Verbindung fehlgeschlagen

-connectionFailedMessage=Verbindung für das folgende Konto fehlgeschlagen: Benutzername: {0}, Servername: {1}.

-connectionExpiredMessage=Sie sind nicht zum Server {0} verbunden

-contactAddress=Kontaktadresse

-contactNotSupportingTelephony=Der gewählte {0} Kontakt unterstützt keine Telefonie.

-contactPausedTyping={0} unterbricht das Tippen

-contactTyping={0} tippt eine Nachricht

-contactTypingStateStale=Tipp-Information nicht aktuell

-contactInfo=&Kontaktinformation

-contacts=Kontakte

-continue=&Weiter

-copy=&Kopieren

-copyLink=Kopiere &Link

-create=E&rzeuge

-createChatRoom=&Gesprächsrunde anlegen

-createChatRoomNotSupported=Konnte Gesprächsrunde mit dem Namen {0} nicht anlegen. Der Server {1} untstützt dies nicht.

-createChatRoomError=Konnte Gesprächsrunde mit dem Namen {0} nicht anlegen. 

-createChatRoomWizard=Lege Gesprächsrunde an. 

-createGroup=G&ruppe anlegen

-createGroupName=Bitte geben Sie den Namen der zu erstellenden Gruppe ein.

-createFirstGroupWizard=Deine Kontaktliste enthält keine Gruppe. Bitte lege zuerst eine Gruppe an (Datei/Gruppe erstellen).

-cut=&Ausschneiden

-date=Datum

-description=Beschreibung

-dial=&Wähle

-dialpad=Wähltastatur

-dndStatus=Bitte nicht stören.

-doNotAskAgain=Nicht mehr fragen

-doNotShowAgain=Diese Nachricht nicht mehr anzeigen.

-dontSupportWebInfo=Dieser Kontakt unterstützt keine Web-Information

-duration=Dauer

-edit=&Ändern

-emptyHistory=&Leere Protokoll 

-enableNotifications=Aktiviere Meldungen

-enableTypingNotifications=Aktiviere Schreib-Notifizierung

-enterPhoneNumber=Geben Sie die Telefonnummer ein

-error=Fehler

-exit=B&eenden

-extendedCriteria=Erweitere die Kriterien

-general=Allgemein

-generalError=Algemeiner Fehler

-group=Gruppe

-groupName=Name der Gruppe

-failedToCreateChatRoom=Konnte Gesprächsrunde mit dem Namen {0} nicht anlegen.

-failedToJoinChatRoom=Konnte der Gesprächsrunde mit dem Namen {0} nicht beitreten.

-ffcStatus=Für Chats verfügbar

-file=&Datei

-findChatRoomError=Konnte Gesprächsrunde mit dem Namen {0} nicht finden.

-finish=&Fertig

-first=Erster

-font=Schriftart

-haveToBeConnectedToJoin=Sie müssen verbunden sein, um einer Gesprächsrunde beizutreten. Bitte verbinden Sie sich und versuchen Sie es erneut.

-haveToBeConnectedToLeave=Sie müssen verbunden sein, um eine Gesprächsrunde zu verlassen. 

-haveToBeConnectedToLeave=Sie müssen verbunden sein, um den Chat-Room zu verlassen

-help=?

-hideOffline=Ausblenden

-hideOfflineContacts=Inaktive Kontakte ausblenden

-hideCallPanel=&Verstecke Wähltastatur

-hideMainWindow=Ein Klick auf das X schließt die Applikation nicht, sondern minimiert sie nur. Wenn Sie beenden wollen, wählen Sie Datei/Beenden aus dem Menü.

-history=&Protokoll

-historyContact=Protokoll - {0}

-hour=Stunde

-identifier=Identifier

-ignore=&Ignorieren

-info=Info

-insertSmiley=Smiley einfügen

-invalidCall=Ungültiger Anruf

-invitation=Einladungstext

-invitationReceived=Einladung erhalten

-invitationReceivedFormInfo={0} hat Sie zur Gesprächsrunde {0} eingeladen. Sie können der Einladung folgen, diese ignorieren oder zurückweisen.

-invite=&Einladen

-inviteContactFormInfo=Geben Sie den Namen des Benutzers ein, den Sie einladen wollen. Sie können weiters einen Grund für die Einladung eingeben.

-inviteContactToChat=Kontakt zu einer Gesprächsrunde einladen.

-join=&Teilnehmen

-joinAs=T&eilnemen als

-joinChatRoom=&Teilnehmen an der Runde...

-joinChatRoomTitle=Teilnehmen an einer Gesprächsrunde

-joinChatRoomName=Bitte geben Sie den Namen der Gesprächsrunde ein, an der Sie teilnehmen wollen.

-joinChatRoomWizard=Trete dem Chat-Raum bei

-kick=&Hinauswerfen

-kickFailed=Hinauswurf gescheitert.

-kickFailedGeneralError=Hinauswurf von {0} gescheitert. Ein allgemeiner Fehler am Server ist aufgetreten

-kickFailedNotAllowed=Hinauswurf von {0} gescheitert. Der Eigentümer und der Administrator des Raumes können nicht hinausgeworfen werden.

-kickFailedNotEnoughPermissions=Hinauswurf von {0} gescheitert. Sie haben dazu keine Rechte.

-last=Letzter

-launchBrowserError=Fehler beim Start des Webbrowsers.

-launchOnStartUp=Ausführen beim Starten

-leave=&Verlassen

-limitReachedForIp=Sie haben schon zu viele Verbindungen von Ihrer IP-Addresse und der Server {0} erlaubt keine weiteren.

-login=&Anmelden

-loginNetworkError=<DIV>Bei der Anmeldung mit dem Konto {0} am Server {1} ist ein Fehler aufgetreten.<BR>\Überprüfen Sie die Netzwerkverbindung</DIV>

-

-loginNotSucceeded=Bei der Anmeldung mit dem Konto {0} am Server {1} ist ein Fehler aufgetreten.

-loginGeneralError=Ein Fehler ist beim Anmelden aufgetreten: User name: {0}, Server name: {1}.

-loginInternalError=Ein Fehler ist beim Anmelden aufgetreten: User name: {0}, Server name: {1}. Dies ist wahrscheinlich ein Fehler in der Anwendung. Bitte senden Sie diesen Fehler an issues@sip-communicator.dev.java.net.

-loginInvalidPropsError=Ein Fehler ist beim Anmelden aufgetreten: User name: {0}, Server name: {1}. Es ist ein Konfigurationsfehler aufgetreten, überprüfen Sie bitte Ihre Einstellungen.

-loginWindowTitle=Anmelden {0}

-logoffNotSucceeded=Bei der Abmeldung mit dem Konto {0} vom Server {1} ist ein Fehler aufgetreten.

-me=mich

-modify=&Ändern

-move=Verschieben

-moveSubcontactMsg=Wählen Sie den Kontakt aus, den Sie verschieben wollen.

-moveSubcontact=&Verschiebe Unterkontakt.

-moveSubcontactInSameContact=Der Zielkontakt ist der selbe wie der Ausgangskontakt. Wählen Sie einen anderen aus!

+service.gui.ABOUT=&Ãœber

+service.gui.ACCEPT=&OK

+service.gui.ACCOUNT=Benutzerkonto

+service.gui.ACCOUNT_REGISTRATION_WIZARD=Kontoverwaltung

+service.gui.ACCOUNTS=Benutzerkonten

+service.gui.ADD=&Hinzufügen

+service.gui.ADD_ACCOUNT=Konto hinzufügen

+service.gui.ADD_CONTACT=Kontakt &hinzufügen

+service.gui.ADD_CONTACT_ERROR=Kann Kontakt mit id {0} nicht hinzufügen

+service.gui.ADD_CONTACT_ERROR_TITLE=Fehler beim Kontakthinzufügen

+service.gui.ADD_CONTACT_EXIST_ERROR=Der Kontakt {0} existierte bereits

+service.gui.ADD_CONTACT_IDENTIFIER=Geben Sie die Informationen des Kontaktes, den Sie hinzufügen wollen, in das Feld unten ein

+service.gui.ADD_CONTACT_WIZARD=Kontakt hinzufügen...

+service.gui.ADD_GROUP_LOCAL_ERROR=Kann Gruppe "{0}" nicht hinzufügen. Das Problem ist bei einer lokalen Lese/Schreiboperation aufgetreten. (Festplatte voll? Fehlende Rechte?)

+service.gui.ADD_GROUP_NET_ERROR=Kann Gruppe "{0}" nicht hinzufügen. Überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie es erneut.

+service.gui.ADD_GROUP_ERROR=Kann Gruppe "{0}" nicht hinzufügen.

+service.gui.ADD_GROUP=Fehler beim "Gruppe hinzufügen"

+service.gui.ADD_GROUP_EXIST_ERROR=Die Gruppe "{0}" existiert bereits in Ihrer Kontaktliste

+service.gui.ADD_GROUP=Gruppe erstellen

+service.gui.ADD_SUBCONTACT=&Unterkontakt hinzügen

+service.gui.ADVANCED=Erweitert

+service.gui.ALL=&Alle

+service.gui.ALL_CONTACTS=&Alle Kontakte

+service.gui.APPLY=&Anwenden

+service.gui.AT=at

+service.gui.AUTHORIZATION_ACCEPTED=Der Kontakt hat die Authorisierungsanfrage akzeptiert.

+service.gui.AUTHENTICATION_WINDOW_TITLE=Authorisierungsanfrage

+service.gui.AUTHENTICATION_REJECTED=Der Kontakt hat die Authorisierungsanfrage zurückgewiesen.

+service.gui.AUTHORIZATION_REQUESTED=Authorisierung angefragt

+service.gui.AUTHORIZATION_REQUESTED_INFO=Der {0} Kontakt erbittet Ihre Authorisierung

+service.gui.AUTHENTICATION_FAILED=Folgenes Konto konnte nicht verbunden werden: Benutzername: {0}, Servername: {1}. Das Passwort ist ungültig.

+service.gui.AUTHORIZATION_RESPONSE=Authorisierungsantwort

+service.gui.AWAY_STATUS=Abwesend

+service.gui.BAN=&Verbannen

+service.gui.BAN_FAILED=Verbannung nicht erfolgreich.

+service.gui.BAN_FAILED_GENERAL_ERROR=Verbannung von {0} nicht erfolgreich. Es ist ein Fehler am Server aufgetreten.

+service.gui.BAN_FAILED_NOT_ALLOWED=Verbannung von {0} nicht erfolgreich. Der Ersteller und der Administrator des Raumens können nicht verbannt werden.

+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Verbannung von {0} nicht erfolgreich. Sie haben nicht die erforderlichen Rechte.

+service.gui.BRB_MESSAGE=Ich komme gleich wieder.

+service.gui.BUSY_MESSAGE=Ich bin gerade beschäftigt.

+service.gui.CALL=Anrufen

+service.gui.CALL_VIA=Anrufen über:

+service.gui.CANCEL=&Abbrechen

+service.gui.CHAT_ROOM_ALREADY_JOINED=Sie nehmen bereits an der Gesprächsrunde {0} teil.

+service.gui.CHAT_ROOM_CONFIGURATION=Konfiguration der Gesprächsrunde {0}

+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Konnte die Konfiguration der Gesprächsrunde {0} nicht starten.

+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=onnte die Konfiguration der Gesprächsrunde {0} nicht starten. Nur deren Administratoren dürfen diese Einstellungen sehen und ändern.

+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Beim speichern der geänderteten Konfiguration der Gesprächsrunde {0} ist ein fehler aufgetreten. 

+service.gui.CHAT_ROOM_USER_JOINED=ist hereingekommen {0}

+service.gui.CHAT_ROOM_USER_LEFT=ist gegangen {0}

+service.gui.CHAT_ROOM_USER_KICKED=ist von {0} hinausgeschmissen worde

+service.gui.CHAT_ROOM_USER_QUIT=hat uns verlassen {0}

+service.gui.CHAT_ROOM_NAME=Name der Gesprächsrunde

+service.gui.CHAT_ROOM_NAME_INFO=Geben Sie den Namen der Gesprächsrunde ein, die Sie erstellen wollen.

+service.gui.CHAT_ROOM_NOT_EXIST=Die Runde {0} konne nicht am Server {1} gefunden werden. Bitte überprüfen Sie die Eingabe.

+service.gui.CHAT_ROOM_NOT_CONNECTED=Sie müssen verbunden sein, bevor sie der Gesprächsrunde {0} beitreten können.

+service.gui.CHAT_ROOM_NOT_JOINED=Sie müssen der Gesprächsrunde beigetreten sein, bevor Sie weitere Operationen damit ausführen können.

+service.gui.CHAT_ROOM_OPTIONS=Einstellungen der Gesprächsrunde

+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Die Gesprächsrunde {0} verlangt eine Registrierung zum Beitritt.

+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Die Gesprächsrunde {0} benötigt ein Passwort.

+service.gui.CHAT_ROOMS=Gesprächsrunden

+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} hat das Thema auf {1} geändert

+service.gui.CLOSE=&Schließen

+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Sie haben gerade eine Nachricht erhalten. Sind Sie sicher, dass Sie die Gesprächsrunde verlassen wollen?

+service.gui.OPTIONS=&Konfigurieren

+service.gui.CONNECTION_EXPIRED_MSG=Sie sind nicht zum Server {0} verbunden

+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Der gewählte {0} Kontakt unterstützt keine Telefonie.

+service.gui.CONTACT_PAUSED_TYPING={0} unterbricht das Tippen

+service.gui.CONTACT_TYPING={0} tippt eine Nachricht

+service.gui.CONTACT_TYPING_STATE_STALE=Tipp-Information nicht aktuell

+service.gui.CONTACTS=Kontakte

+service.gui.COPY=&Kopieren

+service.gui.COPY_LINK=Kopiere &Link

+service.gui.CREATE=E&rzeuge

+service.gui.CREATE_CHAT_ROOM=&Gesprächsrunde anlegen

+service.gui.CREATE_CHAT_ROOM_ERROR=Konnte Gesprächsrunde mit dem Namen {0} nicht anlegen. 

+service.gui.CREATE_CHAT_ROOM_WIZARD=Lege Gesprächsrunde an. 

+service.gui.CREATE_GROUP=G&ruppe anlegen

+service.gui.CREATE_GROUP_NAME=Bitte geben Sie den Namen der zu erstellenden Gruppe ein.

+service.gui.CREATE_FIRST_GROUP_WIZARD=Deine Kontaktliste enthält keine Gruppe. Bitte lege zuerst eine Gruppe an (Datei/Gruppe erstellen).

+service.gui.CUT=&Ausschneiden

+service.gui.DATE=Datum

+service.gui.DIALPAD=Wähltastatur

+service.gui.DND_STATUS=Bitte nicht stören.

+service.gui.DO_NOT_ASK_AGAIN=Nicht mehr fragen

+service.gui.DO_NOT_SHOW_AGAIN=Diese Nachricht nicht mehr anzeigen.

+service.gui.CONTACT_INFO_NOT_SUPPORTED=Dieser Kontakt unterstützt keine Web-Information

+service.gui.DURATION=Dauer

+service.gui.EDIT=&Ändern

+service.gui.EMPTY_HISTORY=&Leere Protokoll 

+service.gui.ENABLE_TYPING_NOTIFICATIONS=Aktiviere Schreib-Notifizierung

+service.gui.ENTER_PHONE_NUMBER=Geben Sie die Telefonnummer ein

+service.gui.ERROR=Fehler

+service.gui.EXIT=B&eenden

+service.gui.EXTENDED_CRITERIA=Erweitere die Kriterien

+service.gui.GENERAL=Allgemein

+service.gui.GENERAL_ERROR=Algemeiner Fehler

+service.gui.GROUP_NAME=Name der Gruppe

+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Konnte der Gesprächsrunde mit dem Namen {0} nicht beitreten.

+service.gui.FFC_STATUS=Für Chats verfügbar

+service.gui.FILE=&Datei

+service.gui.FINISH=&Fertig

+service.gui.FONT=Schriftart

+service.gui.CHAT_ROOM_NOT_CONNECTED=Sie müssen verbunden sein, um einer Gesprächsrunde beizutreten. Bitte verbinden Sie sich und versuchen Sie es erneut.

+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Sie müssen verbunden sein, um eine Gesprächsrunde zu verlassen. 

+service.gui.HELP=?

+service.gui.HIDE_OFFLINE_CONTACTS=Inaktive Kontakte ausblenden

+service.gui.HIDE_MAIN_WINDOW=Ein Klick auf das X schließt die Applikation nicht, sondern minimiert sie nur. Wenn Sie beenden wollen, wählen Sie Datei/Beenden aus dem Menü.

+service.gui.HISTORY=&Protokoll

+service.gui.HISTORY_CONTACT=Protokoll - {0}

+service.gui.HOUR=Stunde

+service.gui.IDENTIFIER=Identifier

+service.gui.IGNORE=&Ignorieren

+service.gui.INSERT_SMILEY=Smiley einfügen

+service.gui.INVITATION=Einladungstext

+service.gui.INVITATION_RECEIVED=Einladung erhalten

+service.gui.INVITATION_RECEIVED_MSG={0} hat Sie zur Gesprächsrunde {0} eingeladen. Sie können der Einladung folgen, diese ignorieren oder zurückweisen.

+service.gui.INVITE=&Einladen

+service.gui.INVITE_CONTACT_MSG=Geben Sie den Namen des Benutzers ein, den Sie einladen wollen. Sie können weiters einen Grund für die Einladung eingeben.

+service.gui.INVITE_CONTACT_TO_CHAT=Kontakt zu einer Gesprächsrunde einladen.

+service.gui.JOIN=&Teilnehmen

+service.gui.JOIN_AS=T&eilnemen als

+service.gui.JOIN_CHAT_ROOM=&Teilnehmen an der Runde...

+service.gui.JOIN_CHAT_ROOM_TITLE=Teilnehmen an einer Gesprächsrunde

+service.gui.JOIN_CHAT_ROOM_NAME=Bitte geben Sie den Namen der Gesprächsrunde ein, an der Sie teilnehmen wollen.

+service.gui.JOIN_CHAT_ROOM_WIZARD=Trete dem Chat-Raum bei

+service.gui.KICK=&Hinauswerfen

+service.gui.KICK_FAILED=Hinauswurf gescheitert.

+service.gui.KICK_FAILED_GENERAL_ERROR==Hinauswurf von {0} gescheitert. Ein allgemeiner Fehler am Server ist aufgetreten

+service.gui.KICK_FAILED_NOT_ALLOWED=Hinauswurf von {0} gescheitert. Der Eigentümer und der Administrator des Raumes können nicht hinausgeworfen werden.

+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Hinauswurf von {0} gescheitert. Sie haben dazu keine Rechte.

+service.gui.LAST=Letzter

+service.gui.LEAVE=&Verlassen

+service.gui.LIMIT_REACHED_FOR_IP=Sie haben schon zu viele Verbindungen von Ihrer IP-Addresse und der Server {0} erlaubt keine weiteren.

+service.gui.LOGIN=&Anmelden

+service.gui.LOGIN_NETWORK_ERROR<DIV>Bei der Anmeldung mit dem Konto {0} am Server {1} ist ein Fehler aufgetreten.<BR>\Überprüfen Sie die Netzwerkverbindung</DIV>

+service.gui.LOGIN_GENERAL_ERROR=Ein Fehler ist beim Anmelden aufgetreten: User name: {0}, Server name: {1}.

+service.gui.LOGIN_INTERNAL_ERROR=Ein Fehler ist beim Anmelden aufgetreten: User name: {0}, Server name: {1}. Dies ist wahrscheinlich ein Fehler in der Anwendung. Bitte senden Sie diesen Fehler an issues@sip-communicator.dev.java.net.

+service.gui.LOGIN_INVALID_PROPERTIES_ERROR=Ein Fehler ist beim Anmelden aufgetreten: User name: {0}, Server name: {1}. Es ist ein Konfigurationsfehler aufgetreten, überprüfen Sie bitte Ihre Einstellungen.

+service.gui.LOGIN_WINDOW_TITLE=Anmelden {0}

+service.gui.LOGOFF_NOT_SUCCEEDED=Bei der Abmeldung mit dem Konto {0} vom Server {1} ist ein Fehler aufgetreten.

+service.gui.ME=mich

+service.gui.MODIFY=&Ändern

+service.gui.MOVE=Verschieben

+service.gui.MOVE_SUBCONTACT_MSG=Wählen Sie den Kontakt aus, den Sie verschieben wollen.

+service.gui.MOVE_SUBCONTACT=&Verschiebe Unterkontakt.

+service.gui.MOVE_SUBCONTACT_FAILED=Der Zielkontakt ist der selbe wie der Ausgangskontakt. Wählen Sie einen anderen aus!

 moveSubcontactQuestion=<DIV>Sind Sie sicher, dass sie <B> {0} </B> in <B> {1} </B> verschieben wollen?</DIV>

-moveToGroup=&Verschiebe in Gruppe

-moveContactError=&Kontakt kann nicht verschoben werden

-msgDeliveryFailure=Diese Nachricht konnte nicht zugestellt werden.

-msgDeliveryOfflineNotSupported=Das verwendetet Protokoll kann Nachrichten nur zustellen, wenn Benutzer online sind. Warten Sie darauf, oder verwenden Sie ein anderes Protokoll.

-msgDeliveryInternalError=Ein interner Fehler ist aufgetreten. Dies ist wahrscheinlich ein Bug. Bitte melden Sie ihn unter http://www.sip-communicator.org/index.php/Development/BugsAndIssues

-msgDeliveryUnknownError=Ihre Nachricht konnte nicht zugestellt werden:

-msgNotDelivered=Ein Netzwerkproblem ist aufgetreten.

-msgReceived={0} hat Ihnen eine Nachricht gesendet.

-msgSendConnectionProblem=Sie sollen verbunden sein, um Nachrichten zu senden.

-multipleLogins=Sie sind mehrfach mit dem selben Konto verbunden. Das Konto User name: {0}, Server name: {1} ist derzeit nicht verbunden.

-name=Name

-network=Netzwerk

-networkFailure=Netzwerkfehler

-next=&Weiter

-new=&Neu

-newAccount=&Neues Konto

-newMessage=New message...

-newName=Neuer Name:

-newStatusMessage=Neue Statusinformation

-no=Nein

-noAccountFound=Um dieses Programm zu verwenden, sollten Sie mindestens ein Konto erstellen. Die folgenden Seiten werden Sie unterstützen, ein Konto zu erstellen.

-noAvailableRooms=Die Raumliste für diesen Server ist gerade nicht verfügbar.

-noMessage=Keine Nachricht

-noMultiChatAccountAvailable=Keine Konten, die Mehrbenutzerchats unterstützen, gefunden. Sehen Sie auf sip-communicator.org für mehr Information, welche Protokolle Mehrbenutzerchats unterstützen.

-nonEmptyChatWindowClose=Sie versuchen, ein Fenster mit einer ungesendeten Nachricht zu schließen. Sind Sie sicher?

-nonExistingUserId=Der {0} Server kennt das Konto nicht.

-notifications=Nachrichten

-ok=&OK

-offline=Nicht Verbunden

-olderCalls=Ältere Anrufe

-online=Verbunden

-openInBrowser=Im &Brower öffnen

-options=Optionen

-passwd=Passwort:

-paste=&Einfügen

-previous=Voriges

-print=&Drucken

-protocol=Protokoll

-providerNotConnected=Sie müssen online sein, um zu kommunizieren.

-quit=&Beenden

-ready=Bereit

-reason=Grund

-reconnectionLimitExceeded=Sie haben sich zu oft getrennt und neu verbunden. Das Konto User name: {0}, Server name: {1} ist zur Zeit verbannt. Bitte versuchen Sie es in ein paar Minuten erneut.

-refresh=Aktualisieren

-registrationTimeout=Registration timeout:

-reject=&Zurückweisen

-rememberPassword=Passwort merken

-remove=&Löschen

-removeAccount=&Konto löschen

-removeAccountMessage=Sind Sie sicher, dass Sie den Kontakt löschen wollen?

-removeContact=&Lösche Kontakt

-removeContactText=<DIV>Sind Sie sicher, dass Sie <B> {0} </B><BR>entfernen wollen?</DIV>

-removeGroup=&Lösche Gruppe

-rename=&Umbenennen

-renameContact=Kontakt umbenennen

-renameContactWizard=Bitte geben Sie den Namen für den Kontakt ein.

-renameGroup=Gruppe umbenenne

-renameGroupInfo=Bitte geben Sie den Namen für die Gruppe ein.

-request=&Anforderung

-requestAuthorization=&Authorisierungsanforderung

-requestAuthorizationInfo=Kann {0} nicht zur Liste der Kontakte hinzufügen. {0} muss Sie vorher dazu autorisieren. Bitte geben Sie ihre Bitte dazu ein.

-requestAuthReason=Grund der Anfrage

-requestAuthReasonEnter=Geben Sie den Grund der Anforderung ein

-responseAuthReasonEnter=Geben Sie den Grund der Antwort ein

-retry=Wiederholen

-rootGroup=Hauptgruppe

-save=&Speichern

-search=&Suche

-searchForChatRooms=&Suche Gesprächsrunden.

-searchForChatRoomsText=Klicken Sie den Knopf, um alle Gesprächsrunden auf dem ausgewählten Server anzuzeigen. Wählen Sien dann eine aus und treten Sie ihr bei.

-securityAuthorityRealm=Der {0} Server benötigt Ihre Zugangsdaten. 

-selectAccount=Konto auswählen

-selectAccountRegistration=Um ein neues Konto zu erstellen, wählen Sie ein Protokoll aus der Liste aus.

-selectAccountRegWizardTitle=Konto erstellen

-selectGroup=Wähle Gruppe

-selectGroupWizard=Die unten angeführte Liste enthält Ihre Gruppen der Kontaktliste. Wählen Sie diejenige aus, zu der Sie den Kontakt hinzufügen wollen.

-selectGroupWizardTitle=Wähle Gruppe

-selectProvidersForChatRoom=Die unten angeführte List zeigt alle Konten, die Gesprächsrunden unterstützen. Wählen Sie aus und erstellen Sie eine Gesprächsrunde.

-selectProvidersWizard=Die unten angeführte Liste enthält Ihre registrierten Benutzerkonten. Wählen Sie eines oder mehrere aus, über welche Sie mit dem neuen Kontakt kommunizieren wollen.

-selectProvidersWizardTitle=Wähle Konto

-send=&Senden

-sendFile=Datei S&enden

-selectContactSupportingInfo=Für diesen Kontakt ist keine Information verfügbar

-sendMessage=Nachricht &Senden

-sendAsSms=SMS Versenden

-sendSms=SMS vers&enden

-sendSmsDetails=Die Telefonnummer muss im internationen Format eingegeben werden \

+service.gui.MOVE_TO_GROUP=&Verschiebe in Gruppe

+service.gui.MOVE_CONTACT_ERROR=&Kontakt kann nicht verschoben werden

+service.gui.MSG_DELIVERY_FAILURE=Diese Nachricht konnte nicht zugestellt werden.

+service.gui.MSG_DELIVERY_NOT_SUPPORTED=Das verwendetet Protokoll kann Nachrichten nur zustellen, wenn Benutzer online sind. Warten Sie darauf, oder verwenden Sie ein anderes Protokoll.

+service.gui.MSG_DELIVERY_INTERNAL_ERROR=Ein interner Fehler ist aufgetreten. Dies ist wahrscheinlich ein Bug. Bitte melden Sie ihn unter http://www.sip-communicator.org/index.php/Development/BugsAndIssues

+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Ihre Nachricht konnte nicht zugestellt werden:

+service.gui.MSG_NOT_DELIVERED=Ein Netzwerkproblem ist aufgetreten.

+service.gui.MSG_RECEIVED={0} hat Ihnen eine Nachricht gesendet.

+service.gui.MSG_SEND_CONNECTION_PROBLEM=Sie sollen verbunden sein, um Nachrichten zu senden.

+service.gui.MULTIPLE_LOGINS=Sie sind mehrfach mit dem selben Konto verbunden. Das Konto User name: {0}, Server name: {1} ist derzeit nicht verbunden.

+service.gui.NETWORK=Netzwerk

+service.gui.NETWORK_FAILURE=Netzwerkfehler

+service.gui.NEXT=&Weiter

+service.gui.NEW=&Neu

+service.gui.NEW_ACCOUNT=&Neues Konto

+service.gui.NEW_MESSAGE=New message...

+service.gui.NEW_NAME=Neuer Name:

+service.gui.NO=Nein

+service.gui.NO_AVAILABLE_ROOMS=Die Raumliste für diesen Server ist gerade nicht verfügbar.

+service.gui.NO_MESSAGE=Keine Nachricht

+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Keine Konten, die Mehrbenutzerchats unterstützen, gefunden. Sehen Sie auf sip-communicator.org für mehr Information, welche Protokolle Mehrbenutzerchats unterstützen.

+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Sie versuchen, ein Fenster mit einer ungesendeten Nachricht zu schließen. Sind Sie sicher?

+service.gui.NON_EXISTING_USER_ID=Der {0} Server kennt das Konto nicht.

+service.gui.NOTIFICATIONS=Nachrichten

+service.gui.OK=&OK

+service.gui.OFFLINE=Nicht Verbunden

+service.gui.OLDER_CALLS=Ältere Anrufe

+service.gui.ONLINE=Verbunden

+service.gui.OPEN_IN_BROWSER=Im &Brower öffnen

+service.gui.PASSWORD=Passwort:

+service.gui.PASTE=&Einfügen

+service.gui.PREVIOUS=Voriges

+service.gui.PRINT=&Drucken

+service.gui.PROTOCOL=Protokoll

+service.gui.QUIT=&Beenden

+service.gui.READY=Bereit

+service.gui.REASON=Grund

+service.gui.RECONNECTION_LIMIT_EXCEEDED=Sie haben sich zu oft getrennt und neu verbunden. Das Konto User name: {0}, Server name: {1} ist zur Zeit verbannt. Bitte versuchen Sie es in ein paar Minuten erneut.

+service.gui.REJECT=&Zurückweisen

+service.gui.REMEMBER_PASSWORD=Passwort merken

+service.gui.REMOVE=&Löschen

+service.gui.REMOVE_ACCOUNT=&Konto löschen

+service.gui.REMOVE_ACCOUNT_MESSAGE=Sind Sie sicher, dass Sie den Kontakt löschen wollen?

+service.gui.REMOVE_CONTACT=&Lösche Kontakt

+service.gui.REMOVE_CONTACT_TEXT=<DIV>Sind Sie sicher, dass Sie <B> {0} </B><BR>entfernen wollen?</DIV>

+service.gui.REMOVE_GROUP=&Lösche Gruppe

+service.gui.RENAME=&Umbenennen

+service.gui.RENAME_CONTACT=Kontakt umbenennen

+service.gui.RENAME_CONTACT_WIZARD=Bitte geben Sie den Namen für den Kontakt ein.

+service.gui.RENAME_GROUP=Gruppe umbenenne

+service.gui.RENAME_GROUP_INFO=Bitte geben Sie den Namen für die Gruppe ein.

+service.gui.REQUEST=&Anforderung

+service.gui.REQUEST_AUTHORIZATION=&Authorisierungsanforderung

+service.gui.REQUEST_AUTHORIZATION_MSG=Kann {0} nicht zur Liste der Kontakte hinzufügen. {0} muss Sie vorher dazu autorisieren. Bitte geben Sie ihre Bitte dazu ein.

+service.gui.RETRY=Wiederholen

+service.gui.ROOT_GROUP=Hauptgruppe

+service.gui.SAVE=&Speichern

+service.gui.SEARCH=&Suche

+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Klicken Sie den Knopf, um alle Gesprächsrunden auf dem ausgewählten Server anzuzeigen. Wählen Sien dann eine aus und treten Sie ihr bei.

+service.gui.SECURITY_AUTHORITY_REALM=Der {0} Server benötigt Ihre Zugangsdaten. 

+service.gui.SELECT_ACCOUNT=Konto auswählen

+service.gui.SELECT_GROUP=Wähle Gruppe

+service.gui.SELECT_GROUP_WIZARD_MSG=Die unten angeführte Liste enthält Ihre Gruppen der Kontaktliste. Wählen Sie diejenige aus, zu der Sie den Kontakt hinzufügen wollen.

+service.gui.SELECT_GROUP_WIZARD=Wähle Gruppe

+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Die unten angeführte List zeigt alle Konten, die Gesprächsrunden unterstützen. Wählen Sie aus und erstellen Sie eine Gesprächsrunde.

+service.gui.SELECT_PROVIDERS_WIZARD_MSG=Die unten angeführte Liste enthält Ihre registrierten Benutzerkonten. Wählen Sie eines oder mehrere aus, über welche Sie mit dem neuen Kontakt kommunizieren wollen.

+service.gui.SELECT_PROVIDERS_WIZARD=Wähle Konto

+service.gui.SEND=&Senden

+service.gui.SEND_FILE=Datei S&enden

+service.gui.SELECT_CONTACT_SUPPORTING_INFO=Für diesen Kontakt ist keine Information verfügbar

+service.gui.SEND_MESSAGE=Nachricht &Senden

+service.gui.SEND_AS_SMS=SMS Versenden

+service.gui.SEND_SMS=SMS vers&enden

+service.gui.SEND_SMS_DETAILS=Die Telefonnummer muss im internationen Format eingegeben werden \

 zum Beispiel mit +43 für österreichische Nummern, +43664XXXXXXX.

-sendSmsNotSupported=Das ausgewählte Protokoll unterstützt den Versand vom SMS nicht.

-sendVia=Senden via

-setStatusMessage=Statusinformation setzen

-settings=&Einstellungen

-showCallPanel=Zeige Telefonfeld

-showChannelsList=Zeige Kanalliste

-showOffline=Zeige

-showOfflineUsers=Verstecke/Zeige Benutzer, die offline sind.

-signin=Anmelden

-smiley=Smiley

-smsSuccessfullySent=SMS erfolgreich gesendet!

-smsSendConnectionProblem=Sie müssen verbunden sein, um SMS zu versenden. Bitte verbinden Sie sich mit Ihrem SMS Anbieter.

-specifyReason=In diesem Feld können Sie eine Begründung für die Aktion eingeben.

-sound=Ton

-soundOnOff=Ton ein/aus

-statusChangedChatMessage=ist nun {0}

-statusChangeGeneralError=Konnte Status nicht ändern. Benutzername: {0}, Servername: {1}. Ein allgemeiner Fehler ist aufgetreten.

-statusChangeNetworkFailure=Konnte Status nicht ändern. Benutzername: {0}, Servername: {1}. Ein Netzwerkfehler ist aufgetreten.

-statusMessageInfo=In the field below you can specify the new message you would like to use.

-subject=Betreff

-summary=Zusammenfassung

-today=Heute

-tools=&Werkzeuge

-typeYourRequest=Schreiben Sie Ihre Anfrage hier

-uin=User identifier:

-unknown=Benutzer unbekannt

-useCtrlEnterToSend=Benutze Ctrl-&Enter zum senden

-username=Benutzername

-msgDeliveryFailedUnknownError=Unbekannter Fehler beim Zustellen der Nachricht.

-unregisteredMessage=Fehler beim Verbinden über das folgende Konto: Benutzername: {0}, Servername: {1}. Sie sind nicht verbunden.

-updateAutomatically=Installiere Updates automatisch

-updates=Updates

-view=&Ansicht

-viewHistory=Zeige &Verlauf/Geschichte

-warning=Warnung

-yes=Ja

-yesterday=Gestern

-

-january=Jan

-february=Feb

-march=Mär

-april=Apr

-may=Mai

-june=Jun

-july=Jul

-august=Aug

-september=Sep

-october=Okt

-november=Nov

-december=Dez

+service.gui.SEND_SMS_NOT_SUPPORTED=Das ausgewählte Protokoll unterstützt den Versand vom SMS nicht.

+service.gui.SEND_VIA=Senden via

+service.gui.SET_STATUS_MESSAGE=Statusinformation setzen

+service.gui.SETTINGS=&Einstellungen

+service.gui.SHOW_OFFLINE_CONTACTS=Zeige

+service.gui.SIGN_IN=Anmelden

+service.gui.SMS_SUCCESSFULLY_SENT=SMS erfolgreich gesendet!

+service.gui.SMS_SEND_CONNECTION_PROBLEM=Sie müssen verbunden sein, um SMS zu versenden. Bitte verbinden Sie sich mit Ihrem SMS Anbieter.

+service.gui.SPECIFY_REASON==In diesem Feld können Sie eine Begründung für die Aktion eingeben.

+service.gui.SOUND_ON_OFF=Ton ein/aus

+service.gui.STATUS_CHANGED_CHAT_MESSAGE=ist nun {0}

+service.gui.STATUS_CHANGE_GENERAL_ERROR=Konnte Status nicht ändern. Benutzername: {0}, Servername: {1}. Ein allgemeiner Fehler ist aufgetreten.

+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Konnte Status nicht ändern. Benutzername: {0}, Servername: {1}. Ein Netzwerkfehler ist aufgetreten.

+service.gui.STATUS_MESSAGE_INFO=In the field below you can specify the new message you would like to use.

+service.gui.SUBJECT=Betreff

+service.gui.SUMMARY=Zusammenfassung

+service.gui.TODAY=Heute

+service.gui.TOOLS=&Werkzeuge

+service.gui.TYPE_YOUR_REQUEST=Schreiben Sie Ihre Anfrage hier

+service.gui.UNKNOWN=Benutzer unbekannt

+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Unbekannter Fehler beim Zustellen der Nachricht.

+service.gui.UNREGISTERED_MESSAGE=Fehler beim Verbinden über das folgende Konto: Benutzername: {0}, Servername: {1}. Sie sind nicht verbunden.

+service.gui.VIEW=&Ansicht

+service.gui.VIEW_HISTORY=Zeige &Verlauf/Geschichte

+service.gui.WARNING=Warnung

+service.gui.YES=Ja

+service.gui.YESTERDAY=Gestern

+

+service.gui.JANUARY=Jan

+service.gui.FEBRUARY=Feb

+service.gui.MARCH=Mär

+service.gui.APRIL=AprApr

+service.gui.MAY=MayMai

+service.gui.JUNE=JunJun

+service.gui.JULY=JulJul

+service.gui.AUGUST=AugAug

+service.gui.SEPTEMBER=SepSep

+service.gui.OCTOBER=OctOkt

+service.gui.NOVEMBER=NovNov

+service.gui.DECEMBER=DecDez

 

 # systray

-setStatus=Status

-onlineStatus=Online

-offlineStatus=Offline

-messageReceived=Nachricht erhalten von

-failedToLoadAddContactDialog=Der "Kontakt hinzufügen"-Dialog konnte nicht gestartet werden.

+impl.systray.SET_STATUS=Status

+impl.systray.ONLINE_STATUS=Online

+impl.systray.OFFLINE_STATUS=Offline

+impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=Der "Kontakt hinzufügen"-Dialog konnte nicht gestartet werden.

 

 # account info

-accountInfo=Benutzerinformation für 

-title=Account Info

-browse=Durchsuchen

-summaryDesc=Zusammenfassung für Benutzerkonto für 

-extended=Erweitert

-extendedDesc=Erweiterte Information für 

-notSupported=Keine Informationen verfügbbar.

-clickWeb=Click for Web Info

-webInfo=Web Info

-firstNameNS=Vorname:

-middleNameNS=Zweiter Vorname:

-lastNameNS=Nachname:

-ageNS=Alter:

-bdayNS=Geburtsdatum:

-genderNS=Geschlecht:

-emailNS=E-mail:

-phoneNS=Telefon:

-userPictures=Fotos

-change=Ändern

-onlyMessages=Nur Nachrichten

+plugin.accountinfo.TITLE=Benutzerinformation für 

+plugin.accountinfo.BROWSE=Durchsuchen

+plugin.accountinfo.EXTENDED=Erweitert

+ 

+plugin.accountinfo.NOT_SUPPORTED=Keine Informationen verfügbbar.

+plugin.accountinfo.FIRST_NAME=Vorname:

+plugin.accountinfo.MIDDLE_NAME=Zweiter Vorname:

+plugin.accountinfo.LAST_NAME=Nachname:

+plugin.accountinfo.AGE=Alter:

+plugin.accountinfo.BDAY=Geburtsdatum:

+plugin.accountinfo.GENDER=Geschlecht:

+plugin.accountinfo.EMAIL=E-mail:

+plugin.accountinfo.PHONE=Telefon:

+plugin.accountinfo.USER_PICTURES=Fotos

+plugin.accountinfo.CHANGE=Ändern

+plugin.accountinfo.ONLY_MESSAGE=Nur Nachrichten

 

 # aimaccregwizz

-protocolNameAim=AIM

-protocolDescriptionAim=Das AIM service protocol (AOL Instant Messenger)

-id=AIM Screenname:

-password=Passwort:

-aimUinAndPassword=UIN und Passwort

-registerNewAccount=Neuen Account anlegen

-aimRegisterNewAccountText=Wenn Sie keinen AIM Account haben, klicken Sie um einen neuen zu erstellen.

+plugin.aimaccregwizz.PROTOCOL_NAME=AIM

+plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=Das AIM service protocol (AOL Instant Messenger)

+plugin.aimaccregwizz.USERNAME=AIM Screenname:

+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=UIN und Passwort

+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Neuen Account anlegen

+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Wenn Sie keinen AIM Account haben, klicken Sie um einen neuen zu erstellen.

 existingAccount=* Dieses Konto ist bereits installiert.

-ovverideServerOps=Ãœberschreibe Servereinstellungen

-advancedOptions=Erweiterte Einstellungen

-proxy=Proxy

-proxyPort=Proxy port

-proxyType=Proxy type

-proxyUsername=Proxy username

-proxyPassword=Proxy password

+plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Ãœberschreibe Servereinstellungen

+plugin.aimaccregwizz.ADVANCED_OPTIONS=Erweiterte Einstellungen

+plugin.aimaccregwizz.PROXY=Proxy

+plugin.aimaccregwizz.PROXY_PORT=Proxy port

+plugin.aimaccregwizz.PROXY_TYPE=Proxy type

+plugin.aimaccregwizz.PROXY_USERNAME=Proxy username

+plugin.aimaccregwizz.PROXY_PASSWORD=Proxy password

 

 # branding

-aboutWindowTitle=Ãœber {0}

-logoMessage=Open Source VoIP & Instant Messaging

-loading=Lade

-aboutMenuEntry=Ãœber

-basedOn=based on

-welcomeMessage=<DIV color={0}>The {1} is currently under active development. \

+plugin.branding.ABOUT_WINDOW_TITLE=Ãœber {0}

+plugin.branding.LOGO_MESSAGE=Open Source VoIP & Instant Messaging

+plugin.branding.LOADING=Lade

+plugin.branding.ABOUT_MENU_ENTRY=Ãœber

+plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1} is currently under active development. \

                The version you are running is only experimental and MAY NOT \

                work as expected. Please refer to {2} for more information.</DIV>

-copyright=<DIV><font size=3 color={0}>(c)2003-2007 Copyright \

+plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2007 Copyright \

           <b>sip-communicator.org</b>. All rights reserved. Visit \

           <a href="http://sip-communicator.org">http://sip-communicator.org</a>.\

           </font></DIV>

-license=<DIV color={0}>The <b>SIP Communicator</b> is distributed under \

+plugin.branding.LICENSE=<DIV color={0}>The <b>SIP Communicator</b> is distributed under \

         the terms of the LGPL (<a href=\"http://www.gnu.org\">\

         http://www.gnu.org</a>).</DIV>

 

 # contact info

-contactDetails=Kontakt Details

-selectUser=Benutzer auswählen

-contactSummaryDesc=Zusammenfassung für 

-contactExtendedDesc=Erweiterte Informationen für 

-contactInfoNotSupported=Dieses Protokoll unterstützt keine Server-basierten Informationen. Versuchen Sie ein anderes Protokoll.

-notSpecified=[Nicht angegeben]

+plugin.contactinfo.TITLE=Kontakt Details

+plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=Zusammenfassung für 

+plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=Erweiterte Informationen für 

+plugin.contactinfo.NOT_SPECIFIED=[Nicht angegeben]

 

 # dict accregwizz

-protocolNameDict=Dict

-protocolDescriptionDict=The Dict service protocol

-strategyList=List of strategies:

-strategyActu=Search strategies

-strategyDesc=Strategie is use to search similar words,if a translation was not found, thanks to different approaches. For example the Prefix strategies will search words which begin like the word you would translate.

-

-dictAccountInfoTitle=Dict Account Information

-firstAccount=This wizard will create your first Dict Account for you on dict.org.\n\n\

+plugin.dictaccregwizz.PROTOCOL_NAME=Dict

+plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=The Dict service protocol

+plugin.dictaccregwizz.STRATEGY_LIST=List of strategies:

+plugin.dictaccregwizz.SEARCH_STRATEGIES=Search strategies

+plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategie is use to search similar words,if a translation was not found, thanks to different approaches. For example the Prefix strategies will search words which begin like the word you would translate.

+plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict Account Information

+plugin.dictaccregwizz.FIRST_ACCOUNT=This wizard will create your first Dict Account for you on dict.org.\n\n\

 You can add new dictionary by going on Account Registration Wizard. Fill the host Field with dictionnary you would like to add.

 

 # extendedcallsearchhistory

-advancedCallHistorySearch=&Advanced call history search

-search=Suche

-contactName=Kontakt Name

-since=Seit

-until=Bis

-callType=Anruftyp

-incoming=Eingehend

-outgoing=Ausgehend

-olderCalls=Ältere Anrufe

-all=Alle

+plugin.callhistoryform.TITLE=&Advanced call history search

+plugin.callhistoryform.SEARCH=Suche

+plugin.callhistoryform.CONTACT_NAME=Kontakt Name

+plugin.callhistoryform.SINCE=Seit

+plugin.callhistoryform.UNTIL=Bis

+plugin.callhistoryform.CALLTYPE=Anruftyp

+plugin.callhistoryform.INCOMING=Eingehend

+plugin.callhistoryform.OUTGOING=Ausgehend

 

 # generalconfig

-autoStartOption=Starte Messenger automatisch

-groupChatMessages=Gruppiere Nachrichten in einem Fenster.

-logHistory=Speichere Nachrichten

-showHistory=Zeige gespeicherte Nachrichten

-historySize=letzte Nachrichten in neuen Chats

-sendMessagesWith=Sende Nachrichten mit:

-enableTypingNotifications=aktiviere Tipp-Notifizierung 

-bringWindowToFront=Bringe Chat Fenster in den Vorderung

-errorPermission=Sie haben nicht die Berechtigung, den Autostart auszuschalten

-

+plugin.generalconfig.AUTO_START=Starte Messenger automatisch

+plugin.generalconfig.GROUP_CHAT_MESSAGES=Gruppiere Nachrichten in einem Fenster.

+plugin.generalconfig.LOG_HISTORY=Speichere Nachrichten

+plugin.generalconfig.SHOW_HISTORY=Zeige gespeicherte Nachrichten

+plugin.generalconfig.HISTORY_SIZE=letzte Nachrichten in neuen Chats

+plugin.generalconfig.SEND_MESSAGES_WITH=Sende Nachrichten mit: 

+plugin.generalconfig.BRING_WINDOW_TO_FRONT=Bringe Chat Fenster in den Vorderung

+plugin.generalconfig.ERROR_PERMISSION=Sie haben nicht die Berechtigung, den Autostart auszuschalten

 

 # gibberish accregwizz

-protocolNameGibberish=Gibberish

-protocolDescriptionGibberish=A SIP Communicator test protocol.

-userID=User ID:

-userAndPassword=Identification

+plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish

+plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=A SIP Communicator test protocol.

+plugin.gibberishaccregwizz.USERNAME=User ID:

+plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=Identification

 

 # icqaccregwizz

-protocolNameIcq=ICQ

-protocolDescriptionIcq=Das AOL ICQ service protocol

-uin=ICQ Nummer:

-icqRegisterNewAccountText=Wenn Sie keinen ICQ Account haben, klicken Sie um einen neuen zu erstellen.

+plugin.icqaccregwizz.PROTOCOL_NAME=ICQ

+plugin.icqaccregwizz.PROTOCOL_DESCRIPTION=Das AOL ICQ service protocol

+plugin.icqaccregwizz.USERNAME=ICQ Nummer:

+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Wenn Sie keinen ICQ Account haben, klicken Sie um einen neuen zu erstellen.

 

 # irc accregwizz

-protocolNameIrc=IRC

-protocolDescriptionIrc=Das IRC protocol.

-nick=Nickname:

-infoPassword=Most IRC servers do not require password.

-autoNickChange=Automatically change nick when it's already used

-defaultPort=Use default port

-passwordNotRequired=My nickname doesn't require identification

-server=Hostname:

-port=Port:

-serverIRC=Server

+plugin.ircaccregwizz.PROTOCOL_NAME=IRC

+plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=Das IRC protocol.

+plugin.ircaccregwizz.USERNAME=Nickname:

+plugin.ircaccregwizz.INFO_PASSWORD=Most IRC servers do not require password.

+plugin.ircaccregwizz.AUTO_NICK_CHANGE=Automatically change nick when it's already used

+plugin.ircaccregwizz.USE_DEFAULT_PORT=Use default port

+plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=My nickname doesn't require identification

+plugin.ircaccregwizz.HOST=Hostname:

+plugin.ircaccregwizz.PORT=Port:

+plugin.ircaccregwizz.IRC_SERVER=Server

 

 # jabber accregwizz

-protocolNameJabber=JABBER

-protocolDescriptionJabber=Das Jabber protocol

-jabberUsername=Jabber username

-password2=Confirm password

-userIDAndPassword=ID and Password

-cserver=Server

-server=Connect Server

-port=Port

-enableKeepAlive=Enable keep alive

-newAccountTitle=Jabber new account registration

-registerNewAccountText=In case you don't have a Jabber account, click on this button to create a new one.

-chooseTitle=Jabber new account server chooser

-chooseServerText=Choose the server for your new account in the list below.

-okLabel=&Ok

-cancelLabel=C&ancel

-chooseLabel=&Choose

-serverColumn=Server

-commentColumn=Comment

-resource=Resource

-priority=Priority

-

-xmppError=XMPP Error

-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.

+plugin.jabberaccregwizz.PROTOCOL_NAME=JABBER

+plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Das Jabber protocol

+plugin.jabberaccregwizz.USERNAME=Jabber username

+plugin.jabberaccregwizz.PASSWORD_CONFIRM==Confirm password

+plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID and Password

+plugin.jabberaccregwizz.CSERVER=Server

+plugin.jabberaccregwizz.SERVER=Connect Server

+plugin.jabberaccregwizz.PORT=Port

+plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Enable keep alive

+plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=Jabber new account registration

+plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Jabber account, click on this button to create a new one.

+plugin.jabberaccregwizz.CHOOSE_SERVER_TITLE=Jabber new account server chooser

+plugin.jabberaccregwizz.CHOOSE_SERVER_TEXT=Choose the server for your new account in the list below.

+plugin.jabberaccregwizz.CHOOSE=&Choose

+plugin.jabberaccregwizz.SERVER_COLUMN=Server

+plugin.jabberaccregwizz.COMMENT_COLUMN=Comment

+plugin.jabberaccregwizz.RESOURCE=Resource

+plugin.jabberaccregwizz.PRIORITY=Priority

+plugin.jabberaccregwizz.XMPP_ERROR=XMPP Error

+plugin.jabberaccregwizz.USER_EXISTS_ERROR=This user already exist on this server. Choose another user or server.

+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unknown XMPP error. Verify that the server name is correct.

+plugin.jabberaccregwizz.NOT_SAME_PASSWORD=The two entered password aren't the same.

 

 # mailbox

-outgoing=Outgoing Message:

-incoming=Incoming Messages:

-waitTime=Delay Until Call Sent to Voicemail

-maxMessageTime=Maximum Incoming Message Duration

-confirm=Confirm

-default=Defaults

-mailbox=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

 

 # msn accregwizz 

-protocolNameMsn=MSN

-protocolDescriptionMsn=Das MSN service protocol.

-id=Email:

-msnUinAndPassword=ID and Password

+plugin.msnaccregwizz.PROTOCOL_NAME=MSN

+plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Das MSN service protocol.

+plugin.msnaccregwizz.USERNAME=Email:

+plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID and Password

 

 # plugin manager

-activate=Aktivieren

-desactivate=Deaktivieren

-install=Install

-uninstall=Deinstallieren

-update=Aktualisieren

-new=Neues Plug-in

-plugins=Plug-ins

-cancel=Cancel

-url=Url

-chooseFile=Wähle Datei

-showSystemBundles=Zeige Systemkomponenten

-system=System

+plugin.pluginmanager.INSTALL=Install

+plugin.pluginmanager.UNINSTALL=Deinstallieren

+plugin.pluginmanager.UPDATE=Aktualisieren

+plugin.pluginmanager.PLUGINS=Plug-ins

+plugin.pluginmanager.URL=Url

+plugin.pluginmanager.CHOOSE_FILE=Wähle Datei

+plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=Zeige Systemkomponenten

+plugin.pluginmanager.SYSTEM=System

+plugin.pluginmanager.NEW=Neu

 

 # rss accregwizz

-protocolNameRss=RSS

-protocolDescriptionRss=Add your preferred RSS feeds into SIP Communicator !

-rssAccountExist=RSS account already exists!

-rssAccountInfo=This wizard will create an RSS account for you.\n\n\

+plugin.rssaccregwizz.PROTOCOL_NAME=RSS

+plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into SIP Communicator !

+plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=RSS account already exists!

+plugin.rssaccregwizz.ACCOUNT_INFO=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!

+plugin.rssaccregwizz.ACCOUNT_INFO_TITLE=RSS Account Information

+plugin.rssaccregwizz.ACCOUNT_ATTENTION=Please read attentively the information provided below!

 

 # simple accregwizz

-initialAccountRegistration=Die beliebtesten Protokolle in einem Schritt

-signup=Noch kein Konto?

-specialSignup=Noch kein Konto? Klicken Sie hier, um ein Konto anzulegen.

-cancel=Abbrechen

+plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION=Die beliebtesten Protokolle in einem Schritt

+plugin.simpleaccregwizz.SIGNUP=Noch kein Konto?

+plugin.simpleaccregwizz.SPECIAL_SIGNUP=Noch kein Konto? Klicken Sie hier, um ein Konto anzulegen.

 

 # sipaccregwizz

-protocolNameSip=SIP

-protocolDescriptionSip=Das SIP protocol

-id=SIP id

-sipUinAndPassword=Benutzername und Passwort

-registrar=Registrar

-serverPort=Server port

-preferredTransport=Preferred transport

-enablePresence=Enable presence (SIMPLE)

-forceP2PPresence=Force peer-to-peer presence mode

-offlineContactPollingPeriod=Offline contacts polling period (in s.)

-subscriptionExpiration=Default subscription duration (in s.)

-presenceOptions=Presence Options

-keepAlive=Keep alive

-keepAliveMethod=Keep alive method

-keepAliveInterval=Keep alive interval

-keepAliveIntervalEx=Between 1 and 3600 seconds

-register=REGISTER

+plugin.sipaccregwizz.PROTOCOL_NAME=SIP

+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=Das SIP protocol

+plugin.sipaccregwizz.USERNAME=SIP id

+plugin.sipaccregwizz.USERNAME_AND_PASSWORD=Benutzername und Passwort

+plugin.sipaccregwizz.REGISTRAR=Registrar

+plugin.sipaccregwizz.SERVER_PORT=Server port

+plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport

+plugin.sipaccregwizz.ENABLE_PRESENCE=Enable presence (SIMPLE)

+plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Force peer-to-peer presence mode

+plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Offline contacts polling period (in s.)

+plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION=Default subscription duration (in s.)

+plugin.sipaccregwizz.PRESENCE_OPTIONS=Presence Options

+plugin.sipaccregwizz.KEEP_ALIVE=Keep alive

+plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Keep alive method

+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Keep alive interval

+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Between 1 and 3600 seconds

+plugin.sipaccregwizz.REGISTER=REGISTER

 

 # ssh accregwizz

-protocolNameSsh=SSH

-protocolDescriptionSsh=A Protocol to connect to remote machines over SSH.

-accountID=Account ID:

-identityFile=Identitity File:

-knownHosts=Known Hosts:

-accountDetails=SSH Account Details

+plugin.sshaccregwizz.PROTOCOL_NAME=SSH

+plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=A Protocol to connect to remote machines over SSH.

+plugin.sshaccregwizz.USERNAME=Account ID:

+plugin.sshaccregwizz.IDENTITY_FILE=Identitity File:

+plugin.sshaccregwizz.KNOWN_HOSTS=Known Hosts:

+plugin.sshaccregwizz.ACCOUNT_DETAILS=SSH Account Details

 

 # status update

-automaticStatus=Automatischer Status

-enableChangeStatus=Ändere Status wenn abwesend

-awayMinutes=Minuten bevor Status auf "abwesend" gesetzt wird:

+plugin.autoaway.AUTO_STATUS=Automatischer Status

+plugin.autoaway.ENABLE_CHANGE_STATUS=Ändere Status wenn abwesend

+plugin.autoaway.AWAY_MINUTES=Minuten bevor Status auf "abwesend" gesetzt wird:

 infotext=Setze "Abwesend" als Status, wenn der Computer für X Minuten nicht verwendet wird. Der Status wird bei auf den vorangegangen Status zurückgesetzt, sobald der Computer wieder aktiv verwendet wird.

 

 # updatechecker

-dialogTitle=New version available

-dialogMessage1=<html>A new version of {0} is available for download.

-dialogMessage2=<br>{0} ({1}): <br>

+plugin.updatechecker.DIALOG_TITLE=New version available

+plugin.updatechecker.DIALOG_MESSAGE=<html>A new version of {0} is available for download.

+plugin.updatechecker.DIALOG_MESSAGE_2=<br>{0} ({1}): <br>

 dialogMessageDebian=

-buttonDownload=Download

-buttonClose=Close

+plugin.updatechecker.BUTTON_DOWNLOAD=Download

+plugin.updatechecker.BUTTON_CLOSE=service.gui.CLOSE

 

 # whiteboard

-invitationReceivedFormInfo={0} has invited you to join {1} whiteboard. You could accept, reject or ignore this invitation.

-whiteboardTitle=Whiteboard [Beta]

-whiteboardMenuItemText=Whiteboard

-whiteboardMenuItemNotSupportedTooltip=This contact does not support whiteboarding

-cancel=Cancel

-doNotAskAgain=Do not ask me again.

-closeSessionQuestion=Would you like to end current session ? If you choose "yes" the current session will be ended, otherwise only your whiteboard window will be closed.

-file=Datei

-draw=Zeichnen

-new=Neu

-save=Speichern

-open=Öffnen

-copy=Kopieren

-paste=Einfügen

-pen=Stift

-select=Auswählen

-line=Linie

-rectangle=Rechteck

-fillRectangle=Ausgefülltes Rechteck

-text=Text

-image=Bild

-polygon=Polygon

-fillPolygon=Ausgefülltes Polygon

-polyline=Pfad

-circle=Kreis

-fillCircle=Ausgefüllter Kreis

-color=Farbe

-modification=Änderung

-thickness=Dicke:

-send=Senden

-print=Drucken

-exit=Beenden

-edit=Bearbeiten

-grid=Gitternetz

-deselect=Deselect

-delete=Löschen

-properties=Einstellungen

-help=?

-About=Ãœber

+plugin.whiteboard.TITLE=Whiteboard [Beta]

+plugin.whiteboard.MENU_ITEM=Whiteboard

+plugin.whiteboard.NOT_SUPPORTED=This contact does not support whiteboarding

+plugin.whiteboard.DRAW=Zeichnen

+plugin.whiteboard.OPEN=Öffnen

+plugin.whiteboard.PEN=Stift

+plugin.whiteboard.SELECT=Auswählen

+plugin.whiteboard.LINE=Linie

+plugin.whiteboard.RECTANGLE=Rechteck

+plugin.whiteboard.FILLED_RECTANGLE=Ausgefülltes Rechteck

+plugin.whiteboard.TEXT=Text

+plugin.whiteboard.IMAGE=Bild

+plugin.whiteboard.POLYGON=Polygon

+plugin.whiteboard.FILLEDPOLYGON=Ausgefülltes Polygon

+plugin.whiteboard.POLYLINE=Pfad

+plugin.whiteboard.CIRCLE=Kreis

+plugin.whiteboard.FILLED_CIRCLE=Ausgefüllter Kreis

+plugin.whiteboard.COLOR=Farbe

+plugin.whiteboard.MODIFICATION=Änderung

+plugin.whiteboard.THICKNESS=Dicke:

+plugin.whiteboard.GRID=Gitternetz

+plugin.whiteboard.DESELECT=Deselect

+plugin.whiteboard.DELETE=Löschen

+plugin.whiteboard.PROPERTIES=Einstellungen

 

 # yahoo accregwizz

-protocolNameYahoo=YAHOO

-protocolDescriptionYahoo=Das Yahoo! Protokoll.

-id=Username:

-yahooUinAndPassword=Benutzername und Passwort

+plugin.yahooaccregwizz.PROTOCOL_NAME=YAHOO

+plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Das Yahoo! Protokoll.

+plugin.yahooaccregwizz.USERNAME=Username:

+plugin.yahooaccregwizz.USERID_AND_PASSWORD=Benutzername und Passwort

 

 # zero accregwizz

-protocolNameZeroconf=Zeroconf

-protocolDescriptionZeroconf=The Zeroconf (Bonjour) service protocol.

-firstname=Firname:

+plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf

+plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=The Zeroconf (Bonjour) service protocol.

+plugin.zeroaccregwizz.FIRST_NAME=Firname:

 

 # ssh protocol

 #Contact Details Seperator(must not be part of contact data stored as persistent

 # data)

-detailsSeperator=~

-

-# msn protocol

-newMail=Sie haben eine neue Email von {0} ({1}) mit dem Betreff: {2}

-

-# yahoo protocol

-newYahooMail=Neu Email, Betreff

-fromYahoo=Von

+impl.protocol.ssh.DETAILS_SEPARATOR=~

 

 # gtalk accregwizz

-protocolName=GOOGLE TALK

-protocolDescription=The Google Talk protocol

-gtalkUsername=Google Talk username

-gtalkRegisterNewAccountText=In case you don't have a Google Talk account, click on this button to create a new one.

+plugin.googletalkaccregwizz.PROTOCOL_NAME=GOOGLE TALK

+plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=The Google Talk protocol

+plugin.googletalkaccregwizz.USERNAME=Google Talk username

+plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Google Talk account, click on this button to create a new one.

diff --git a/resources/languages/resources_fr.properties b/resources/languages/resources_fr.properties
index 96517e9..b77228f 100644
--- a/resources/languages/resources_fr.properties
+++ b/resources/languages/resources_fr.properties
@@ -25,356 +25,284 @@
 # The same rules apply to the properties files found in the other
 # directories.
 
-about=&A propos
-accept=&Accepter
-account=compte
-accountRegistrationWizard=Assistant d'enregistrement de compte
-accounts=Comptes
-activateOnlyWhenMinimized=Activer uniquement en mode réduit
-add=&Ajouter
-addContact=&Ajouter un contact
-addContactError=Échec lors de l''ajout du contact : {0}
-addContactErrorTitle=Échec lors de l'ajout d''un contact
-addContactExistError=Le contact {0} existe déjà dans votre liste de contact.
-addContactIdentifier=Dans le champ suivant, veuillez entrer l'identifiant du contact que vous souhaitez ajouter.
-addContactWizard=Assistant d'ajout de contact
-addGroupLocalError=Échec lors de l''ajout du groupe : {0}. Le problème est dû à un échec d''E/S lors d''une opération locale.
-addGroupNetError=Échec lors de l''ajout du groupe : {0}. Le problème est dû à un échec du réseau. Prière, de vérifier votre connection au réseau avant de réessayer.
-addGroupError=Échec lors de l''ajout du groupe : {0}.
-addGroupErrorTitle=Erreur lors de l'ajout de groupe
-addGroupExistError=Le groupe {0} existe déjà dans votre liste de contact.
-addSubcontact=&Ajouter un sous-contact
-all=&Tous
-allContacts=&Tous les contacts
-alwaysOnTop=Toujours au premier plan
-appearance=Apparence
-application=Application
-apply=&Effectuer
-at=arobase
-authAccepted=Le contact a accepté votre requête d'autorisation.
-authenticationWindowTitle=Demande d'authentification
-authRejected=Le contact a rejeté votre demande d'autorisation.
-authorizationRequested=Demande d'autorisation
-authorizationRequestedInfo=Le contact {0} demande votre autorisation.
-authenticationFailed=L''authentification a échouée pour le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1}. Le mot de passe que vous avez fourni est incorrect.
-authorizationResponse=Réponse de demande d'autorisation
-autoPopup=Mettre la fenêtre au premier plan
-awayStatus=Absent
-back=&De retour
-ban=&Exclure
-banFailed=Échec lors de l'exclusion
-banFailedGeneralError=Erreur lors de l''exclusion {0}. Une erreur au niveau du serveur est survenue.
-banFailedNotAllowed=Erreur lors de l''exclusion {0}. Le propriétaire et l''administrateur du salon ne peuvent pas être exclu.
-banFailedNotEnoughPermissions=Erreur lors de l''exclusion {0}. Vous n''avez pas les droits suffisant pour cela.
-brbMessage=Je suis parti, mais je reviens tout de suite.
-busyMessage=Désolé, je suis très occupé.
-call=Appel
-callVia=Appel via:
-callList=Liste d'appels
-cancel=&Annuler
-chatRoomAlreadyJoined=Vous avez déjà rejoint le salon {0}.
-chatRoomConfiguration=Configuration du salon {0}
-chatRoomOpenConfigFailed=Échec lors de l''obtention de la configuration du salon {0}.
-chatRoomOpenConfigForbidden=Échec lors de l''obtention de la configuration du salon {0}. Seuls les administrateurs du salon peuvent voir et modifier la configuration.
-chatRoomConfigFormSubmitFailed=Erreur lors de la mise à jour de la configuration du salon {0}.
-chatRoomUserJoined=a rejoint {0}
-chatRoomUserLeft=est parti de {0}
-chatRoomUserKicked=a été banni de {0}
-chatRoomUserQuit=a quitté {0}
-chatRoomName=Nom du salon
-chatRoomNameInfo=Dans le champ suivant, veuillez entrer le nom du salon que vous souhaitez créer.
-chatRoomNotExist=Le salon {0} est introuvable sur le serveur {1}. Prière de vérifier la validité du nom que vous avez saisi.
-chatRoomNotConnected=Vous devez vous connecter pour rejoindre le salon {0}.
-chatRoomNotJoined=Vous devez d'abord rejoindre un salon pour effectuer cette opération.
-chatRoomOptions=Options du salon
-chatRoomRegistrationRequired=Vous devez être enregistré avant de pouvoir le rejoindre le salon {0}.
-chatRoomRequiresPassword=Le salon {0} nécessite un mot de passe.
-chatRooms=Salons
-chatRoomSubjectChanged={0} a changé le sujet à {1}
-close=F&ermer
-closeChatAfterNewMsg=Vous avez reçu un message il y a moins de 2 secondes. Êtes-vous sûr de vouloir fermer cette conversation ?
-conference=Conférence
-configure=&Configurer
-configuration=Configuration
-connectionFailed=Échec de connection
-connectionFailedMessage=Échec de connection pour le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}.
-connectionExpiredMessage=Vous avez été déconnecte du serveur {0}.
-contactAddress=Adresse du contact
-contactNotSupportingTelephony=Le contact choisit {0} ne supporte pas la téléphonie.
-contactPausedTyping={0} s''est arrêté d''écrire le message
-contactTyping={0} est en train d''écrire un message
-contactTypingStateStale=L'état de la saisie ne peut pas être mise à jour
-contacts=Contacts
-continue=&Continuer
-copy=&Copier
-copyLink=Copier l'&adresse
-create=C&réer
-createChatRoom=&Créer un salon...
-createChatRoomNotSupported=Échec lors de la création du salon : {0}. Le serveur {1} ne supporte pas cette opération.
-createChatRoomError=Échec lors de la création du salon : {0}.
-createChatRoomWizard=Assistant de création de salon
-createGroup=&Créer un groupe
-createGroupName=Veuiller saisir dans le champ suivant le nom du groupe que vous désirer créer.
-createFirstGroupWizard=Votre liste de contacts ne contient aucun groupe. Prière de créer un groupe (Fichier/Créer groupe) en premier lieu.
-cut=C&ouper
-date=Date
-description=Description
-dial=&Composer
-dialpad=Clavier téléphonique
-dndStatus=Ne pas déranger
-doNotAskAgain=Ne plus redemander
-doNotShowAgain=Ne plus afficher ce message
-dontSupportWebInfo=Ce contact ne dispose pas d'informations sur le web.
-duration=Durée
-edit=&Éditer
-emptyHistory=&Vider l'historique
-enableNotifications=Activer les notifications
-enableTypingNotifications=Activer les notifications de &saisie.
-error=Erreur
-exit=Q&uitter
-extendedCriteria=Critères étendus
-general=Général
-generalError=Erreur générale
-group=Groupe
-groupName=Nom de groupe
-failedToCreateChatRoom=Échec lors de la création du salon : {0}.
-failedToJoinChatRoom=Échec, impossible de rejoindre le salon : {0}.
-ffcStatus=Disponible pour discuter
-file=&Fichier
-findChatRoomError=Échec pour trouver le salon "{0}".
-finish=&Terminer
-first=Premier
-font=Police
-haveToBeConnectedToJoin=Vous devez être connecté avant de pouvoir rejoindre un salon. Prière de vous connectez avant de réessayer.
-haveToBeConnectedToLeave=Vous devez être connecté pour pouvoir quitter un salon.
-help=?
-hideCallPanel=&Masquer la zone d'appels
-hideMainWindow=Cliquer sur le bouton X ne quittera pas l'application, mais la masquera seulement. Utilisez "Fichier/Quitter" si vous souhaitez quitter l'application.
-history=&Historique
-historyContact=Historique - {0}
-hour=Heure
-identifier=Identifiant
-ignore=&Ignorer
-insertSmiley=Insérer une émoticône
-invalidCall=Appel invalide
-invitation=Motif de l'invitation
-invitationReceived=Invitation reçue
-invitationReceivedFormInfo={0} vous a invité à rejoindre le salon {1}. Vous pouvez accepter, rejeter ou ignorer cette invitation.
-invite=&Inviter
-inviteContactFormInfo=Merci de renseigner le nom de l'utilisateur que vous souhaitez inviter. Si vous le souhaitez, vous pouvez également préciser le motif de cette invitation.
-inviteContactToChat=Inviter un contact à discuter
-join=&Rejoindre
-joinAs=Re&joindre comme
-joinChatRoom=Re&joindre le salon...
-joinChatRoomTitle=Rejoindre le salon
-joinChatRoomName=Prière d'entrer le nom du salon que vous souhaitez rejoindre.
-joinChatRoomWizard=Assistant pour rejoindre un salon
-kick=&Exclure
-kickFailed=Échec de la tentative d'exclusion
-kickFailedGeneralError=Échec de la tentative d''exclusion {0}. Une erreur au niveau du serveur est survenue.
-kickFailedNotAllowed=Échec de la tentative d''exclusion {0}. Le propriétaire et l''administrateur du salon ne peuvent être exclu.
-kickFailedNotEnoughPermissions=Échec de la tentative d''exclusion {0}. Vous n''avez pas assez de privilèges pour cela.
-last=Dernier
-launchBrowserError=Échec de la tentative de démarrage du navigateur web.
-launchOnStartUp=Lancer au démarrage
-leave=&Quitter
-limitReachedForIp=Votre adresse IP est déjà enregistrée de trop nombreuses fois et le serveur {0} ne permet pas d''en avoir plus.
-login=&Identifiant
-loginNotSucceeded=Une erreur est survenue pendant la connexion avec le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1}.
-loginWindowTitle=Connexion à {0}
-logoffNotSucceeded=Une erreur est survenue lors de la déconnexion avec le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1}.
-me=moi
-modify=&Modifier
-moveSubcontactMsg=Sélectionnez un contact où déplacer le contact choisi.
-moveSubcontact=D&éplacer le sous-contact
-moveSubcontactInSameContact=Le contact choisi est le même que celui que vous voulez déplacer.\n Prière de choisir un autre contact !
-moveToGroup=&Déplacer au sein du groupe
-moveContactError=Le &contact ne peut pas être déplacer
-msgDeliveryFailure=Le précédent message ne peut pas être délivré
-msgDeliveryOfflineNotSupported=Le protocole que vous utilisé ne supporte pas l'envoi de messages en mode "déconnecté". Vous pouvez essayer de joindre votre contact au moyen d'un autre protocole ou attendre jusqu'à ce qu'il ou elle soit "connecté(e)".
-msgDeliveryInternalError=Une erreur interne est survenue. Merci de reporter ce problème à l'adresse suivante : http://www.sip-communicator.org/index.php/Development/BugsAndIssues
-msgNotDelivered=Un problème au niveau du réseau est survenue.
-msgReceived={0} vous a envoyé un message
-msgSendConnectionProblem=Vous devez être connecté pour pouvoir envoyer des messages.
-multipleLogins=Vous vous êtes connecté plus d''une fois avec le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1} est actuellement déconnecté.
-name=Nom
-networkFailure=Échec au niveau réseau
-next=&Suivant
-new=&Nouveau
-newAccount=&Nouveau compte
-newMessage=Nouveau message...
-newName=Nouveau nom :
-newStatusMessage=Nouveau message de statut
-no=Non
-noAccountFound=Pour utiliser SIP-Communicator, vous devez au moins configurer un compte. Les pages suivantes vous guiderons pour en configurer un.
-noAvailableRooms=La liste des salons de ce serveur n'est pas accessible pour le moment.
-noMessage=Aucun message
-noMultiChatAccountAvailable=Aucun de vos comptes ne permet l'accès et l'utilisation de salon de discussion. Pour plus d'informations sur les protocoles supportant les salons de discussion, reportez vous à l''adresse suivante : sip-communicator.org.
-nonEmptyChatWindowClose=Vous venez de demander la fermeture d'une fenêtre de discussion avec un message non-envoyé. Étes-vous certain de vouloir fermer cette fenêtre ?
-nonExistingUserId=Le serveur {0} ne supporte pas l''identifiant de compte utilisé.
-notifications=Notifications
-ok=&Ok
-offline=Déconnecté
-olderCalls=Anciens appels
-online=Connecté
-openInBrowser=Ouvrir dans un n&avigateur
-options=Options
-passwd=Mot de passe :
-paste=&Coller
-previous=Précédent
-print=&Imprimer
-proactiveNotification=écrit un message
-protocol=Protocole
-providerNotConnected=Vous devez être connecté pour pouvoir communiquer.
-quit=&Quitter
-ready=Prêt
-reason=Raison
-reconnectionLimitExceeded=Vous vous êtes déconnecté et reconnecté trop rapidement au serveur. Le compte suivant: Nom d''utilisateur : {0}, Nom du serveur : {1} est temporairement banni et va devoir attendre encore un peu avant de réessayer de se reconnecter.
-refresh=Rafraîchir
-registrationTimeout=Expiration de l'enregistrement :
-reject=&Rejeter
-rememberPassword=Mémoriser le mot de passe
-remove=&Supprimer
-removeAccount=&Supprimer le compte
-removeAccountMessage=Êtes-vous certain de vouloir supprimer ce compte ?
-removeContact=&Supprimer le sous-contact
-removeContactText=<DIV>Êtes-vous certain de vouloir supprimer <b> {0} </b><br>de votre liste de contact ?</DIV>
-removeGroup=&Supprimer le groupe
-rename=&Renommer
-renameContact=Re&nommer le contact
-renameContactWizard=Dans le champ suivant, vous pouvez saisir le nom de contact que vous souhaitez utiliser.
-renameGroup=Re&nommer le groupe
-renameGroupInfo=Dans le champ suivant, vous pouvez saisir le nom de groupe que vous souhaitez utiliser.
-request=&Demander
-requestAuthorization=&Demande d'autorisation
-requestAuthorizationInfo=Impossible d''ajouter {0} à votre liste de contacts. {0} doit vous autoriser votre demande pour l''ajouter. Merci d''entrer votre demande ci-dessous.
-requestAuthReason=Raison de la demande
-requestAuthReasonEnter=Entrer la raison de votre demande
-responseAuthReasonEnter=Entrer la raison de votre réponse
-rootGroup=Racine du groupe
-save=&Sauvegarder
-search=&Rechercher
-searchForChatRooms=&Rechercher un salon
-searchForChatRoomsText=Cliquez sur le bouton ci-dessous pour afficher tous les salons existant du serveur sélectionné. Puis, choisissez celui que vous souhaitez rejoindre et cliquez le bouton "rejoindre".
-securityAuthorityRealm=Le serveur {0} a demandé votre autorisation.
-selectAccount=Choix d'un compte
-selectAccountRegistration=Dans la liste ci-dessous, choisissez un assistant de configuration pour créer un nouveau compte.
-selectAccountRegWizardTitle=Choisissez un enregistrement de compte
-selectGroup=Choisissez un groupe
-selectGroupWizard=La liste suivante contient tous les groupes de votre liste de contacts. Choisissez-en un, auquel vous souhaitez ajouter un nouveau contact.
-selectGroupWizardTitle=Spécifiez un groupe
-selectProvidersForChatRoom=La liste suivante contient tous les comptes qui permettent de participer à des salons de discussion. Choisissez celui que vous souhaitez utiliser pour créer un salon.
-selectProvidersWizard=La liste suivante contient tous les comptes enregistrés. Choisissez ceux que vous souhaitez utiliser pour communiquer avec de nouveaux contacts.
-selectProvidersWizardTitle=Choisir un/des compte(s)
-send=&Envoyer
-sendFile=Envoyer un &fichier
-selectContactSupportingInfo=Aucune information n''est disponible pour ce contact.
-sendMessage=&Envoyer un message
-sendAsSms=Envoyer tel un SMS
-sendSms=E&nvoyer un SMS
-sendSmsNotSupported=Le protocole que vous avez sélectionné ne permet pas l'envoi de SMS.
-sendVia=Envoyer via
-setStatusMessage=Définir le statut du message
-settings=&Paramètres
-showCallPanel=Afficher la zone d'appels
-showChannelsList=Afficher la liste des canaux
-showOfflineUsers=Masquer/Afficher les utilisateurs "déconnectés"
-specifyReason=Dans le champ suivant, vous pouvez saisir la raison de cette opération.
-soundOnOff=Activer/Désactiver le son
-statusChangedChatMessage=est devenu {0}
-statusChangeGeneralError=Échec lors du changement de statut pour le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}.
-statusChangeNetworkFailure=Échec lors du changement de statut pour le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}, survenue à cause d''un problème au niveau réseau.
-statusMessageInfo=Dans le champ suivant, vous pouvez saisir le nouveau message que vous souhaitez utiliser.
-subject=Sujet
-summary=Sommaire
-today=Aujourd'hui
-tools=&Outils
-typeYourRequest=Saisissez ici votre demande
-uin=Identificateur:
-unknown=Utilisateur inconnu
-useCtrlEnterToSend=Utilisez Ctrl-&Enter pour envoyer
-msgDeliveryFailedUnknownError=Une erreur inconnue est survenue pendant l'envoi de votre message.
-unregisteredMessage=Impossible de se connecter avec le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}. Vous êtes actuellement "déconnecté".
-updateAutomatically=Installer les mises à jour automatiquement
-updates=Mises à jour
-userInfo=&Informations de l'utilisateur
-view=&Voir
-viewHistory=Voir l'&historique
-warning=Attention
-yes=Oui
-yesterday=Hier
+service.gui.ABOUT=&A propos
+service.gui.ACCEPT=&Accepter
+service.gui.ACCOUNT=compte
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Assistant d'enregistrement de compte
+service.gui.ACCOUNTS=Comptes
+service.gui.ADD=&Ajouter
+service.gui.ADD_CONTACT=&Ajouter un contact
+service.gui.ADD_CONTACT_ERROR=Échec lors de l''ajout du contact : {0}
+service.gui.ADD_CONTACT_ERROR_TITLE=Échec lors de l'ajout d''un contact
+service.gui.ADD_CONTACT_EXIST_ERROR=Le contact {0} existe déjà dans votre liste de contact.
+service.gui.ADD_CONTACT_IDENTIFIER=Dans le champ suivant, veuillez entrer l'identifiant du contact que vous souhaitez ajouter.
+service.gui.ADD_CONTACT_WIZARD=Assistant d'ajout de contact
+service.gui.ADD_GROUP_LOCAL_ERROR=Échec lors de l''ajout du groupe : {0}. Le problème est dû à un échec d''E/S lors d''une opération locale.
+service.gui.ADD_GROUP_NET_ERROR=Échec lors de l''ajout du groupe : {0}. Le problème est dû à un échec du réseau. Prière, de vérifier votre connection au réseau avant de réessayer.
+service.gui.ADD_GROUP_ERROR=Échec lors de l''ajout du groupe : {0}.
+service.gui.ADD_GROUP=Erreur lors de l'ajout de groupe
+service.gui.ADD_GROUP_EXIST_ERROR=Le groupe {0} existe déjà dans votre liste de contact.
+service.gui.ADD_SUBCONTACT=&Ajouter un sous-contact
+service.gui.ALL=&Tous
+service.gui.ALL_CONTACTS=&Tous les contacts
+service.gui.APPLY=&Effectuer
+service.gui.AT=arobase
+service.gui.AUTHORIZATION_ACCEPTED=Le contact a accepté votre requête d'autorisation.
+service.gui.AUTHENTICATION_WINDOW_TITLE=Demande d'authentification
+service.gui.AUTHENTICATION_REJECTED=Le contact a rejeté votre demande d'autorisation.
+service.gui.AUTHORIZATION_REQUESTED=Demande d'autorisation
+service.gui.AUTHORIZATION_REQUESTED_INFO=Le contact {0} demande votre autorisation.
+service.gui.AUTHENTICATION_FAILED=L''authentification a échouée pour le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1}. Le mot de passe que vous avez fourni est incorrect.
+service.gui.AUTHORIZATION_RESPONSE=Réponse de demande d'autorisation
+service.gui.BAN=&Exclure
+service.gui.BAN_FAILED=Échec lors de l'exclusion
+service.gui.BAN_FAILED_GENERAL_ERROR=Erreur lors de l''exclusion {0}. Une erreur au niveau du serveur est survenue.
+service.gui.BAN_FAILED_NOT_ALLOWED=Erreur lors de l''exclusion {0}. Le propriétaire et l''administrateur du salon ne peuvent pas être exclu.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Erreur lors de l''exclusion {0}. Vous n''avez pas les droits suffisant pour cela.
+service.gui.BRB_MESSAGE=Je suis parti, mais je reviens tout de suite.
+service.gui.BUSY_MESSAGE=Désolé, je suis très occupé.
+service.gui.CALL=Appel
+service.gui.CALL_VIA=Appel via:
+service.gui.CANCEL=&Annuler
+service.gui.CHAT_ROOM_ALREADY_JOINED=Vous avez déjà rejoint le salon {0}.
+service.gui.CHAT_ROOM_CONFIGURATION=Configuration du salon {0}
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Échec lors de l''obtention de la configuration du salon {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Échec lors de l''obtention de la configuration du salon {0}. Seuls les administrateurs du salon peuvent voir et modifier la configuration.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Erreur lors de la mise à jour de la configuration du salon {0}.
+service.gui.CHAT_ROOM_USER_JOINED=a rejoint {0}
+service.gui.CHAT_ROOM_USER_LEFT=est parti de {0}
+service.gui.CHAT_ROOM_USER_KICKED=a été banni de {0}
+service.gui.CHAT_ROOM_USER_QUIT=a quitté {0}
+service.gui.CHAT_ROOM_NAME=Nom du salon
+service.gui.CHAT_ROOM_NAME_INFO=Dans le champ suivant, veuillez entrer le nom du salon que vous souhaitez créer.
+service.gui.CHAT_ROOM_NOT_EXIST=Le salon {0} est introuvable sur le serveur {1}. Prière de vérifier la validité du nom que vous avez saisi.
+service.gui.CHAT_ROOM_NOT_CONNECTED=Vous devez vous connecter pour rejoindre le salon {0}.
+service.gui.CHAT_ROOM_NOT_JOINED=Vous devez d'abord rejoindre un salon pour effectuer cette opération.
+service.gui.CHAT_ROOM_OPTIONS=Options du salon
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Vous devez être enregistré avant de pouvoir le rejoindre le salon {0}.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Le salon {0} nécessite un mot de passe.
+service.gui.CHAT_ROOMS=Salons
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} a changé le sujet à {1}
+service.gui.CLOSE=F&ermer
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Vous avez reçu un message il y a moins de 2 secondes. Êtes-vous sûr de vouloir fermer cette conversation ?
+service.gui.OPTIONS=&Configurer
+service.gui.CONNECTION_EXPIRED_MSG=Vous avez été déconnecte du serveur {0}.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Le contact choisit {0} ne supporte pas la téléphonie.
+service.gui.CONTACT_PAUSED_TYPING={0} s''est arrêté d''écrire le message
+service.gui.CONTACT_TYPING={0} est en train d''écrire un message
+service.gui.CONTACT_TYPING_STATE_STALE=L'état de la saisie ne peut pas être mise à jour
+service.gui.CONTACTS=Contacts
+service.gui.COPY=&Copier
+service.gui.COPY_LINK=Copier l'&adresse
+service.gui.CREATE=C&réer
+service.gui.CREATE_CHAT_ROOM=&Créer un salon...
+service.gui.CREATE_CHAT_ROOM_ERROR=Échec lors de la création du salon : {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Assistant de création de salon
+service.gui.CREATE_GROUP=&Créer un groupe
+service.gui.CREATE_GROUP_NAME=Veuiller saisir dans le champ suivant le nom du groupe que vous désirer créer.
+service.gui.CREATE_FIRST_GROUP_WIZARD=Votre liste de contacts ne contient aucun groupe. Prière de créer un groupe (Fichier/Créer groupe) en premier lieu.
+service.gui.CUT=C&ouper
+service.gui.DATE=Date
+service.gui.DIALPAD=Clavier téléphonique
+service.gui.DND_STATUS=Ne pas déranger
+service.gui.DO_NOT_ASK_AGAIN=Ne plus redemander
+service.gui.DO_NOT_SHOW_AGAIN=Ne plus afficher ce message
+service.gui.CONTACT_INFO_NOT_SUPPORTED=Ce contact ne dispose pas d'informations sur le web.
+service.gui.DURATION=Durée
+service.gui.EDIT=&Éditer
+service.gui.EMPTY_HISTORY=&Vider l'historique
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Activer les notifications de &saisie.
+service.gui.ERROR=Erreur
+service.gui.EXIT=Q&uitter
+service.gui.EXTENDED_CRITERIA=Critères étendus
+service.gui.GENERAL=Général
+service.gui.GENERAL_ERROR=Erreur générale
+service.gui.GROUP_NAME=Nom de groupe
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Échec, impossible de rejoindre le salon : {0}.
+service.gui.FFC_STATUS=Disponible pour discuter
+service.gui.FILE=&Fichier
+service.gui.FINISH=&Terminer
+service.gui.FONT=Police
+service.gui.CHAT_ROOM_NOT_CONNECTED=Vous devez être connecté avant de pouvoir rejoindre un salon. Prière de vous connectez avant de réessayer.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Vous devez être connecté pour pouvoir quitter un salon.
+service.gui.HELP=?
+service.gui.HIDE_MAIN_WINDOW=Cliquer sur le bouton X ne quittera pas l'application, mais la masquera seulement. Utilisez "Fichier/Quitter" si vous souhaitez quitter l'application.
+service.gui.HISTORY=&Historique
+service.gui.HISTORY_CONTACT=Historique - {0}
+service.gui.HOUR=Heure
+service.gui.IDENTIFIER=Identifiant
+service.gui.IGNORE=&Ignorer
+service.gui.INSERT_SMILEY=Insérer une émoticône
+service.gui.INVITATION=Motif de l'invitation
+service.gui.INVITATION_RECEIVED=Invitation reçue
+service.gui.INVITATION_RECEIVED_MSG={0} vous a invité à rejoindre le salon {1}. Vous pouvez accepter, rejeter ou ignorer cette invitation.
+service.gui.INVITE=&Inviter
+service.gui.INVITE_CONTACT_MSG=Merci de renseigner le nom de l'utilisateur que vous souhaitez inviter. Si vous le souhaitez, vous pouvez également préciser le motif de cette invitation.
+service.gui.INVITE_CONTACT_TO_CHAT=Inviter un contact à discuter
+service.gui.JOIN=&Rejoindre
+service.gui.JOIN_AS=Re&joindre comme
+service.gui.JOIN_CHAT_ROOM=Re&joindre le salon...
+service.gui.JOIN_CHAT_ROOM_TITLE=Rejoindre le salon
+service.gui.JOIN_CHAT_ROOM_NAME=Prière d'entrer le nom du salon que vous souhaitez rejoindre.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Assistant pour rejoindre un salon
+service.gui.KICK=&Exclure
+service.gui.KICK_FAILED=Échec de la tentative d'exclusion
+service.gui.KICK_FAILED_GENERAL_ERROR==Échec de la tentative d''exclusion {0}. Une erreur au niveau du serveur est survenue.
+service.gui.KICK_FAILED_NOT_ALLOWED=Échec de la tentative d''exclusion {0}. Le propriétaire et l''administrateur du salon ne peuvent être exclu.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Échec de la tentative d''exclusion {0}. Vous n''avez pas assez de privilèges pour cela.
+service.gui.LAST=Dernier
+service.gui.LEAVE=&Quitter
+service.gui.LIMIT_REACHED_FOR_IP=Votre adresse IP est déjà enregistrée de trop nombreuses fois et le serveur {0} ne permet pas d''en avoir plus.
+service.gui.LOGIN=&Identifiant
+service.gui.LOGIN_WINDOW_TITLE=Connexion à {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=Une erreur est survenue lors de la déconnexion avec le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1}.
+service.gui.ME=moi
+service.gui.MODIFY=&Modifier
+service.gui.MOVE_SUBCONTACT_MSG=Sélectionnez un contact où déplacer le contact choisi.
+service.gui.MOVE_SUBCONTACT=D&éplacer le sous-contact
+service.gui.MOVE_SUBCONTACT_FAILED=Le contact choisi est le même que celui que vous voulez déplacer.\n Prière de choisir un autre contact !
+service.gui.MOVE_TO_GROUP=&Déplacer au sein du groupe
+service.gui.MOVE_CONTACT_ERROR=Le &contact ne peut pas être déplacer
+service.gui.MSG_DELIVERY_FAILURE=Le précédent message ne peut pas être délivré
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=Le protocole que vous utilisé ne supporte pas l'envoi de messages en mode "déconnecté". Vous pouvez essayer de joindre votre contact au moyen d'un autre protocole ou attendre jusqu'à ce qu'il ou elle soit "connecté(e)".
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=Une erreur interne est survenue. Merci de reporter ce problème à l'adresse suivante : http://www.sip-communicator.org/index.php/Development/BugsAndIssues
+service.gui.MSG_NOT_DELIVERED=Un problème au niveau du réseau est survenue.
+service.gui.MSG_RECEIVED={0} vous a envoyé un message
+service.gui.MSG_SEND_CONNECTION_PROBLEM=Vous devez être connecté pour pouvoir envoyer des messages.
+service.gui.MULTIPLE_LOGINS=Vous vous êtes connecté plus d''une fois avec le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1} est actuellement déconnecté.
+service.gui.NETWORK_FAILURE=Échec au niveau réseau
+service.gui.NEXT=&Suivant
+service.gui.NEW=&Nouveau
+service.gui.NEW_ACCOUNT=&Nouveau compte
+service.gui.NEW_MESSAGE=Nouveau message...
+service.gui.NEW_NAME=Nouveau nom :
+service.gui.NO=Non
+service.gui.NO_AVAILABLE_ROOMS=La liste des salons de ce serveur n'est pas accessible pour le moment.
+service.gui.NO_MESSAGE=Aucun message
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Aucun de vos comptes ne permet l'accès et l'utilisation de salon de discussion. Pour plus d'informations sur les protocoles supportant les salons de discussion, reportez vous à l''adresse suivante : sip-communicator.org.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Vous venez de demander la fermeture d'une fenêtre de discussion avec un message non-envoyé. Étes-vous certain de vouloir fermer cette fenêtre ?
+service.gui.NON_EXISTING_USER_ID=Le serveur {0} ne supporte pas l''identifiant de compte utilisé.
+service.gui.NOTIFICATIONS=Notifications
+service.gui.OK=&Ok
+service.gui.OFFLINE=Déconnecté
+service.gui.OLDER_CALLS=Anciens appels
+service.gui.ONLINE=Connecté
+service.gui.OPEN_IN_BROWSER=Ouvrir dans un n&avigateur
+service.gui.PASSWORD=Mot de passe :
+service.gui.PASTE=&Coller
+service.gui.PREVIOUS=Précédent
+service.gui.PRINT=&Imprimer
+service.gui.PROTOCOL=Protocole
+service.gui.QUIT=&Quitter
+service.gui.READY=Prêt
+service.gui.REASON=Raison
+service.gui.RECONNECTION_LIMIT_EXCEEDED=Vous vous êtes déconnecté et reconnecté trop rapidement au serveur. Le compte suivant: Nom d''utilisateur : {0}, Nom du serveur : {1} est temporairement banni et va devoir attendre encore un peu avant de réessayer de se reconnecter.
+service.gui.REJECT=&Rejeter
+service.gui.REMEMBER_PASSWORD=Mémoriser le mot de passe
+service.gui.REMOVE=&Supprimer
+service.gui.REMOVE_ACCOUNT=&Supprimer le compte
+service.gui.REMOVE_ACCOUNT_MESSAGE=Êtes-vous certain de vouloir supprimer ce compte ?
+service.gui.REMOVE_CONTACT=&Supprimer le sous-contact
+service.gui.REMOVE_CONTACT_TEXT=<DIV>Êtes-vous certain de vouloir supprimer <b> {0} </b><br>de votre liste de contact ?</DIV>
+service.gui.REMOVE_GROUP=&Supprimer le groupe
+service.gui.RENAME=&Renommer
+service.gui.RENAME_CONTACT=Re&nommer le contact
+service.gui.RENAME_CONTACT_WIZARD=Dans le champ suivant, vous pouvez saisir le nom de contact que vous souhaitez utiliser.
+service.gui.RENAME_GROUP=Re&nommer le groupe
+service.gui.RENAME_GROUP_INFO=Dans le champ suivant, vous pouvez saisir le nom de groupe que vous souhaitez utiliser.
+service.gui.REQUEST=&Demander
+service.gui.REQUEST_AUTHORIZATION=&Demande d'autorisation
+service.gui.REQUEST_AUTHORIZATION_MSG=Impossible d''ajouter {0} à votre liste de contacts. {0} doit vous autoriser votre demande pour l''ajouter. Merci d''entrer votre demande ci-dessous.
+service.gui.ROOT_GROUP=Racine du groupe
+service.gui.SAVE=&Sauvegarder
+service.gui.SEARCH=&Rechercher
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Cliquez sur le bouton ci-dessous pour afficher tous les salons existant du serveur sélectionné. Puis, choisissez celui que vous souhaitez rejoindre et cliquez le bouton "rejoindre".
+service.gui.SECURITY_AUTHORITY_REALM=Le serveur {0} a demandé votre autorisation.
+service.gui.SELECT_ACCOUNT=Choix d'un compte
+service.gui.SELECT_GROUP=Choisissez un groupe
+service.gui.SELECT_GROUP_WIZARD_MSG=La liste suivante contient tous les groupes de votre liste de contacts. Choisissez-en un, auquel vous souhaitez ajouter un nouveau contact.
+service.gui.SELECT_GROUP_WIZARD=Spécifiez un groupe
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=La liste suivante contient tous les comptes qui permettent de participer à des salons de discussion. Choisissez celui que vous souhaitez utiliser pour créer un salon.
+service.gui.SELECT_PROVIDERS_WIZARD_MSG=La liste suivante contient tous les comptes enregistrés. Choisissez ceux que vous souhaitez utiliser pour communiquer avec de nouveaux contacts.
+service.gui.SELECT_PROVIDERS_WIZARD=Choisir un/des compte(s)
+service.gui.SEND=&Envoyer
+service.gui.SEND_FILE=Envoyer un &fichier
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=Aucune information n''est disponible pour ce contact.
+service.gui.SEND_MESSAGE=&Envoyer un message
+service.gui.SEND_AS_SMS=Envoyer tel un SMS
+service.gui.SEND_SMS=E&nvoyer un SMS
+service.gui.SEND_SMS_NOT_SUPPORTED=Le protocole que vous avez sélectionné ne permet pas l'envoi de SMS.
+service.gui.SEND_VIA=Envoyer via
+service.gui.SET_STATUS_MESSAGE=Définir le statut du message
+service.gui.SETTINGS=&Paramètres
+service.gui.SPECIFY_REASON==Dans le champ suivant, vous pouvez saisir la raison de cette opération.
+service.gui.SOUND_ON_OFF=Activer/Désactiver le son
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=est devenu {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Échec lors du changement de statut pour le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Échec lors du changement de statut pour le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}, survenue à cause d''un problème au niveau réseau.
+service.gui.STATUS_MESSAGE_INFO=Dans le champ suivant, vous pouvez saisir le nouveau message que vous souhaitez utiliser.
+service.gui.SUBJECT=Sujet
+service.gui.SUMMARY=Sommaire
+service.gui.TODAY=Aujourd'hui
+service.gui.TOOLS=&Outils
+service.gui.TYPE_YOUR_REQUEST=Saisissez ici votre demande
+service.gui.USER_IDENTIFIER=Identificateur:
+service.gui.UNKNOWN=Utilisateur inconnu
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Une erreur inconnue est survenue pendant l'envoi de votre message.
+service.gui.UNREGISTERED_MESSAGE=Impossible de se connecter avec le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}. Vous êtes actuellement "déconnecté".
+service.gui.VIEW=&Voir
+service.gui.VIEW_HISTORY=Voir l'&historique
+service.gui.WARNING=Attention
+service.gui.YES=Oui
+service.gui.YESTERDAY=Hier
 
-january=Jan
-february=Fev
-march=Mar
-april=Avr
-may=Mai
-june=Juin
-july=Juil
-august=Aoû
-september=Sep
-october=Oct
-november=Nov
-december=Dec
+service.gui.JANUARY=Jan
+service.gui.FEBRUARY=Fev
+service.gui.MARCH=Mar
+service.gui.APRIL=AprAvr
+service.gui.MAY=MayMai
+service.gui.JUNE=JunJuin
+service.gui.JULY=JulJuil
+service.gui.AUGUST=AugAoû
+service.gui.SEPTEMBER=SepSep
+service.gui.OCTOBER=OctOct
+service.gui.NOVEMBER=NovNov
+service.gui.DECEMBER=DecDec
 
 #systray
 # Author: JD
-trayIcon=resources/images/impl/systray/systrayIcon.png
-trayIconWindows=resources/images/impl/systray/systrayIconWindows.png
-trayIconMacOSX=resources/images/impl/systray/systrayIconMacOSX.png
-trayIconMacOSXWhite=resources/images/impl/systray/systrayIconMacOSXWhite.png
-addContactIcon=resources/images/impl/gui/buttons/addContactIcon.png
-statusMenuIcon=resources/images/impl/systray/statusIcon.png
-settingsMenuIcon=resources/images/impl/gui/buttons/configureIcon.png
-closeMenuIcon=resources/images/impl/systray/quit.png
-messageIcon=resources/images/impl/systray/envelope.png
-messageIconWindows=resources/images/impl/systray/envelopeWindows.png
-messageIconMacOSX=resources/images/impl/systray/envelopeMacOSX.png
-messageIconMacOSXWhite=resources/images/impl/systray/envelopeMacOSXWhite.png
-newStatusMessageIcon=resources/images/impl/gui/common/renameDialogIcon.png
-addContact=Ajouter un contact
-setStatus=Status
-close=Fermer
-onlineStatus=Disponible
-offlineStatus=Hors ligne
-messageReceived=Message recu
-failedToLoadAddContactDialog=Impossible de lancer l'assistant d''ajout de contact.
-setStatusMessage=Définir un message de status.
-newStatusMessage=Nouveau message de status.
-statusMessageInfo=Vous pouvez saisir ci-dessous le nouveau message que vous voulez utiliser.
-noMessage=Aucun Message.
-newMessage=Nouveau Message.
-busyMessage=Désolé, je suis occupé pour le moment.
-brbMessage=Je suis absent, je reviens dans un moment.
+impl.systray.SET_STATUS=Status
+impl.systray.ONLINE_STATUS=Disponible
+impl.systray.OFFLINE_STATUS=Hors ligne
+impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=Impossible de lancer l'assistant d''ajout de contact.
 
 # DICT Protocol
-dict.dictionaries=Dictionnaires
-dict.anyDictionary=Tous les dictionnaires
-dict.anyDictionaryFrom=Tous les dictionnaires de {0}
-dict.firstMatch=Premier résultat
-dict.noMatch=Aucun résultat
-dict.matchResult=Aucune définition trouvée pour "{0}", vous souhaitez peut-être dire :\n
-dict.invalidDatabase=Le dictionnaire actuel "{0}" n''existe plus sur le serveur.
-dict.invalidStrategy=La stratégie actuelle n'existe plus sur le serveur.
+service.protocol.DICTIONARIES=Dictionnaires
+plugin.dictaccregwizz.ANY_DICTIONARY=Tous les dictionnaires
+plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Tous les dictionnaires de {0}
+plugin.dictaccregwizz.FIRST_MATCH=Premier résultat
+plugin.dictaccregwizz.NO_MATCH=Aucun résultat
+plugin.dictaccregwizz.MATCH_RESULT=Aucune définition trouvée pour "{0}", vous souhaitez peut-être dire :\n
+plugin.dictaccregwizz.INVALID_DATABASE=Le dictionnaire actuel "{0}" n''existe plus sur le serveur.
+plugin.dictaccregwizz.INVALID_STRATEGY=La stratégie actuelle n'existe plus sur le serveur.
 
 # DICT Protocol Account Wizard
-dict.protocolName=Dict
-dict.protocolDescription=Protocol du service Dict
-dict.host=Hôte
-dict.port=Port
-dict.serverInformations=Informations sur le serveur
-dict.strategy=Stratégie
-dict.strategySelection=Sélection de la stratégie
-dict.strategyList=Liste des stratégies :
-dict.strategyActu=Rechercher les stragéries
-dict.strategyDesc=Les stratégies sont utilisées pour rechercher les mots similaires si aucune définition n'a été trouvée. Il existe différentes approches ; par exemple : la stratégie Prefix recherchera tous les mots qui commencent comme le mot dont vous cherchez la définition.
-dict.accountInfoTitle=Information sur le compte Dict
-dict.firstAccount=Cet assistant va créer votre premier compte Dict sur le serveur dict.org.\n\n\
+plugin.dictaccregwizz.PROTOCOL_NAME=Dict
+plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Protocol du service Dict
+plugin.dictaccregwizz.HOST=Hôte
+plugin.dictaccregwizz.PORT=Port
+plugin.dictaccregwizz.SERVER_INFO=Informations sur le serveur
+plugin.dictaccregwizz.STRATEGY_SELECTION=Sélection de la stratégie
+plugin.dictaccregwizz.STRATEGY_LIST=Liste des stratégies :
+plugin.dictaccregwizz.SEARCH_STRATEGIES=Rechercher les stragéries
+plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Les stratégies sont utilisées pour rechercher les mots similaires si aucune définition n'a été trouvée. Il existe différentes approches ; par exemple : la stratégie Prefix recherchera tous les mots qui commencent comme le mot dont vous cherchez la définition.
+plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Information sur le compte Dict
+plugin.dictaccregwizz.FIRST_ACCOUNT=Cet assistant va créer votre premier compte Dict sur le serveur dict.org.\n\n\
 Vous pouvez ajouter d'autres serveurs de dictionnaires en utilisant à nouveau cet assistant.
-dict.threadConnect=Tentative de connexion au serveur
-dict.threadConnectFailed=La tentative de connexion a échoué. Le serveur est hors ligne ou ce n'est pas un serveur de dictionnaires.
-dict.retrievingStrategies=Récupération des stratégies
-dict.noStrategiesFound=Aucune stratégie n'a été trouvée sur le serveur
-dict.populateList=Mise à jour de la liste
-dict.closingConnexion=Fermeture de la connexion
+plugin.dictaccregwizz.THREAD_CONNECT=Tentative de connexion au serveur
+plugin.dictaccregwizz.THREAD_CONNECT_FAILED=La tentative de connexion a échoué. Le serveur est hors ligne ou ce n'est pas un serveur de dictionnaires.
+plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Récupération des stratégies
+plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Aucune stratégie n'a été trouvée sur le serveur
+plugin.dictaccregwizz.POPULATE_LIST=Mise à jour de la liste
+plugin.dictaccregwizz.CLOSING_CONNECTION=Fermeture de la connexion
 
diff --git a/resources/languages/resources_it.properties b/resources/languages/resources_it.properties
index d1e0873..74f359b 100644
--- a/resources/languages/resources_it.properties
+++ b/resources/languages/resources_it.properties
@@ -25,587 +25,464 @@
 # The same rules apply to the properties files found in the other
 # directories.
 
-about=&About
-accept=&Accetta
-account=Account
-accountRegistrationWizard=Creazione guidata account
-accounts=Accounts
-activateOnlyWhenMinimized=Attiva solo quando minimizzato
-add=&Aggiungi
-addContact=&Aggiungi contatto
-addContactError=Errore durante la creazione del contatto. Codice: {0}
-addContactErrorTitle=Impossibile aggiungere il contatto
-addContactExistError=Il contatto {0} esiste gia`.
-addContactIdentifier=Inserisci l'identificativo del contatto che vuoi aggiugnere nel campo sottostante.
-addContactWizard=Creazione guidata contatto
-addGroupLocalError=Impossibile aggiungere il gruppo {0}. Errore durante operaizone I/O.
-addGroupNetError=Impossibile aggiungere il gruppo {0}. Errore di rete, verificare la connessione e riprovare.
-addGroupError=Impossibile aggiungere il gruppo {0}.
-addGroupErrorTitle=Impossibile creare il gruppo
-addGroupExistError=Il gruppo {0} esiste gia`.
-addSubcontact=&Aggiungi contatto annidato
-all=&Tutti
-allContacts=&Tutti i contatti
-alwaysOnTop=Sempre in primo piano
-appearance=Aspetto
-application=Applicazione
-apply=&Applica
-at=at
-authAccepted=il contatto ha accettato la tua richiesta di autorizzazione.
-authenticationWindowTitle=Richiesta di autorizzazione
-authRejected=il contatto ha rifiutato la tua richiesta di autorizzazione.
-authorizationRequested=Autorizzazione richiesta
-authorizationRequestedInfo=Il contatto {0} richiede la tua autorizzazione.
-authenticationFailed=Autenticazione fallita per il seguente account: Username: {0}, Server: {1}. Password non valida.
-authorizationResponse=Risposta di autorizzazione
-autoPopup=Porta la finestra in primo piano
-awayStatus=Away
-back=&Indietro
-ban=&Bandisci
-banFailed=Impossibile bandire
-banFailedGeneralError=Impossibile bandire {0}. Errore sul server.
-banFailedNotAllowed=Impossibile bandire {0}. Il proprietario e l'amministratore della stanza non possono essere banditi.
-banFailedNotEnoughPermissions=Impossibile bandire {0}. Non hai i privilegi per bandire.
-brbMessage=Sono momentaneamente assente, ma tornero`.
-busyMessage=Scusa, affaccendato
-call=Chiamata
-callVia=Chiama tramite:
-callList=Lista chiamate
-cancel=&Annulla
-chatRoomAlreadyJoined=Utente gia` presente nella stanza {0}.
-chatRoomConfiguration=Configurazione della stanza {0}
-chatRoomOpenConfigFailed=Impossibile ottenere la configurazione per la stanza {0}.
-chatRoomOpenConfigForbidden=Impossibile ottenere la configurazione per la stanza {0}. Solo gli amministratori possono accedere alle configurazioni.
-chatRoomConfigFormSubmitFailed=Impossibile cambiare le configurazioni nella stanza {0}.
-chatRoomUserJoined=entrato nella stanza {0}
-chatRoomUserLeft=uscito dalla stanza {0}
-chatRoomUserKicked=espulso dalla stanza {0}
-chatRoomUserQuit=uscito dalla stanza {0}
-chatRoomName=Nome della stanza
-chatRoomNameInfo=Inserisci il nome della nuova stanza nel campo sottostante.
-chatRoomNotExist=Impossibile trovare la stanza {0} sul server {1}. Verificare che il nome sia corretto.
-chatRoomNotConnected=Effettuare login per entrare nella stanza {0}.
-chatRoomNotJoined=Entrare nella stanza per effettuare ulteriori operazioni.
-chatRoomOptions=Opzioni della stanza
-chatRoomRegistrationRequired=L'accesso alla stanza {0} richiede registrazione
-chatRoomRequiresPassword=La stanza {0} richiede una password.
-chatRooms=Stanze
-chatRoomSubjectChanged={0} ha impostato il titolo a {1}
-close=Chiudi
-closeChatAfterNewMsg=Hai ricevuto un messaggio da meno di 2 secondi. Sei sicuro di volere chiudere?
-conference=Conferenza
-configure=&Configura
-configuration=Configurazione
-connectionFailed=Errore di connessione
-connectionFailedMessage=Impossibile connettere l'account: Username: {0}, Server: {1}.
-connectionExpiredMessage=Sei attualmente disconnesso dal server {0}.
-contactAddress=Contact address
-contactNotSupportingTelephony=Il contatto {0} non ha supporto telefonico.
-contactPausedTyping={0} ha interrotto la digitazione
-contactTyping={0} sta digitando
-contactTypingStateStale=stato di digitazione non aggiornato
-contacts=Contatti
-continue=&Continua
-copy=&Copia
-copyLink=Copia il link
-create=Crea
-createChatRoom=Crea stanza...
-createChatRoomNotSupported=Impossibile creare la stanza {0}. Il server {1} non supporta l'operazione
-createChatRoomError=Impossibile creare la stanza {0}.
-createChatRoomWizard=Creazione guidata stanza
-createGroup=&Crea gruppo
-createGroupName=Inserisci il nome del gruppo nel campo sottostante.
-createFirstGroupWizard=La rubrica non contiene alcun gruppo. Creare prima un gruppo (File/Crea gruppo).
-cut=Taglia
-date=Data
-description=Descrizione
-dial=&Chiama
-dialpad=Tastiera
-dndStatus=Non disturbare
-doNotAskAgain=Non chiedere in futuro
-doNotShowAgain=Non mostrare il messaggio in futuro
-dontSupportWebInfo=Questo contatto non supporta web info
-duration=Durata
-edit=&Modifica
-emptyHistory=&Storia vuota
-enableNotifications=Abilita notifiche
-enableTypingNotifications=Abilita notifiche digitazione
-error=Errore
-exit=Esci
-extendedCriteria=Criteri avanzati
-general=Generale
-generalError=Errore generico
-group=Gruppo
-groupName=Nome gruppo
-failedToCreateChatRoom=Impossibile creare la stanza {0}.
-failedToJoinChatRoom=Impossibile entrare nella stanza {0}.
-ffcStatus=Disponibile
-file=&File
-findChatRoomError=Impossibile trovare la stanza {0}.
-finish=&Termina
-first=Primo
-font=Font
-haveToBeConnectedToJoin=Impossibile entrare nella stanza senza essere connesso. Esegui la connessione e riprova.
-haveToBeConnectedToLeave=Impossibile uscire dalla stanza senza essere connesso.
-help=?
-hideCallPanel=&Nascondi pannello chiamata
-hideMainWindow=La pressione del bottone X non chiude l'applicazione, ma la nasconde solamente. Se vuoi chiudere l'applicazione seleziona File/Esci.
-history=&Storia
-historyContact=Storia - {0}
-hour=Ora
-identifier=Identificativo
-ignore=&Ignora
-insertSmiley=Inserisci smiley
-invalidCall=Chiamata non valida
-invitation=Testo per l'invito
-invitationReceived=Invito ricevuto
-invitationReceivedFormInfo={0} ti ha invitato ad entrare nella stanza {1}.  Puoi accettare, rifiutare o ignorare tale invito.
-invite=&Invita
-inviteContactFormInfo=Inserisci il nome dell'utente che vuoi invitare. Puoi anche aggiungere una motivazione a questo invito.
-inviteContactToChat=Invita il contatto in chat
-join=&Entra
-joinAs=Entra come
-joinChatRoom=Entra in una stanza...
-joinChatRoomTitle=Entra in una stanza
-joinChatRoomName=Inserisci il nome della stanza in cui vuoi entrare.
-joinChatRoomWizard=Entrata guidata in una stanza
-kick=&Espelli
-kickFailed=Espulsione fallita
-kickFailedGeneralError=Impossibile espellere {0}. Errore sul server.
-kickFailedNotAllowed=Impossibile espellere {0}. Il proprietario e l'amministratore della stanza non possono essere espulsi.
-kickFailedNotEnoughPermissions=Impossibile espellere {0}. Non hai i privilegi per espellere.
-last=Ultimo
-launchBrowserError=Impossibile lanciare il browser web.
-launchOnStartUp=Lancia all'avvio
-leave=&Esci
-limitReachedForIp=Limite registrazioni per il tuo indirizzo IP raggiunto sul server.
-login=&Login
-loginNotSucceeded=Impossibile effettuare login per il seguente account: Username: {0}, Server: {1}.
-loginWindowTitle=Login {0}
-logoffNotSucceeded=Impossibile effettuare logout per il seguente account: Username: {0}, Server: {1}.
-me=me
-modify=&Modifica
-moveSubcontactMsg=Seleziona il contatto destinazione.
-moveSubcontact=Sposta contatto annidato
-moveSubcontactInSameContact=Il contatto selezionato concide con quello da spostare. Seleziona un altro contatto.
-moveToGroup=&Sposta nel gruppo
-msgDeliveryFailure=Impossibile consegnare il messaggio
-msgDeliveryOfflineNotSupported=Il protocollo che stai utilizzando non supporta i messaggi offline. Puoi raggiungere questo contatto attraverso un altro account o quando verra` raggiungibile.
-msgDeliveryInternalError=Errore irrimediabile. Questo e` quasi sicuramente un bug, che puoi riportare a: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
-msgNotDelivered=Errore di rete.
-msgReceived=Messaggio ricevuto da {0}
-msgSendConnectionProblem=Effettuare la connessione prima di inviare messaggi.
-multipleLogins=Impossibile effettuare login multipli dal seguente account: Username: {0}, Server: {1}.
-name=Nome
-networkFailure=Errore di rete
-next=&Successivo
-new=&Nuovo
-newAccount=&Nuovo acccount
-newMessage=Nuovo messaggio...
-newName=Nuovo nome:
-newStatusMessage=Nuovo messaggio di stato
-no=No
-noAccountFound=Per utilizzare SIP-Communicator e` necessario avere almeno un account registrato. Le pagine seguenti ti guideranno attraverso il processo di creazione di un account.
-noAvailableRooms=La lista di stanze per questo server non e` attualmente disponibile.
-noMessage=Nessun messaggio
-noMultiChatAccountAvailable=Nessun account supporta chat multiutente. Cerca su sip-communicator.org ulteriori informazioni sui protocolli supportati.
-nonEmptyChatWindowClose=Stai per chiudere una chat con un messaggio non inviato. Sei sicuro di volere chiudere?
-nonExistingUserId=Il server {0} non riconosce l'identificativo specificato.
-notifications=Notifiche
-ok=&Ok
-offline=Offline
-olderCalls=Chiamate precedenti
-online=Online
-openInBrowser=Apri in un web browser
-options=Opzioni
-passwd=Password:
-paste=&Incolla
-previous=Precedente
-print=&Stampa
-protocol=Protocollo
-providerNotConnected=E` necessario effettuare la connessione per potere comunicare.
-quit=&Esci
-ready=Pronto
-reason=Motivo
-reconnectionLimitExceeded=Ti sei disconnesso e riconnesso al server troppo velocemente. L'account: Username: {0}, Server: {1} e` stato disconnesso e temporaneamente bandito.
-refresh=Aggiorna
-registrationTimeout=Registrazione scaduta:
-reject=&Rifiuta
-rememberPassword=Ricorda password
-remove=&Rimuovi
-removeAccount=&Rimuovi account
-removeAccountMessage=Sei sicuro di volere rimuovere l'account?
-removeContact=&Rimuovi contatto annidato
-removeGroup=&Rimuovi gruppo
-rename=&Rinomina
-renameContact=Rinomina contatto
-renameContactWizard=Inserire il nome da utilizzare per il contatto nel campo sottostante.
-renameGroup=Rinomina gruppo
-renameGroupInfo=Inserire il nome da utilizzare per il gruppo nel campo sottostante.
-request=&Richiesta
-requestAuthorization=&Richiesta di autorizzazione
-requestAuthorizationInfo=Impossibile inserire {0} in rubrica senza autorizzazione. Inserisci un messaggio di richiesta nel campo sottostante.
-requestAuthReason=Motivo della richiesta
-requestAuthReasonEnter=Inserisci il motivo della richiesta
-responseAuthReasonEnter=Inserisci il motivo della risposta
-rootGroup=Gruppo root
-save=&Salva
-search=&Cerca
-searchForChatRooms=&Cerca stanze
-searchForChatRoomsText=Clicca il bottone sottostante per mostrare tutte le stanze disponibili nel server selezionato. Seleziona la stanza in cui intendi entrare e premi il bottone entra.
-securityAuthorityRealm=Il server {0} ha richiesto l'autenticazione.
-selectAccount=Seleziona account
-selectAccountRegistration=Seleziona la creazione guidata da utilizzare per creare il nuovo account.
-selectAccountRegWizardTitle=Seleziona una registrazione account
-selectGroup=Seleziona un gruppo
-selectGroupWizard=La lista sottostante contiene tutti i gruppi presenti nella tua rubrica. Seleziona quello in cui vuoi inserire il nuovo contatto.
-selectGroupWizardTitle=Specifica un gruppo
-selectProvidersForChatRoom=La lista sottostante contiene tutti gli account che supportano chat multiutente. Seleziona quella che vuoi utilizzare per creare la nuova stanza.
-selectProvidersWizard=La lista sottostante contiene tutti gli account registrati. Seleziona quelli che vuoi utilizzare per comunicare con il nuovo contatto.
-selectProvidersWizardTitle=Seleziona account
-send=&Invia
-sendFile=Invia file
-selectContactSupportingInfo=Nessuna informazione disponibile per questo contatto.
-sendMessage=&Invia un messaggio
-sendVia=Invia tramite
-setStatusMessage=Imposta messaggio di stato
-settings=&Configurazioni
-showCallPanel=Mostra pannello chiamata
-showChannelsList=Mostra lista canali
-showOfflineUsers=Nascondi/Mostra utenti offline
-sipCommunicator=SIPCommunicator
-specifyReason=Inserire la motivazione di questa operazione nel campo sottostante.
-soundOnOff=Attiva/disattiva suono
-statusChangedChatMessage=e` diventato {0}
-statusChangeGeneralError=Impossibile cambiare lo stato per l'account: Username: {0}, Server: {1}. Errore sconosciuto.
-statusChangeNetworkFailure=Impossibile cambiare lo stato per l'account: Username: {0}, Server: {1}. Errore di rete.
-statusMessageInfo=Inserire il nuovo messaggo nel campo sottostante.
-subject=Oggetto
-summary=Sommario
-today=Oggi
-tools=&Strumenti
-typeYourRequest=Inserisci la richiesta qui
-uin=User identifier:
-unknown=Utente sconosciuto
-useCtrlEnterToSend=Premi Ctrl-&Enter per inviare
-msgDeliveryFailedUnknownError=Impossibile consegnare il messaggio. Errore sconosciuto.
-unregisteredMessage=Impossibile connettere il seguente account: Username: {0}, Server: {1}. Sei attualmente offline.
-updateAutomatically=Installa aggiornamenti automaticamente
-updates=Aggiornamenti
-userInfo=&Informazioni utente
-view=&Visualizza
-viewHistory=Visualizza &storia
-warning=Attenzione
-yes=Si`
-yesterday=Ieri
+service.gui.ABOUT=&About
+service.gui.ACCEPT=&Accetta
+service.gui.ACCOUNT=Account
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Creazione guidata account
+service.gui.ACCOUNTS=Accounts
+service.gui.ADD=&Aggiungi
+service.gui.ADD_CONTACT=&Aggiungi contatto
+service.gui.ADD_CONTACT_ERROR=Errore durante la creazione del contatto. Codice: {0}
+service.gui.ADD_CONTACT_ERROR_TITLE=Impossibile aggiungere il contatto
+service.gui.ADD_CONTACT_EXIST_ERROR=Il contatto {0} esiste gia`.
+service.gui.ADD_CONTACT_IDENTIFIER=Inserisci l'identificativo del contatto che vuoi aggiugnere nel campo sottostante.
+service.gui.ADD_CONTACT_WIZARD=Creazione guidata contatto
+service.gui.ADD_GROUP_LOCAL_ERROR=Impossibile aggiungere il gruppo {0}. Errore durante operaizone I/O.
+service.gui.ADD_GROUP_NET_ERROR=Impossibile aggiungere il gruppo {0}. Errore di rete, verificare la connessione e riprovare.
+service.gui.ADD_GROUP_ERROR=Impossibile aggiungere il gruppo {0}.
+service.gui.ADD_GROUP=Impossibile creare il gruppo
+service.gui.ADD_GROUP_EXIST_ERROR=Il gruppo {0} esiste gia`.
+service.gui.ADD_SUBCONTACT=&Aggiungi contatto annidato
+service.gui.ALL=&Tutti
+service.gui.ALL_CONTACTS=&Tutti i contatti
+service.gui.APPLY=&Applica
+service.gui.AT=at
+service.gui.AUTHORIZATION_ACCEPTED=il contatto ha accettato la tua richiesta di autorizzazione.
+service.gui.AUTHENTICATION_WINDOW_TITLE=Richiesta di autorizzazione
+service.gui.AUTHENTICATION_REJECTED=il contatto ha rifiutato la tua richiesta di autorizzazione.
+service.gui.AUTHORIZATION_REQUESTED=Autorizzazione richiesta
+service.gui.AUTHORIZATION_REQUESTED_INFO=Il contatto {0} richiede la tua autorizzazione.
+service.gui.AUTHENTICATION_FAILED=Autenticazione fallita per il seguente account: Username: {0}, Server: {1}. Password non valida.
+service.gui.AUTHORIZATION_RESPONSE=Risposta di autorizzazione
+service.gui.BAN=&Bandisci
+service.gui.BAN_FAILED=Impossibile bandire
+service.gui.BAN_FAILED_GENERAL_ERROR=Impossibile bandire {0}. Errore sul server.
+service.gui.BAN_FAILED_NOT_ALLOWED=Impossibile bandire {0}. Il proprietario e l'amministratore della stanza non possono essere banditi.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Impossibile bandire {0}. Non hai i privilegi per bandire.
+service.gui.BRB_MESSAGE=Sono momentaneamente assente, ma tornero`.
+service.gui.BUSY_MESSAGE=Scusa, affaccendato
+service.gui.CALL=Chiamata
+service.gui.CALL_VIA=Chiama tramite:
+service.gui.CANCEL=&Annulla
+service.gui.CHAT_ROOM_ALREADY_JOINED=Utente gia` presente nella stanza {0}.
+service.gui.CHAT_ROOM_CONFIGURATION=Configurazione della stanza {0}
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Impossibile ottenere la configurazione per la stanza {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Impossibile ottenere la configurazione per la stanza {0}. Solo gli amministratori possono accedere alle configurazioni.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Impossibile cambiare le configurazioni nella stanza {0}.
+service.gui.CHAT_ROOM_USER_JOINED=entrato nella stanza {0}
+service.gui.CHAT_ROOM_USER_LEFT=uscito dalla stanza {0}
+service.gui.CHAT_ROOM_USER_KICKED=espulso dalla stanza {0}
+service.gui.CHAT_ROOM_USER_QUIT=uscito dalla stanza {0}
+service.gui.CHAT_ROOM_NAME=Nome della stanza
+service.gui.CHAT_ROOM_NAME_INFO=Inserisci il nome della nuova stanza nel campo sottostante.
+service.gui.CHAT_ROOM_NOT_EXIST=Impossibile trovare la stanza {0} sul server {1}. Verificare che il nome sia corretto.
+service.gui.CHAT_ROOM_NOT_CONNECTED=Effettuare login per entrare nella stanza {0}.
+service.gui.CHAT_ROOM_NOT_JOINED=Entrare nella stanza per effettuare ulteriori operazioni.
+service.gui.CHAT_ROOM_OPTIONS=Opzioni della stanza
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=L'accesso alla stanza {0} richiede registrazione
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=La stanza {0} richiede una password.
+service.gui.CHAT_ROOMS=Stanze
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} ha impostato il titolo a {1}
+service.gui.CLOSE=Chiudi
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Hai ricevuto un messaggio da meno di 2 secondi. Sei sicuro di volere chiudere?
+service.gui.OPTIONS=&Configura
+service.gui.CONNECTION_EXPIRED_MSG=Sei attualmente disconnesso dal server {0}.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Il contatto {0} non ha supporto telefonico.
+service.gui.CONTACT_PAUSED_TYPING={0} ha interrotto la digitazione
+service.gui.CONTACT_TYPING={0} sta digitando
+service.gui.CONTACT_TYPING_STATE_STALE=stato di digitazione non aggiornato
+service.gui.CONTACTS=Contatti
+service.gui.COPY=&Copia
+service.gui.COPY_LINK=Copia il link
+service.gui.CREATE=Crea
+service.gui.CREATE_CHAT_ROOM=Crea stanza...
+service.gui.CREATE_CHAT_ROOM_ERROR=Impossibile creare la stanza {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Creazione guidata stanza
+service.gui.CREATE_GROUP=&Crea gruppo
+service.gui.CREATE_GROUP_NAME=Inserisci il nome del gruppo nel campo sottostante.
+service.gui.CREATE_FIRST_GROUP_WIZARD=La rubrica non contiene alcun gruppo. Creare prima un gruppo (File/Crea gruppo).
+service.gui.CUT=Taglia
+service.gui.DATE=Data
+service.gui.DIALPAD=Tastiera
+service.gui.DND_STATUS=Non disturbare
+service.gui.DO_NOT_ASK_AGAIN=Non chiedere in futuro
+service.gui.DO_NOT_SHOW_AGAIN=Non mostrare il messaggio in futuro
+service.gui.CONTACT_INFO_NOT_SUPPORTED=Questo contatto non supporta web info
+service.gui.DURATION=Durata
+service.gui.EDIT=&Modifica
+service.gui.EMPTY_HISTORY=&Storia vuota
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Abilita notifiche digitazione
+service.gui.ERROR=Errore
+service.gui.EXIT=Esci
+service.gui.EXTENDED_CRITERIA=Criteri avanzati
+service.gui.GENERAL=Generale
+service.gui.GENERAL_ERROR=Errore generico
+service.gui.GROUP_NAME=Nome gruppo
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Impossibile entrare nella stanza {0}.
+service.gui.FFC_STATUS=Disponibile
+service.gui.FILE=&File
+service.gui.FINISH=&Termina
+service.gui.FONT=Font
+service.gui.CHAT_ROOM_NOT_CONNECTED=Impossibile entrare nella stanza senza essere connesso. Esegui la connessione e riprova.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Impossibile uscire dalla stanza senza essere connesso.
+service.gui.HELP=?
+service.gui.HIDE_MAIN_WINDOW=La pressione del bottone X non chiude l'applicazione, ma la nasconde solamente. Se vuoi chiudere l'applicazione seleziona File/Esci.
+service.gui.HISTORY=&Storia
+service.gui.HISTORY_CONTACT=Storia - {0}
+service.gui.HOUR=Ora
+service.gui.IDENTIFIER=Identificativo
+service.gui.IGNORE=&Ignora
+service.gui.INSERT_SMILEY=Inserisci smiley
+service.gui.INVITATION=Testo per l'invito
+service.gui.INVITATION_RECEIVED=Invito ricevuto
+service.gui.INVITATION_RECEIVED_MSG={0} ti ha invitato ad entrare nella stanza {1}.  Puoi accettare, rifiutare o ignorare tale invito.
+service.gui.INVITE=&Invita
+service.gui.INVITE_CONTACT_MSG=Inserisci il nome dell'utente che vuoi invitare. Puoi anche aggiungere una motivazione a questo invito.
+service.gui.INVITE_CONTACT_TO_CHAT=Invita il contatto in chat
+service.gui.JOIN=&Entra
+service.gui.JOIN_AS=Entra come
+service.gui.JOIN_CHAT_ROOM=Entra in una stanza...
+service.gui.JOIN_CHAT_ROOM_TITLE=Entra in una stanza
+service.gui.JOIN_CHAT_ROOM_NAME=Inserisci il nome della stanza in cui vuoi entrare.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Entrata guidata in una stanza
+service.gui.KICK=&Espelli
+service.gui.KICK_FAILED=Espulsione fallita
+service.gui.KICK_FAILED_GENERAL_ERROR==Impossibile espellere {0}. Errore sul server.
+service.gui.KICK_FAILED_NOT_ALLOWED=Impossibile espellere {0}. Il proprietario e l'amministratore della stanza non possono essere espulsi.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Impossibile espellere {0}. Non hai i privilegi per espellere.
+service.gui.LAST=Ultimo
+service.gui.LEAVE=&Esci
+service.gui.LIMIT_REACHED_FOR_IP=Limite registrazioni per il tuo indirizzo IP raggiunto sul server.
+service.gui.LOGIN=&Login
+service.gui.LOGIN_WINDOW_TITLE=Login {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=Impossibile effettuare logout per il seguente account: Username: {0}, Server: {1}.
+service.gui.ME=me
+service.gui.MODIFY=&Modifica
+service.gui.MOVE_SUBCONTACT_MSG=Seleziona il contatto destinazione.
+service.gui.MOVE_SUBCONTACT=Sposta contatto annidato
+service.gui.MOVE_SUBCONTACT_FAILED=Il contatto selezionato concide con quello da spostare. Seleziona un altro contatto.
+service.gui.MOVE_TO_GROUP=&Sposta nel gruppo
+service.gui.MSG_DELIVERY_FAILURE=Impossibile consegnare il messaggio
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=Il protocollo che stai utilizzando non supporta i messaggi offline. Puoi raggiungere questo contatto attraverso un altro account o quando verra` raggiungibile.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=Errore irrimediabile. Questo e` quasi sicuramente un bug, che puoi riportare a: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
+service.gui.MSG_NOT_DELIVERED=Errore di rete.
+service.gui.MSG_RECEIVED=Messaggio ricevuto da {0}
+service.gui.MSG_SEND_CONNECTION_PROBLEM=Effettuare la connessione prima di inviare messaggi.
+service.gui.MULTIPLE_LOGINS=Impossibile effettuare login multipli dal seguente account: Username: {0}, Server: {1}.
+service.gui.NETWORK_FAILURE=Errore di rete
+service.gui.NEXT=&Successivo
+service.gui.NEW=&Nuovo
+service.gui.NEW_ACCOUNT=&Nuovo acccount
+service.gui.NEW_MESSAGE=Nuovo messaggio...
+service.gui.NEW_NAME=Nuovo nome:
+service.gui.NO=No
+service.gui.NO_AVAILABLE_ROOMS=La lista di stanze per questo server non e` attualmente disponibile.
+service.gui.NO_MESSAGE=Nessun messaggio
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Nessun account supporta chat multiutente. Cerca su sip-communicator.org ulteriori informazioni sui protocolli supportati.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Stai per chiudere una chat con un messaggio non inviato. Sei sicuro di volere chiudere?
+service.gui.NON_EXISTING_USER_ID=Il server {0} non riconosce l'identificativo specificato.
+service.gui.NOTIFICATIONS=Notifiche
+service.gui.OK=&Ok
+service.gui.OFFLINE=Offline
+service.gui.OLDER_CALLS=Chiamate precedenti
+service.gui.ONLINE=Online
+service.gui.OPEN_IN_BROWSER=Apri in un web browser
+service.gui.PASSWORD=Password:
+service.gui.PASTE=&Incolla
+service.gui.PREVIOUS=Precedente
+service.gui.PRINT=&Stampa
+service.gui.PROTOCOL=Protocollo
+service.gui.QUIT=&Esci
+service.gui.READY=Pronto
+service.gui.REASON=Motivo
+service.gui.RECONNECTION_LIMIT_EXCEEDED=Ti sei disconnesso e riconnesso al server troppo velocemente. L'account: Username: {0}, Server: {1} e` stato disconnesso e temporaneamente bandito.
+service.gui.REJECT=&Rifiuta
+service.gui.REMEMBER_PASSWORD=Ricorda password
+service.gui.REMOVE=&Rimuovi
+service.gui.REMOVE_ACCOUNT=&Rimuovi account
+service.gui.REMOVE_ACCOUNT_MESSAGE=Sei sicuro di volere rimuovere l'account?
+service.gui.REMOVE_CONTACT=&Rimuovi contatto annidato
+service.gui.REMOVE_GROUP=&Rimuovi gruppo
+service.gui.RENAME=&Rinomina
+service.gui.RENAME_CONTACT=Rinomina contatto
+service.gui.RENAME_CONTACT_WIZARD=Inserire il nome da utilizzare per il contatto nel campo sottostante.
+service.gui.RENAME_GROUP=Rinomina gruppo
+service.gui.RENAME_GROUP_INFO=Inserire il nome da utilizzare per il gruppo nel campo sottostante.
+service.gui.REQUEST=&Richiesta
+service.gui.REQUEST_AUTHORIZATION=&Richiesta di autorizzazione
+service.gui.REQUEST_AUTHORIZATION_MSG=Impossibile inserire {0} in rubrica senza autorizzazione. Inserisci un messaggio di richiesta nel campo sottostante.
+service.gui.ROOT_GROUP=Gruppo root
+service.gui.SAVE=&Salva
+service.gui.SEARCH=&Cerca
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Clicca il bottone sottostante per mostrare tutte le stanze disponibili nel server selezionato. Seleziona la stanza in cui intendi entrare e premi il bottone entra.
+service.gui.SECURITY_AUTHORITY_REALM=Il server {0} ha richiesto l'autenticazione.
+service.gui.SELECT_ACCOUNT=Seleziona account
+service.gui.SELECT_GROUP=Seleziona un gruppo
+service.gui.SELECT_GROUP_WIZARD_MSG=La lista sottostante contiene tutti i gruppi presenti nella tua rubrica. Seleziona quello in cui vuoi inserire il nuovo contatto.
+service.gui.SELECT_GROUP_WIZARD=Specifica un gruppo
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=La lista sottostante contiene tutti gli account che supportano chat multiutente. Seleziona quella che vuoi utilizzare per creare la nuova stanza.
+service.gui.SELECT_PROVIDERS_WIZARD_MSG=La lista sottostante contiene tutti gli account registrati. Seleziona quelli che vuoi utilizzare per comunicare con il nuovo contatto.
+service.gui.SELECT_PROVIDERS_WIZARD=Seleziona account
+service.gui.SEND=&Invia
+service.gui.SEND_FILE=Invia file
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=Nessuna informazione disponibile per questo contatto.
+service.gui.SEND_MESSAGE=&Invia un messaggio
+service.gui.SEND_VIA=Invia tramite
+service.gui.SET_STATUS_MESSAGE=Imposta messaggio di stato
+service.gui.SETTINGS=&Configurazioni
+service.gui.SPECIFY_REASON==Inserire la motivazione di questa operazione nel campo sottostante.
+service.gui.SOUND_ON_OFF=Attiva/disattiva suono
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=e` diventato {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Impossibile cambiare lo stato per l'account: Username: {0}, Server: {1}. Errore sconosciuto.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Impossibile cambiare lo stato per l'account: Username: {0}, Server: {1}. Errore di rete.
+service.gui.STATUS_MESSAGE_INFO=Inserire il nuovo messaggo nel campo sottostante.
+service.gui.SUBJECT=Oggetto
+service.gui.SUMMARY=Sommario
+service.gui.TODAY=Oggi
+service.gui.TOOLS=&Strumenti
+service.gui.TYPE_YOUR_REQUEST=Inserisci la richiesta qui
+service.gui.USER_IDENTIFIER=User identifier:
+service.gui.UNKNOWN=Utente sconosciuto
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Impossibile consegnare il messaggio. Errore sconosciuto.
+service.gui.UNREGISTERED_MESSAGE=Impossibile connettere il seguente account: Username: {0}, Server: {1}. Sei attualmente offline.
+service.gui.VIEW=&Visualizza
+service.gui.VIEW_HISTORY=Visualizza &storia
+service.gui.WARNING=Attenzione
+service.gui.YES=Si`
+service.gui.YESTERDAY=Ieri
 
-january=Gen
-february=Feb
-march=Mar
-april=Apr
-may=Mag
-june=Giu
-july=Lug
-august=Ago
-september=Set
-october=Ott
-november=Nov
-december=Dic
+service.gui.JANUARY=Gen
+service.gui.FEBRUARY=Feb
+service.gui.MARCH=Mar
+service.gui.APRIL=AprApr
+service.gui.MAY=MayMag
+service.gui.JUNE=JunGiu
+service.gui.JULY=JulLug
+service.gui.AUGUST=AugAgo
+service.gui.SEPTEMBER=SepSet
+service.gui.OCTOBER=OctOtt
+service.gui.NOVEMBER=NovNov
+service.gui.DECEMBER=DecDic
 
-# account info
-accountInfo=informazione account utente 
-title=informazione account
-apply=applica
-browse=scorri
-selectAccount=scegli account
-summaryDesc=sommarion dell'informazione account per
-extended=estesa
-extendedDesc=informazione account estesa per
-notSupported=informazione account non disponibile
-clickWeb=clicca per informazione web
-webInfo=informazione Web
-firstNameNS=nome
-middleNameNS=secondo nome
-lastNameNS=cognome
-ageNS=eta'
-bdayNS=data di nascita
-genderNS=sesso
-emailNS=E-mail
-phoneNS=telefono
-userPictures=foto utente
-change=cambiamento
-onlyMessages=solo messaggi
+# account info 
+plugin.accountinfo.TITLE==informazione account
+plugin.accountinfo.BROWSE=scorri
+plugin.accountinfo.EXTENDED=estesa
+plugin.accountinfo.NOT_SUPPORTED=informazione account non disponibile
+plugin.accountinfo.FIRST_NAME=nome
+plugin.accountinfo.MIDDLE_NAME=secondo nome
+plugin.accountinfo.LAST_NAME=cognome
+plugin.accountinfo.AGE=eta'
+plugin.accountinfo.BDAY=data di nascita
+plugin.accountinfo.GENDER=sesso
+plugin.accountinfo.EMAIL=E-mail
+plugin.accountinfo.PHONE=telefono
+plugin.accountinfo.USER_PICTURES=foto utente
+plugin.accountinfo.CHANGE=cambiamento
+plugin.accountinfo.ONLY_MESSAGE=solo messaggi
 
 # aim accregwizz
-protocolName=servizio messaggi istantanei (AIM)
-protocolDescription=descrizione di protocollo per il servizio AIM
-id=nome schermo AIM
-password=password
-aimUinAndPassword=UIN e password
-registerNewAccount=registra nuovo account
-registerNewAccountText=se non hai un account AIM, premi questo tasto per crearne uno nuovo
+plugin.aimaccregwizz.PROTOCOL_NAME=servizio messaggi istantanei (AIM)
+plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=descrizione di protocollo per il servizio AIM
+plugin.aimaccregwizz.USERNAME=nome schermo AIM
+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=UIN e password
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=registra nuovo account
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=se non hai un account AIM, premi questo tasto per crearne uno nuovo
 existingAccount=l'account immesso e' gia' stato installato
-ovverideServerOps=disimpegna i default del server
-advancedOptions=opzioni avanzate
-proxy=proxy
-proxyPort=porta proxy
-proxyType=tipo di proxy
-proxyUsername=nome utente proxy
-proxyPassword=password proxy
+plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=disimpegna i default del server
+plugin.aimaccregwizz.ADVANCED_OPTIONS=opzioni avanzate
+plugin.aimaccregwizz.PROXY=proxy
+plugin.aimaccregwizz.PROXY_PORT=porta proxy
+plugin.aimaccregwizz.PROXY_TYPE=tipo di proxy
+plugin.aimaccregwizz.PROXY_USERNAME=nome utente proxy
+plugin.aimaccregwizz.PROXY_PASSWORD=password proxy
 
 # branding
-aboutWindowTitle=titolo di finestra su
-logoMessage=messaggio pubblicitario
-loading=caricando
-aboutMenuEntry=su l'entrata al Menu
-ok=OK
-basedOn=basato su
-welcomeMessage=messaggio di benvenuto
-copyright=diritto d'autore
-license=licenza
+plugin.branding.ABOUT_WINDOW_TITLE=titolo di finestra su
+plugin.branding.LOGO_MESSAGE=messaggio pubblicitario
+plugin.branding.LOADING=caricando
+plugin.branding.ABOUT_MENU_ENTRY=su l'entrata al Menu
+plugin.branding.WELCOME_MESSAGE=messaggio di benvenuto
+plugin.branding.COPYRIGHT=diritto d'autore
+plugin.branding.LICENSE=licenza
 
 # contactinfo
-contactDetails=informazione per il contatto
-selectUser=Seleziona un'utente
-contactSummaryDesc=sommario dell'informazione per il contatto
-contactExtendedDesc=informazione per il contatto estesa
-contactInfoNotSupported=questo protocollo non sostiene informazioni memorizzate sul server per adesso. prova uno degli altri protocolli
-notSpecified=non specificato
+plugin.contactinfo.TITLE=informazione per il contatto
+plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=sommario dell'informazione per il contatto
+plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=informazione per il contatto estesa
+plugin.contactinfo.NOT_SPECIFIED=non specificato
 
 # extended callhistory search
-advancedCallHistorySearch=controllo numero di chiamate avanzato
-search=ricerca
-contactName=nome di contatto
-since=da quando
-until=fino a quando
-callType=tipo di chiamata
-incoming=in arrivo 
-outgoing=in uscita
-olderCalls=chiamate precedenti
-duration=durata
-at=a
-all=tutto
-today=oggi
-january=gennaio
-february=febbraio
-march=marzo
-april=aprile
-may=maggio
-june=giugno
-july=luglio
-august=agosto
-september=settembre
-october=ottobre
-november=novembre
-december=dicembre
+plugin.callhistoryform.TITLE=controllo numero di chiamate avanzato
+plugin.callhistoryform.CONTACT_NAME=nome di contatto
+plugin.callhistoryform.SINCE=da quando
+plugin.callhistoryform.UNTIL=fino a quando
+plugin.callhistoryform.CALLTYPE=tipo di chiamata
+plugin.callhistoryform.INCOMING=in arrivo 
+plugin.callhistoryform.OUTGOING=in uscita
 
 # gibberish accregwiz
-protocolName=risultati incomprensibili
-protocolDescription=protocollo d'esame per SIP Communicator
-userID=identita' dell'utente
-password=Password
-userAndPassword=Identificazione
+plugin.gibberishaccregwizz.PROTOCOL_NAME=risultati incomprensibili
+plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=protocollo d'esame per SIP Communicator
+plugin.gibberishaccregwizz.USERNAME=identita' dell'utente
+plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=Identificazione
 
 #icq accregwizz
-protocolName=servizio ICQ
-protocolDescription=servizio ICQ di AOL
-uin=ICQ UIN:
-password=Password
-uinAndPassword=UIN e Password
-registerNewAccount=Registra nuovo account
-registerNewAccountText=se non avete un'account ICQ, premete questo tasto per crearne uno nuovo
-ovverideServerOps=disimpegna opzioni di default per il server
-proxy=Proxy
-proxyPort= porta Proxy
-proxyType= tipo di Proxy
-proxyUsername= nome utente Proxy
-proxyPassword= password per Proxy
+plugin.icqaccregwizz.PROTOCOL_NAME=servizio ICQ
+plugin.icqaccregwizz.PROTOCOL_DESCRIPTION=servizio ICQ di AOL
+plugin.icqaccregwizz.USERNAME=ICQ UIN:
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Registra nuovo account
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=se non avete un'account ICQ, premete questo tasto per crearne uno nuovo
+plugin.icqaccregwizz.PROXY=Proxy
+plugin.icqaccregwizz.PROXY_PORT=porta Proxy
+plugin.icqaccregwizz.PROXY_TYPE=tipo di Proxy
+plugin.icqaccregwizz.PROXY_USERNAME=nome utente Proxy
+plugin.icqaccregwizz.PROXY_PASSWORD=password per Proxy
 
 # irc accregwizz
-protocolName=IRC
-protocolDescription= protocollo IRC 
-nick=Nomignolo
-password=Password
-infoPassword= la maggior parte dei server IRC no richiedono una password
-autoNickChange=cambia automaticamente nomignolo se gia' usato
-defaultPort=Usa porta default
-passwordNotRequired=il mio nomignolo non richiede identificazione
-server=nome del Host
-port=Porta
-serverIRC=Server
+plugin.ircaccregwizz.PROTOCOL_NAME=IRC
+plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=protocollo IRC 
+plugin.ircaccregwizz.USERNAME=Nomignolo
+plugin.ircaccregwizz.INFO_PASSWORD=la maggior parte dei server IRC no richiedono una password
+plugin.ircaccregwizz.AUTO_NICK_CHANGE=cambia automaticamente nomignolo se gia' usato
+plugin.ircaccregwizz.USE_DEFAULT_PORT=Usa porta default
+plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=il mio nomignolo non richiede identificazione
+plugin.ircaccregwizz.HOST=nome del Host
+plugin.ircaccregwizz.PORT=Porta
+plugin.ircaccregwizz.IRC_SERVER=Server
 
 # jabber accregwizz
-protocolName=borbottamento/Jabber
-protocolDescription=protocollo Jabber
-userID=identita' Jabber
-username= nome utente Jabber
-password=Password
-password2=Conferma password
-userIDAndPassword=Identificazione e Password
-ovverideServerOps=disimpegna opzioni di default del server
-cserver=Server
-server=collega Server
-sendKeepAlive=manda pacchetti per tenere in vita
-newAccountTitle= registrazione nuovo account Jabber
-registerNewAccount=Registra account nuovo
-registerNewAccountText=se non avete un' account Jabber premete questo tasto per crearne uno nuovo
-chooseTitle=scelta server per nuovo account Jabber
-chooseServerText=scegliete il server per il nuovo account nuovo dalla lista sottostante
-okLabel=Ok
-cancelLabel=annulla
-chooseLabel=scegli
-serverColumn=Server
-commentColumn=Comment
-
-xmppError=XMPP Errore
-userExist=questo utente e' gia' esistente. Scegliete un'altro utente o server
-unknownXmppError=errore XMPP ignoto. Controllate che il nome del server sia corretto
-notSamePassword=le due password immesse sono diverse
+plugin.jabberaccregwizz.PROTOCOL_NAME=borbottamento/Jabber
+plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=protocollo Jabber
+plugin.jabberaccregwizz.USERNAME=identita' Jabber
+plugin.jabberaccregwizz.PASSWORD_CONFIRM=Conferma password
+plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=Identificazione e Password
+plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=disimpegna opzioni di default del server
+plugin.jabberaccregwizz.CSERVER=Server
+plugin.jabberaccregwizz.SERVER=collega Server
+plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=manda pacchetti per tenere in vita
+plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE= registrazione nuovo account Jabber
+plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=se non avete un' account Jabber premete questo tasto per crearne uno nuovo
+plugin.jabberaccregwizz.CHOOSE_SERVER_TITLE=scelta server per nuovo account Jabber
+plugin.jabberaccregwizz.CHOOSE_SERVER_TEXT=scegliete il server per il nuovo account nuovo dalla lista sottostante
+plugin.jabberaccregwizz.CHOOSE=scegli
+plugin.jabberaccregwizz.SERVER_COLUMN=Server
+plugin.jabberaccregwizz.COMMENT_COLUMN=Comment
+plugin.jabberaccregwizz.XMPP_ERROR=XMPP Errore
+plugin.jabberaccregwizz.USER_EXISTS_ERROR=questo utente e' gia' esistente. Scegliete un'altro utente o server
+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=errore XMPP ignoto. Controllate che il nome del server sia corretto
+plugin.jabberaccregwizz.NOT_SAME_PASSWORD=le due password immesse sono diverse
 
 # mailbox
-outgoing=messaggio in uscita
-incoming=messaggio in arrivo
-browse=naviga
-waitTime=ritadro finche' chiamata sara' mandata alla segreteria
-maxMessageTime=durata massima di messaggio in arrivo
-confirm=Conferma
-default=Default
-mailbox=casella di posta elettronica
+plugin.mailbox.OUTGOING=messaggio in uscita
+plugin.mailbox.INCOMING=messaggio in arrivo
+plugin.mailbox.BROWSE=naviga
+plugin.mailbox.WAIT_TIME=ritadro finche' chiamata sara' mandata alla segreteria
+plugin.mailbox.MAX_MESSAGE_TIME=durata massima di messaggio in arrivo
+plugin.mailbox.CONFIRM=Conferma
+plugin.mailbox.DEFAULTS=Default
+plugin.mailbox.MAILBOX=casella di posta elettronica
 
 # msn accregwizz
-protocolName=MSN
-protocolDescription=Collegati e chatta usando il servizio MSN
-id=Email
-password=Password
-uinAndPassword=Identificazione e Password
+plugin.msnaccregwizz.PROTOCOL_NAME=MSN
+plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Collegati e chatta usando il servizio MSN
+plugin.msnaccregwizz.USERNAME=Email
+plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Identificazione e Password
 
 # plugin manager
-activate=Attiva
-desactivate=Disattiva
-install=Installa
-uninstall=disinstall
-update=aggiorna
-new=Nuovo
-plugins=collegamento
-cancel=Cancella
-url=URL
-showSystemBundles=mostra pacchetti di sistemi
-system=Sistema
+plugin.pluginmanager.INSTALL=Installa
+plugin.pluginmanager.UNINSTALL=disinstall
+plugin.pluginmanager.UPDATE=aggiorna
+plugin.pluginmanager.PLUGINS=collegamento
+plugin.pluginmanager.URL=URL
+plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=mostra pacchetti di sistemi
+plugin.pluginmanager.SYSTEM=Sistema
+plugin.pluginmanager.NEW=nuovo
 
 # rss accregwizz
-protocolName=RSS
-protocolDescription=aggiungete i vostri collegamenti RSS preferiti ad SIP Communicator
-rssAccountExist=Collegamento RSS gia' esistente
-rssAccountInfo=Questo genio/wizard aggiungera' per voi un'istruttore RSS.Notate che potete avere solo un' account RSS. Potete aggiungere piu' collegamenti alla vostra lista contatti usando il genio "aggiungi contatti". Riempite il campo indirizzi di contatti con il URI del collegamento RSS che vorreste aggiungere
-rssAccountInfoTitle=Informazione account RSS
-rssAccountAttention=Vi preghiamo di leggere attentamente le informazioni riportate sotto
+plugin.rssaccregwizz.PROTOCOL_NAME=RSS
+plugin.rssaccregwizz.PROTICOL_DESCRIPTION=aggiungete i vostri collegamenti RSS preferiti ad SIP Communicator
+plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=Collegamento RSS gia' esistente
+plugin.rssaccregwizz.ACCOUNT_INFO=Questo genio/wizard aggiungera' per voi un'istruttore RSS.Notate che potete avere solo un' account RSS. Potete aggiungere piu' collegamenti alla vostra lista contatti usando il genio "aggiungi contatti". Riempite il campo indirizzi di contatti con il URI del collegamento RSS che vorreste aggiungere
+plugin.rssaccregwizz.ACCOUNT_INFO_TITLE=Informazione account RSS
+plugin.rssaccregwizz.ACCOUNT_ATTENTION=Vi preghiamo di leggere attentamente le informazioni riportate sotto
 
 # sip accregwizz
-protocolName=SIP
-protocolDescription=protocollo SIP
-uin= identificazioneSIP 
-password=Password
-uinAndPassword=nome utente e password
-ovverideServerOps=disimpegna opzioni di default per il server
-registrar=Conservatore del registro
-serverPort=porta server
-proxy=Proxy
-proxyPort=Porta Proxy
-preferredTransport=Trasporto preferenziale
-yes=Si
-enablePresence=attiva presenza(SIMPLE)
-forceP2PPresence=forza modalita' peer-to-peer
-offlineContactPollingPeriod=periodo voto contatti offline
-subscriptionExpiration=durata di abbonamento default
-presenceOptions=opzioni presenza
-keepAlive=mantieni in vita
-keepAliveMethod=metodo per mantenere in vita
-keepAliveInterval=Intervallo per mantenimento in vita
-register=Registra
+plugin.sipaccregwizz.PROTOCOL_NAME=SIP
+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=protocollo SIP
+plugin.sipaccregwizz.USERNAME=identificazioneSIP 
+plugin.sipaccregwizz.USERNAME_AND_PASSWORD=nome utente e password
+plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=disimpegna opzioni di default per il server
+plugin.sipaccregwizz.REGISTRAR=Conservatore del registro
+plugin.sipaccregwizz.SERVER_PORT=porta server
+plugin.sipaccregwizz.PROXY_PORT=Porta Proxy
+plugin.sipaccregwizz.PREFERRED_TRANSPORT=Trasporto preferenziale
+plugin.sipaccregwizz.ENABLE_PRESENCE=attiva presenza(SIMPLE)
+plugin.sipaccregwizz.FORCE_P2P_PRESENCE=forza modalita' peer-to-peer
+plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=periodo voto contatti offline
+plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION=durata di abbonamento default
+plugin.sipaccregwizz.PRESENCE_OPTIONS=opzioni presenza
+plugin.sipaccregwizz.KEEP_ALIVE=mantieni in vita
+plugin.sipaccregwizz.KEEP_ALIVE_METHOD=metodo per mantenere in vita
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Intervallo per mantenimento in vita
+plugin.sipaccregwizz.REGISTER=Registra
 
 # ssh accregwizz
-protocolName=SSH
-protocolDescription=unprotocollo per collegarsi a macchine remote tramite SHH
-accountID=Identita' account
-identityFile=Cartella identita'
-knownHosts=Hosts conosciuti
-accountDetails= Dettagli di Account SHH
+plugin.sshaccregwizz.PROTOCOL_NAME=SSH
+plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=unprotocollo per collegarsi a macchine remote tramite SHH
+plugin.sshaccregwizz.USERNAME=Identita' account
+plugin.sshaccregwizz.IDENTITY_FILE=Cartella identita'
+plugin.sshaccregwizz.KNOWN_HOSTS=Hosts conosciuti
+plugin.sshaccregwizz.ACCOUNT_DETAILS=Dettagli di Account SHH
 
 # status update
-cancel=Cancella
-enable=attiva
-info=Informazione
-infotext=mettete 'idle' quando il vostro computer non viene usato per x minuti. Lo stato e' ripristinato allo stato di prima
-menuEntry=stato automatico
-minutes=Minuti
-ok=OK
+plugin.autoaway.AUTO_STATUS=stato automatico
+plugin.autoaway.ENABLE_CHANGE_STATUS=attiva
+plugin.autoaway.AWAY_MINUTES=Minuti
 
 # update checker
-dialogTitle=Nuova versione disponibile
-dialogMessage1=una versione nuova e' disponibile da scaricare
-dialogMessage2=
-dialogMessageDebian=
-buttonDownload=scarica
-buttonClose=Chiudi
+plugin.updatechecker.DIALOG_TITLE=Nuova versione disponibile
+plugin.updatechecker.DIALOG_MESSAGE=una versione nuova e' disponibile da scaricare
+plugin.updatechecker.DIALOG_MESSAGE_2=
+plugin.updatechecker.BUTTON_DOWNLOAD=scarica
+plugin.updatechecker.BUTTON_CLOSE=Chiudi
 
 # whiteboard
-reason=ragione
-accept=accetta
-reject=respingi
-ignore=ignora
-invitationReceivedFormInfo=Vi ha invitato ad unirvi. Lavagna bianca.Potete respingere/accettare o ingnorare questo invito
-invitation=testo d'invito
-whiteboardTitle=Titolo della Lavagna bianca
-whiteboardMenuItemText=Lavagna bianca
-whiteboardMenuItemNotSupportedTooltip=Questo contato no appoggia l'attivita' Lavagna bianca
-cancel=Cancella
-yes=Si
-doNotAskAgain=Non chiedermelo ancora
-closeSessionQuestion=Vorreste concludere la seduta in corso?Se scegliete "Si" la seduta in corso verra' conclusa ,altrimenti verra' chiusa solo la vostra finestra bianca
-file=schedario
-draw=tirare
-new=nuovo
-save=Salva
-open=apri
-copy=Copia
-paste=Incolla
-pen=Penna
-select=Seleziona
-line=Linea
-rectangle=Rettangolo
-fillRectangle= completa rettangolo 
-text=testo
-image=Immagine
-polygon=Poligono
-fillPolygon=rettangolo completato
-polyline=Polylinea
-circle=Cerhio
-fillCircle=cerchio completato
-color=Colore
-modification=Modificazione
-thickness=spessore
-send=invia
-print=stampa
-edit=Edita
-grid=Grata
-deselect=Disattiva
-delete=Cancella
-properties=Proprieta'
-help=Aiuto
-About=Su
+plugin.whiteboard.TITLE=Titolo della Lavagna bianca
+plugin.whiteboard.MENU_ITEM=Lavagna bianca
+plugin.whiteboard.NOT_SUPPORTED=Questo contato no appoggia l'attivita' Lavagna bianca
+plugin.whiteboard.DRAW=tirare
+plugin.whiteboard.OPEN=apri
+plugin.whiteboard.PEN=Penna
+plugin.whiteboard.SELECT=Seleziona
+plugin.whiteboard.LINE=Linea
+plugin.whiteboard.RECTANGLE=Rettangolo
+plugin.whiteboard.FILLED_RECTANGLE=completa rettangolo 
+plugin.whiteboard.TEXT=testo
+plugin.whiteboard.IMAGE=Immagine
+plugin.whiteboard.POLYGON=Poligono
+plugin.whiteboard.FILLEDPOLYGON=rettangolo completato
+plugin.whiteboard.POLYLINE=Polylinea
+plugin.whiteboard.CIRCLE=Cerhio
+plugin.whiteboard.FILLED_CIRCLE=cerchio completato
+plugin.whiteboard.COLOR=Colore
+plugin.whiteboard.MODIFICATION=Modificazione
+plugin.whiteboard.THICKNESS=spessore
+plugin.whiteboard.GRID=Grata
+plugin.whiteboard.DESELECT=Disattiva
+plugin.whiteboard.DELETE=Cancella
+plugin.whiteboard.PROPERTIES=Proprieta'
 
 # yahoo accregwizz
-protocolName=YAHOO
-protocolDescription=Collegati e chatta usando Yahoo.
-id=nome utente
-password=Password
-uinAndPassword=Identificazione e Password
+plugin.yahooaccregwizz.PROTOCOL_NAME=YAHOO
+plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Collegati e chatta usando Yahoo.
+plugin.yahooaccregwizz.USERNAME=nome utente
+plugin.yahooaccregwizz.USERID_AND_PASSWORD=Identificazione e Password
 
 # zeroconf accregwizz
-protocolName=Zeroconf
-protocolDescription=protocollo di servizio seroconf
-userID=identitificazione utente
-firstname=Nome
-password=Password
+plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
+plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=protocollo di servizio seroconf
+plugin.zeroaccregwizz.USERID=identitificazione utente
+plugin.zeroaccregwizz.FIRST_NAME=Nome
 
 
diff --git a/resources/languages/resources_pt.properties b/resources/languages/resources_pt.properties
index 56061fc..1f921fa 100644
--- a/resources/languages/resources_pt.properties
+++ b/resources/languages/resources_pt.properties
@@ -25,280 +25,231 @@
 # The same rules apply to the properties files found in the other
 # directories.
 
-about=&Sobre SIP communicator
-accept=&Aceitar
-account=Conta
-accountRegistrationWizard=Menú de registo de conta
-accounts=Contas
-activateOnlyWhenMinimized=Ativar somente quando minimizado
-add=&Adicionar
-addContact=&Adicionar contato
-addContactError= Não foi possível adicionar o contato com o id: {0}
-addContactErrorTitle=Erro na adição do contato
-addContactExistError=O contato {0} já existe na sua Lista de Contatos.
-addContactIdentifier=Insira no campo abaixo o identificador do contato que pretende adicionar.
-addContactWizard=Menú de adição de contatos.
-addGroupLocalError=Não foi possível adicionar o grupo com o nome: {0}. O problema ocorreu durante uma operação IO local.
-addGroupNetError=Não foi possível adicionar o grupo com o nome: {0}. O problema ocorreu devido a uma falha de rede. Por favor verifique a sua ligação de rede e tente de novo.
-addGroupError=Não foi possível adicionar o grupo com o nome: {0}.
-addGroupErrorTitle=Erro na adição do grupo
-addGroupExistError=O grupo {0} já existe na sua lista de contatos.
-addSubcontact=&Adicionar subcontato
-all=&Todos
-allContacts=&Todos contatos
-alwaysOnTop=Sempre em frente
-appearance=Aparência
-application=Aplicação
-apply=&Aplicar
-at=em
-authAccepted= O contato aceitou o seu pedido de autorização.
-authenticationWindowTitle=Autenticação necessária
-authRejected=O contato rejeitou o seu pedido de autorização.
-authorizationRequested=Pedido de autorização
-authorizationRequestedInfo=O {0} contato pede a sua autorização.
-authenticationFailed=Falha na autenticação da conta: Nome de usuário: {0}, Nome do servidor: {1}. A palavra-chave que usou é inválida.
-authorizationResponse=Resposta de autorização
-autoPopup=Trazer janela para frente
-awayStatus=Ausente
-back=&Voltar
-ban=&Proibir
-banFailed=Falha na proibição
-banFailedGeneralError=Falha na proibição {0}. Um erro geral do servidor ocorreu.
-banFailedNotAllowed=Falha na proibição {0}. Não foi possível banir o proprietário e o administrador do room.
-banFailedNotEnoughPermissions=Falha na proibição {0}. Voçê não possui previlégios suficientes.
-call=Chamar
-callVia=Chamar via:
-callList=Lista de chamadas
-cancel=&Cancelar
-chatRoomAlreadyJoined=Já está participando no {0} chat room.
-chatRoomConfiguration={0} Configuração de chat room
-chatRoomOpenConfigFailed=Falha na obtenção do formulário de configuração do {0} chat room.
-chatRoomOpenConfigForbidden=Não foi possível obter o formulário de configuração do {0} chat room. Somente administradores do chat room podem consultar e alterar o formulário de configuração.
-chatRoomConfigFormSubmitFailed=Um erro ocorreu enquanto se tentava enviar o formulário de configuração para o chat room {0}.
-chatRoomUserJoined=Entrou {0}
-chatRoomUserLeft=Saiu {0}
-chatRoomUserKicked=Foi removido de {0}
-chatRoomUserQuit=Abandonou {0}
-chatRoomName=Nome do chat room
-chatRoomNameInfo=Insira no campo abaixo o nome do chat room que pretende criar.
-chatRoomNotExist=O {0} room não foi encontrado no {1} servidor. Por favor verifique se inseriu corretamente o nome.
-chatRoomNotConnected=Voçê necessita estar ligado para poder participar no {0} chat room.
-chatRoomNotJoined=Voçê necessita estar participando no chat room para poder realizar operações.
-chatRoomOptions=Opções do chat room
-chatRoomRegistrationRequired=Precisa estar registado para poder entrar no {0} chat room.
-chatRoomRequiresPassword=O {0} chat room pede a palavra-chave.
-chatRooms=Chat rooms
-chatRoomSubjectChanged={0} mudou o assunto para {1}
-#close=Cl&ose
-close=Fechar
-closeChatAfterNewMsg=Voçê recebeu uma nova mensagem à menos de 2 segundos atrás. Tem a certeza que deseja fechar este chat?
-conference=Chamada em grupo
-configure=&Configurar
-configuration=Configuração
-connectionFailed=Falha na chamada
-connectionFailedMessage=Falha na chamada para a conta seguinte: Nome do usuário: {0}, Nome do servidor: {1}.
-connectionExpiredMessage=Voçê encontra-se de momento desligado {0} do servidor.
-contactAddress=Endereço de contato
-contactNotSupportingTelephony=O contato escolhido {0} não suporta telefonia.
-contactPausedTyping={0} parou de escrever a mensagem
-contactTyping={0} está escrevendo uma messagem
-contactTypingStateStale=Estado de escrita não atualizado
-contacts=Contatos
-continue=&Continuar
-copy=&Copiar
-copyLink=Copiar &link
-create=C&riar
-createChatRoom=&Criar chat room...
-createChatRoomNotSupported=Falha na criação do chat room com o nome: {0}. O servidor que escolheu: {1} não suporta esta operação.
-createChatRoomError=Falha na criação do chat room com o nome: {0}.
-createChatRoomWizard=Menú de criação de chat room
-createGroup=&Criar grupo
-createGroupName=Insira no campo abaixo o nome do grupo que pretende criar.
-cut=C&ortar
-date=Data
-description=Descrição
-dial=&Chamar
-dialpad=Teclado de chamada
-dndStatus=Não perturbar
-doNotAskAgain=Não pergunte de novo
-dontSupportWebInfo=Este contato não suporta informação de contato web
-duration=Duração
-edit=&Editar
-emptyHistory=&Limpar histórico
-enableNotifications=Ativar avisos
-enableTypingNotifications=Ativar notificações de &escrita
-error=Erro
-#exit=E&xit
-exit=S&air
-extendedCriteria=Critérios alargados
-general=Geral
-generalError=Erro geral
-group=Grupo
-groupName=Nome do grupo
-failedToCreateChatRoom=Falha na criação do chat room com o nome: {0}.
-failedToJoinChatRoom=Falha na entrada do chat room com o name: {0}.
-ffcStatus=Livre para chat
-file=&Ficheiro
-findChatRoomError=Não foi possível encontrar o "{0}" chat room.
-finish=&Terminar
-first=Primeiro
-font=Tipo de letra
-haveToBeConnectedToJoin=Precisa estar ligado para poder entrar no chat room. Por favor, ligue e tente de novo.
-haveToBeConnectedToLeave=Precisa estar ligado para poder sair de um chat room.
-help=?
-hideCallPanel=&Ocultar painel de chamadas
-history=&Histórico
-historyContact=Histórico - {0}
-hour=Hora
-identifier=Identificador
-ignore=&Ignorar
-insertSmiley=Inserir smiley
-invalidCall=Chamada inválida
-invitation=Texto de convite
-invitationReceived=Convite recebido
-invitationReceivedFormInfo={0} convidou-o para entrar no {1} chat room. Pode aceitar, rejeitar ou ignorar este convite.
-invite=&Convidar
-inviteContactFormInfo=Por favor escreva o nome do usuário que pretende convidar. Pode também incluir a razão deste convite.
-inviteContactToChat=Convidar contato para chat
-join=&Entrar
-joinAs=E&ntrar como
-joinChatRoom=&Entrar no chat room...
-joinChatRoomTitle=Entrar no chat room
-joinChatRoomName=Por favor insira o nome do chat room que pretende participar.
-joinChatRoomWizard=Menú de participação de chat room
-kick=&Expulsar
-kickFailed=Falha na expulsão
-kickFailedGeneralError=Falha na expulsão {0}. Um erro geral do servidor ocorreu.
-kickFailedNotAllowed=Falha na expulsão {0}. Não foi possível expulsar o proprietário e o administrador do room. 
-kickFailedNotEnoughPermissions=Falha na expulsão {0}. Voçê não tem previlégios para a operação desejada.
-last=Último
-launchBrowserError=Erro ao tentar abrir o web browser.
-launchOnStartUp=Erro ao inicializar
-leave=&Abandonar
-limitReachedForIp=Voçê possui demasiados registos usando o endereço IP local. O {0} servidor não permite abrir mais registos.
-login=&Entrar
-loginNotSucceeded=Um erro ocorreu enquanto tentava entrar com a conta seguinte: Nome de usuário: {0}, Nome do servidor: {1}.
-loginWindowTitle=Entrar {0}
-logoffNotSucceeded=Um erro ocorreu enquanto tentava sair com a conta seguinte: Nome de usuário: {0}, Nome do servidor: {1}.
-me=eu
-modify=&Modificar
-moveSubcontactMsg=Escolha o contato, aonde gostaria de movimentar. 
-moveSubcontact=M&ovimentar Subcontato
-moveSubcontactInSameContact=O contato que escolheu é o mesmo que o \n contato de origem. Por favor escolha outro contato!
-moveToGroup=&Movimentar para o grupo
-msgDeliveryFailure=Não foi possivel entregar a mensagem acima.
-msgDeliveryOfflineNotSupported=O protocolo que está a usar não suporta mensagens em offline. Pode tentar alcançar este contato usando outro protocolo ou esperar até que ele/ela torne-se disponível.
-msgDeliveryInternalError=Um erro interno ocorreu. Isto é provavelmente um bug. Por favor informe em: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
-msgNotDelivered=Ocorreu um problema de rede.
-msgReceived=Mensagem recebida de {0}
-msgSendConnectionProblem=Necessita estar ligado para poder enviar mensagens.
-multipleLogins=Ligou mais de uma vez com a mesma conta. A conta seguinte: Nome de usuário: {0}, Nome do servidor: {1} encontra-se desligada de momento.
-name=Nome
-networkFailure=Falha na rede
-next=&Seguinte
-new=&Novo
-newAccount=&Nova conta
-newName=Novo nome:
-no=Não
-noAccountFound=Para poder usar SIP-Communicator precisa de pelo menos uma conta registada. As páginas seguintes vão guiá-lo no processo de criação de uma conta.
-noAvailableRooms=A lista de rooms não está disponível de momento neste servidor.
-noMultiChatAccountAvailable=Não foi encontrada nenhuma conta que suporta chat de múltiplos usuários. Consulte sip-communicator.org para mais informações sobre que protocolos suportam chat de multi usuários.
-nonEmptyChatWindowClose=Voçê está tentando fechar um chat com uma mensagem não enviada. Tem a certeza que quer fechar este chat?
-nonExistingUserId=O {0} servidor não reconhece o id de usuário especificado.
-notifications=Notificações
-ok=&OK
-offline=Offline
-olderCalls=Chamadas antigas
-online=Disponível
-openInBrowser=Abrir no &browser
-options=Opções
-passwd=Palavra-passe:
-paste=&Colar
-previous=Anterior
-print=&Imprimir
-protocol=Protocolo
-providerNotConnected=Necessita estar ligado para poder comunicar.
-quit=&Sair
-ready=Pronto
-reason=Razão
-reconnectionLimitExceeded=Voçê está ligando e religando-se ao servidor demasiado rápido. A conta seguinte: Nome de usuário: {0}, Nome do servidor: {1} foi temporariamente banida e terá de esperar algum tempo antes de tentar ligar novamente.
-refresh=Atualizar
-registrationTimeout=Timeout no processo de registo:
-reject=&Rejeitar
-rememberPassword=Lembrar palavra-chave
-remove=&Remover
-removeAccount=&Remover conta
-removeAccountMessage=Tem a certeza que deseja remover esta conta?
-removeContact=&Remover subcontato
-removeGroup=&Remover grupo
-rename=&Renomear
-renameContact=Re&nomear contato
-renameContactWizard=Pode especificar no campo abaixo o nome que pretende usar para o contato.
-renameGroup=Re&nomear grupo
-renameGroupInfo=Pode especificar no campo abaixo o nome que pretende usar para o grupo.
-request=&Pedido
-requestAuthorization=&Pedido de autorização
-requestAuthorizationInfo=Não foi possível adicionar {0} à sua lista de contatos. {0} terá de autorizar o seu pedido para o/a adicionar. Por favor introduza o seu pedido em baixo.
-requestAuthReason=Razão do pedido
-requestAuthReasonEnter=Insira a razão do pedido
-responseAuthReasonEnter=Insira a razão da resposta
-save=&Salvar
-search=&Buscar
-searchForChatRooms=&Buscar chat rooms
-searchForChatRoomsText=Clique no botão de baixo para mostrar todos os chat rooms existentes no servidor selecionado. Depois escolha o chat room que pretende participar e clique no botão Entrar.
-securityAuthorityRealm=O {0} servidor pede que se autentique.
-selectAccount=Escolher conta
-selectAccountRegistration=Escolha na lista abaixo o menú de registo de conta que pretende usar para criar uma nova conta.
-selectAccountRegWizardTitle=Escolha o registo de conta
-selectGroup=Escolher grupo
-selectGroupWizard=A lista abaixo contém todos os grupos a sua Lista de Contatos. Escolha um grupo aonde gostaria de adicionar o novo contato.
-selectGroupWizardTitle=Escolher grupo
-selectProvidersForChatRoom=A lista abaixo contém todas as contas que suportam a função de chat com múltiplos usuários. Selecione a lista que pretende usar para a criação do seu chat room.
-selectProvidersWizard=A lista abaixo contém todas as contas registadas. Selecione uma das listas que pretende usar para se comunicar com o novo contato.
-selectProvidersWizardTitle=Selecionar conta(s)
-send=&Enviar
-sendFile=E&nviar ficheiro
-selectContactSupportingInfo=Não existe informação sobre este contato.
-sendMessage=&Enviar uma mensagem
-sendVia=Enviar via
-settings=&Preferências
-showCallPanel=Mostrar Painel de chamadas
-showChannelsList=Mostar lista de canais
-showOfflineUsers=Ocultar/Mostrar usuários offline
-sipCommunicator=SIPCommunicator
-specifyReason=Pode especificar no campo abaixo a razão desta operação.
-soundOnOff=Ligar/desligar o som
-statusChangedChatMessage=tornou-se {0}
-statusChangeGeneralError=Falha na mudança de estado da conta: Nome de usuário: {0}, Nome do servidor: {1}, devido a um erro geral.
-statusChangeNetworkFailure=Falha na mudança de estado da conta: Nome de usuário: {0}, Nome do servidor: {1}, devido a um problema de rede.
-subject=Assunto
-summary=Sumário
-today=Hoje
-tools=&Ferramentas
-typeYourRequest=Escreva o seu pedido aqui
-uin=UIN:
-unknown=Usuário desconhecido
-useCtrlEnterToSend=Use Ctrl-&Enter para enviar
-msgDeliveryFailedUnknownError=Um erro desconhecido ocorreu enquanto se enviava a sua mensagem.
-unregisteredMessage=Não foi possível ligar à conta seguinte: Nome de usuário: {0}, Nome do servidor: {1}. Voçê está neste momento offline.
-updateAutomatically=Instalar automaticamente novas atualizações
-updates=Atualizações
-userInfo=&Informação do usuário
-view=&Visualizar
-viewHistory=Mostrar &histórico
-warning=Aviso
-yes=Sim
-yesterday=Ontem
+service.gui.ABOUT=&Sobre SIP communicator
+service.gui.ACCEPT=&Aceitar
+service.gui.ACCOUNT=Conta
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Menú de registo de conta
+service.gui.ACCOUNTS=Contas
+service.gui.ADD=&Adicionar
+service.gui.ADD_CONTACT=&Adicionar contato
+service.gui.ADD_CONTACT_ERROR= Não foi possível adicionar o contato com o id: {0}
+service.gui.ADD_CONTACT_ERROR_TITLE=Erro na adição do contato
+service.gui.ADD_CONTACT_EXIST_ERROR=O contato {0} já existe na sua Lista de Contatos.
+service.gui.ADD_CONTACT_IDENTIFIER=Insira no campo abaixo o identificador do contato que pretende adicionar.
+service.gui.ADD_CONTACT_WIZARD=Menú de adição de contatos.
+service.gui.ADD_GROUP_LOCAL_ERROR=Não foi possível adicionar o grupo com o nome: {0}. O problema ocorreu durante uma operação IO local.
+service.gui.ADD_GROUP_NET_ERROR=Não foi possível adicionar o grupo com o nome: {0}. O problema ocorreu devido a uma falha de rede. Por favor verifique a sua ligação de rede e tente de novo.
+service.gui.ADD_GROUP_ERROR=Não foi possível adicionar o grupo com o nome: {0}.
+service.gui.ADD_GROUP=Erro na adição do grupo
+service.gui.ADD_GROUP_EXIST_ERROR=O grupo {0} já existe na sua lista de contatos.
+service.gui.ADD_SUBCONTACT=&Adicionar subcontato
+service.gui.ALL=&Todos
+service.gui.ALL_CONTACTS=&Todos contatos
+service.gui.APPLY=&Aplicar
+service.gui.AT=em
+service.gui.AUTHORIZATION_ACCEPTED= O contato aceitou o seu pedido de autorização.
+service.gui.AUTHENTICATION_WINDOW_TITLE=Autenticação necessária
+service.gui.AUTHENTICATION_REJECTED=O contato rejeitou o seu pedido de autorização.
+service.gui.AUTHORIZATION_REQUESTED=Pedido de autorização
+service.gui.AUTHORIZATION_REQUESTED_INFO=O {0} contato pede a sua autorização.
+service.gui.AUTHENTICATION_FAILED=Falha na autenticação da conta: Nome de usuário: {0}, Nome do servidor: {1}. A palavra-chave que usou é inválida.
+service.gui.AUTHORIZATION_RESPONSE=Resposta de autorização
+service.gui.BAN=&Proibir
+service.gui.BAN_FAILED=Falha na proibição
+service.gui.BAN_FAILED_GENERAL_ERROR=Falha na proibição {0}. Um erro geral do servidor ocorreu.
+service.gui.BAN_FAILED_NOT_ALLOWED=Falha na proibição {0}. Não foi possível banir o proprietário e o administrador do room.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Falha na proibição {0}. Voçê não possui previlégios suficientes.
+service.gui.CALL=Chamar
+service.gui.CALL_VIA=Chamar via:
+service.gui.CANCEL=&Cancelar
+service.gui.CHAT_ROOM_ALREADY_JOINED=Já está participando no {0} chat room.
+service.gui.CHAT_ROOM_CONFIGURATION={0} Configuração de chat room
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Falha na obtenção do formulário de configuração do {0} chat room.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Não foi possível obter o formulário de configuração do {0} chat room. Somente administradores do chat room podem consultar e alterar o formulário de configuração.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Um erro ocorreu enquanto se tentava enviar o formulário de configuração para o chat room {0}.
+service.gui.CHAT_ROOM_USER_JOINED=Entrou {0}
+service.gui.CHAT_ROOM_USER_LEFT=Saiu {0}
+service.gui.CHAT_ROOM_USER_KICKED=Foi removido de {0}
+service.gui.CHAT_ROOM_USER_QUIT=Abandonou {0}
+service.gui.CHAT_ROOM_NAME=Nome do chat room
+service.gui.CHAT_ROOM_NAME_INFO=Insira no campo abaixo o nome do chat room que pretende criar.
+service.gui.CHAT_ROOM_NOT_EXIST=O {0} room não foi encontrado no {1} servidor. Por favor verifique se inseriu corretamente o nome.
+service.gui.CHAT_ROOM_NOT_CONNECTED=Voçê necessita estar ligado para poder participar no {0} chat room.
+service.gui.CHAT_ROOM_NOT_JOINED=Voçê necessita estar participando no chat room para poder realizar operações.
+service.gui.CHAT_ROOM_OPTIONS=Opções do chat room
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Precisa estar registado para poder entrar no {0} chat room.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=O {0} chat room pede a palavra-chave.
+service.gui.CHAT_ROOMS=Chat rooms
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} mudou o assunto para {1}
+service.gui.CLOSE=Fechar
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Voçê recebeu uma nova mensagem à menos de 2 segundos atrás. Tem a certeza que deseja fechar este chat?
+service.gui.OPTIONS=&Configurar
+service.gui.CONNECTION_EXPIRED_MSG=Voçê encontra-se de momento desligado {0} do servidor.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=O contato escolhido {0} não suporta telefonia.
+service.gui.CONTACT_PAUSED_TYPING={0} parou de escrever a mensagem
+service.gui.CONTACT_TYPING={0} está escrevendo uma messagem
+service.gui.CONTACT_TYPING_STATE_STALE=Estado de escrita não atualizado
+service.gui.CONTACTS=Contatos
+service.gui.COPY=&Copiar
+service.gui.COPY_LINK=Copiar &link
+service.gui.CREATE=C&riar
+service.gui.CREATE_CHAT_ROOM=&Criar chat room...
+service.gui.CREATE_CHAT_ROOM_ERROR=Falha na criação do chat room com o nome: {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Menú de criação de chat room
+service.gui.CREATE_GROUP=&Criar grupo
+service.gui.CREATE_GROUP_NAME=Insira no campo abaixo o nome do grupo que pretende criar.
+service.gui.CUT=C&ortar
+service.gui.DATE=Data
+service.gui.DIALPAD=Teclado de chamada
+service.gui.DND_STATUS=Não perturbar
+service.gui.DO_NOT_ASK_AGAIN=Não pergunte de novo
+service.gui.CONTACT_INFO_NOT_SUPPORTED=Este contato não suporta informação de contato web
+service.gui.DURATION=Duração
+service.gui.EDIT=&Editar
+service.gui.EMPTY_HISTORY=&Limpar histórico
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Ativar notificações de &escrita
+service.gui.ERROR=Erro
+service.gui.EXIT=S&air
+service.gui.EXTENDED_CRITERIA=Critérios alargados
+service.gui.GENERAL=Geral
+service.gui.GENERAL_ERROR=Erro geral
+service.gui.GROUP_NAME=Nome do grupo
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Falha na entrada do chat room com o name: {0}.
+service.gui.FFC_STATUS=Livre para chat
+service.gui.FILE=&Ficheiro
+service.gui.FINISH=&Terminar
+service.gui.FONT=Tipo de letra
+service.gui.CHAT_ROOM_NOT_CONNECTED=Precisa estar ligado para poder entrar no chat room. Por favor, ligue e tente de novo.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Precisa estar ligado para poder sair de um chat room.
+service.gui.HELP=?
+service.gui.HISTORY=&Histórico
+service.gui.HISTORY_CONTACT=Histórico - {0}
+service.gui.HOUR=Hora
+service.gui.IDENTIFIER=Identificador
+service.gui.IGNORE=&Ignorar
+service.gui.INSERT_SMILEY=Inserir smiley
+service.gui.INVITATION=Texto de convite
+service.gui.INVITATION_RECEIVED=Convite recebido
+service.gui.INVITATION_RECEIVED_MSG={0} convidou-o para entrar no {1} chat room. Pode aceitar, rejeitar ou ignorar este convite.
+service.gui.INVITE=&Convidar
+service.gui.INVITE_CONTACT_MSG=Por favor escreva o nome do usuário que pretende convidar. Pode também incluir a razão deste convite.
+service.gui.INVITE_CONTACT_TO_CHAT=Convidar contato para chat
+service.gui.JOIN=&Entrar
+service.gui.JOIN_AS=E&ntrar como
+service.gui.JOIN_CHAT_ROOM=&Entrar no chat room...
+service.gui.JOIN_CHAT_ROOM_TITLE=Entrar no chat room
+service.gui.JOIN_CHAT_ROOM_NAME=Por favor insira o nome do chat room que pretende participar.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Menú de participação de chat room
+service.gui.KICK=&Expulsar
+service.gui.KICK_FAILED=Falha na expulsão
+service.gui.KICK_FAILED_GENERAL_ERROR==Falha na expulsão {0}. Um erro geral do servidor ocorreu.
+service.gui.KICK_FAILED_NOT_ALLOWED=Falha na expulsão {0}. Não foi possível expulsar o proprietário e o administrador do room. 
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Falha na expulsão {0}. Voçê não tem previlégios para a operação desejada.
+service.gui.LAST=Último
+service.gui.LEAVE=&Abandonar
+service.gui.LIMIT_REACHED_FOR_IP=Voçê possui demasiados registos usando o endereço IP local. O {0} servidor não permite abrir mais registos.
+service.gui.LOGIN=&Entrar
+service.gui.LOGIN_WINDOW_TITLE=Entrar {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=Um erro ocorreu enquanto tentava sair com a conta seguinte: Nome de usuário: {0}, Nome do servidor: {1}.
+service.gui.ME=eu
+service.gui.MODIFY=&Modificar
+service.gui.MOVE_SUBCONTACT_MSG=Escolha o contato, aonde gostaria de movimentar. 
+service.gui.MOVE_SUBCONTACT=M&ovimentar Subcontato
+service.gui.MOVE_SUBCONTACT_FAILED=O contato que escolheu é o mesmo que o \n contato de origem. Por favor escolha outro contato!
+service.gui.MOVE_TO_GROUP=&Movimentar para o grupo
+service.gui.MSG_DELIVERY_FAILURE=Não foi possivel entregar a mensagem acima.
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=O protocolo que está a usar não suporta mensagens em offline. Pode tentar alcançar este contato usando outro protocolo ou esperar até que ele/ela torne-se disponível.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=Um erro interno ocorreu. Isto é provavelmente um bug. Por favor informe em: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
+service.gui.MSG_NOT_DELIVERED=Ocorreu um problema de rede.
+service.gui.MSG_RECEIVED=Mensagem recebida de {0}
+service.gui.MSG_SEND_CONNECTION_PROBLEM=Necessita estar ligado para poder enviar mensagens.
+service.gui.MULTIPLE_LOGINS=Ligou mais de uma vez com a mesma conta. A conta seguinte: Nome de usuário: {0}, Nome do servidor: {1} encontra-se desligada de momento.
+service.gui.NETWORK_FAILURE=Falha na rede
+service.gui.NEXT=&Seguinte
+service.gui.NEW=&Novo
+service.gui.NEW_ACCOUNT=&Nova conta
+service.gui.NEW_NAME=Novo nome:
+service.gui.NO=Não
+service.gui.NO_AVAILABLE_ROOMS=A lista de rooms não está disponível de momento neste servidor.
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Não foi encontrada nenhuma conta que suporta chat de múltiplos usuários. Consulte sip-communicator.org para mais informações sobre que protocolos suportam chat de multi usuários.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Voçê está tentando fechar um chat com uma mensagem não enviada. Tem a certeza que quer fechar este chat?
+service.gui.NON_EXISTING_USER_ID=O {0} servidor não reconhece o id de usuário especificado.
+service.gui.NOTIFICATIONS=Notificações
+service.gui.OK=&OK
+service.gui.OFFLINE=Offline
+service.gui.OLDER_CALLS=Chamadas antigas
+service.gui.ONLINE=Disponível
+service.gui.OPEN_IN_BROWSER=Abrir no &browser
+service.gui.PASSWORD=Palavra-passe:
+service.gui.PASTE=&Colar
+service.gui.PREVIOUS=Anterior
+service.gui.PRINT=&Imprimir
+service.gui.PROTOCOL=Protocolo
+service.gui.QUIT=&Sair
+service.gui.READY=Pronto
+service.gui.REASON=Razão
+service.gui.RECONNECTION_LIMIT_EXCEEDED=Voçê está ligando e religando-se ao servidor demasiado rápido. A conta seguinte: Nome de usuário: {0}, Nome do servidor: {1} foi temporariamente banida e terá de esperar algum tempo antes de tentar ligar novamente.
+service.gui.REJECT=&Rejeitar
+service.gui.REMEMBER_PASSWORD=Lembrar palavra-chave
+service.gui.REMOVE=&Remover
+service.gui.REMOVE_ACCOUNT=&Remover conta
+service.gui.REMOVE_ACCOUNT_MESSAGE=Tem a certeza que deseja remover esta conta?
+service.gui.REMOVE_CONTACT=&Remover subcontato
+service.gui.REMOVE_GROUP=&Remover grupo
+service.gui.RENAME=&Renomear
+service.gui.RENAME_CONTACT=Re&nomear contato
+service.gui.RENAME_CONTACT_WIZARD=Pode especificar no campo abaixo o nome que pretende usar para o contato.
+service.gui.RENAME_GROUP=Re&nomear grupo
+service.gui.RENAME_GROUP_INFO=Pode especificar no campo abaixo o nome que pretende usar para o grupo.
+service.gui.REQUEST=&Pedido
+service.gui.REQUEST_AUTHORIZATION=&Pedido de autorização
+service.gui.REQUEST_AUTHORIZATION_MSG=Não foi possível adicionar {0} à sua lista de contatos. {0} terá de autorizar o seu pedido para o/a adicionar. Por favor introduza o seu pedido em baixo.
+service.gui.SAVE=&Salvar
+service.gui.SEARCH=&Buscar
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Clique no botão de baixo para mostrar todos os chat rooms existentes no servidor selecionado. Depois escolha o chat room que pretende participar e clique no botão Entrar.
+service.gui.SECURITY_AUTHORITY_REALM=O {0} servidor pede que se autentique.
+service.gui.SELECT_ACCOUNT=Escolher conta
+service.gui.SELECT_GROUP=Escolher grupo
+service.gui.SELECT_GROUP_WIZARD_MSG=A lista abaixo contém todos os grupos a sua Lista de Contatos. Escolha um grupo aonde gostaria de adicionar o novo contato.
+service.gui.SELECT_GROUP_WIZARD=Escolher grupo
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=A lista abaixo contém todas as contas que suportam a função de chat com múltiplos usuários. Selecione a lista que pretende usar para a criação do seu chat room.
+service.gui.SELECT_PROVIDERS_WIZARD_MSG=A lista abaixo contém todas as contas registadas. Selecione uma das listas que pretende usar para se comunicar com o novo contato.
+service.gui.SELECT_PROVIDERS_WIZARD=Selecionar conta(s)
+service.gui.SEND=&Enviar
+service.gui.SEND_FILE=E&nviar ficheiro
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=Não existe informação sobre este contato.
+service.gui.SEND_MESSAGE=&Enviar uma mensagem
+service.gui.SEND_VIA=Enviar via
+service.gui.SETTINGS=&Preferências
+service.gui.SPECIFY_REASON==Pode especificar no campo abaixo a razão desta operação.
+service.gui.SOUND_ON_OFF=Ligar/desligar o som
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=tornou-se {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Falha na mudança de estado da conta: Nome de usuário: {0}, Nome do servidor: {1}, devido a um erro geral.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Falha na mudança de estado da conta: Nome de usuário: {0}, Nome do servidor: {1}, devido a um problema de rede.
+service.gui.SUBJECT=Assunto
+service.gui.SUMMARY=Sumário
+service.gui.TODAY=Hoje
+service.gui.TOOLS=&Ferramentas
+service.gui.TYPE_YOUR_REQUEST=Escreva o seu pedido aqui
+service.gui.USER_IDENTIFIER=UIN:
+service.gui.UNKNOWN=Usuário desconhecido
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Um erro desconhecido ocorreu enquanto se enviava a sua mensagem.
+service.gui.UNREGISTERED_MESSAGE=Não foi possível ligar à conta seguinte: Nome de usuário: {0}, Nome do servidor: {1}. Voçê está neste momento offline.
+service.gui.VIEW=&Visualizar
+service.gui.VIEW_HISTORY=Mostrar &histórico
+service.gui.WARNING=Aviso
+service.gui.YES=Sim
+service.gui.YESTERDAY=Ontem
 
-january=Jan
-february=Fev
-march=Mar
-april=Abr
-may=Mai
-june=Jun
-july=Jul
-august=Ago
-september=Set
-october=Out
-november=Nov
-december=Dez
+service.gui.JANUARY=Jan
+service.gui.FEBRUARY=Fev
+service.gui.MARCH=Mar
+service.gui.APRIL=AprAbr
+service.gui.MAY=MayMai
+service.gui.JUNE=JunJun
+service.gui.JULY=JulJul
+service.gui.AUGUST=AugAgo
+service.gui.SEPTEMBER=SepSet
+service.gui.OCTOBER=OctOut
+service.gui.NOVEMBER=NovNov
+service.gui.DECEMBER=DecDez
diff --git a/resources/languages/resources_ro.properties b/resources/languages/resources_ro.properties
index 020a887..54fa917 100644
--- a/resources/languages/resources_ro.properties
+++ b/resources/languages/resources_ro.properties
@@ -6,314 +6,267 @@
 # Romanian translation
 # Author: Cristina Tabacaru
 
-about=&Despre
-accept=&Acceptă
-account=Cont
-accountRegistrationWizard=Asistent de înregistrare conturi
-accounts=Conturi
-activateOnlyWhenMinimized=Activează numai la minimizare
-add=&Adaugă
-addContact=&Adaugă contact
-addContactError=Nu s-a putut adăuga contactul având id: {0}
-addContactErrorTitle=Eroare la adăugarea contactului
-addContactExistError=Contactul {0} există deja în lista dvs de contacte.
-addContactIdentifier=În câmpul de mai jos introduceți identificatorul contactului pe care doriți să îl adăugați.
-addContactWizard=Asistent de adăugare contact
-addGroupLocalError=Nu s-a putut adăuga grupul cu numele: {0}. Problema a intervenit în timpul unei operații I/O.
-addGroupNetError=Nu s-a putut adăuga grupul cu numele: {0}. Problema se datorează unei erori de rețea. Verificați conexiunea la rețea și reîncercați.
-addGroupError=Nu s-a putut adăuga grupul cu numele: {0}.
-addGroupErrorTitle=Eroare la Adăugare grup
-addGroupExistError=Grupul {0} există deja în lista dvs de contacte.
-addSubcontact=&Adaugă subcontact
-all=&Toate
-allContacts=&Toate contactele
-alwaysOnTop=ÃŽntotdeauna deasupra
-appearance=Aspect
-application=Aplicație
-apply=&Aplică
-at=la
-authAccepted=Contactul a acceptat cererea dvs de autorizare.
-authenticationWindowTitle=Autentificare obligatorie
-authRejected=Contactul a refuzat cererea dvs de autorizare.
-authorizationRequested=Autorizare obligatorie
-authorizationRequestedInfo=Contactul {0} vă cere permisiunea.
-authenticationFailed=Eroare de autentificare pentru contul: Nume utilizator: {0}, Nume server: {1}. Parola introdusă nu este validă.
-authorizationResponse=Răspuns la cererea de autorizare
-autoPopup=Deplasează fereastră în prim plan
-awayStatus=Plecat(ă)
-back=&ÃŽnapoi
-ban=&Exclude
-banFailed=Eroare de excludere
-banFailedGeneralError=Eroare de excludere {0}. S-a produs o eroare la server.
-banFailedNotAllowed=Eroare de excludere {0}. Proprietarul sau administratorul conferinței nu a putut fi exclus.
-banFailedNotEnoughPermissions=Eroare de excludere {0}. Nu dispuneți de suficiente privilegii pentru această operație.
-brbMessage=Sunt plecat(ă) momentan, dar mă voi întoarce.
-busyMessage=Scuze, sunt ocupat(ă) momentan.
-call=Apelează
-callVia=Apel via:
-callList=Listă de apeluri 
-cancel=&Anulează
-chatRoomAlreadyJoined= {0} Sunteți deja înscris(ă) la conferință.
-chatRoomConfiguration={0} Configurare conferință
-chatRoomOpenConfigFailed=Eroare la obținerea formularului de configurare a conferinței {0}
-chatRoomOpenConfigForbidden=Eroare la obținerea formularului de configurare a conferinței {0}. Numai administratorii conferinței pot vizualiza și modifica fereastra de configurare.
-chatRoomConfigFormSubmitFailed=A intervenit o eroare la încercarea de transmitere a formularului de configurare a conferinței {0}.
-chatRoomUserJoined=s-a înscris {0}
-chatRoomUserLeft=a plecat {0}
-chatRoomUserKicked=a fost exclus(ă) din {0}
-chatRoomUserQuit=a părăsit {0}
-chatRoomName=Numele conferinței
-chatRoomNameInfo=În câmpul de mai jos introduceți numele conferinței pe care doriți să o creați.
-chatRoomNotExist=Conferința {0} nu a fost gasită pe {1} server. Verificați corectitudinea numelui introdus.
-chatRoomNotConnected=Trebuie să fiți logat pentru a vă înscrie la conferința {0}.
-chatRoomNotJoined=Trebuie să fiți înscris la conferință pentru a efectua alte operații în cadrul acesteia.
-chatRoomOptions=Opțiuni conferință
-chatRoomRegistrationRequired={0} Trebuie să fiți înregistrat(ă) pentru a vă înscrie la conferință.
-chatRoomRequiresPassword={0} Conferința necesită o parolă.
-chatRooms=Conferințe
-chatRoomSubjectChanged={0} a schimbat subiectul la {1}
-close=&ÃŽnchide
-closeChatAfterNewMsg=Ați primit un mesaj acum 2 secunde. Sunteți sigur ca vreți sa terminați conversația ?
-conference=Conferință (Conference)
-configure=&Configurează
-configuration=Configurație
-connectionFailed=Eroare de conexiune
-connectionFailedMessage=Eroare de conexiune pentru contul: Nume utilizator: {0}, Nume server: {1}.
-connectionExpiredMessage=Momentan sunteți deconectat(ă) de la server {0}.
-contactAddress=Adresa contactului
-contactNotSupportingTelephony=Contactul {0} ales nu permite telefonie.
-contactPausedTyping={0} s-a oprit din scrierea mesajului
-contactTyping={0} scrie un mesaj
-contactTypingStateStale=Starea de scriere nu poate fi actualizată
-contacts=Contacte
-continue=&Continuă
-copy=&Copiază
-copyLink=Copiază &legatura
-create=C&rează
-createChatRoom=&Crează conferință...
-createChatRoomNotSupported=Nu s-a putut crea conferința cu numele: {0}. Serverul ales: {1} nu permite această operație.
-createChatRoomError=Nu s-a putut crea conferința cu numele: {0}.
-createChatRoomWizard=Asistent de creare conferințe
-createGroup=&Crează grup
-createGroupName=În câmpul de mai jos introduceți numele grupului pe care doriți să îl creați.
-createFirstGroupWizard=Lista dvs de contacte nu conține nici un grup. Pentru început creați un grup (Fișier/Crează grup).
-cut=&Taie
-date=Dată
-description=Descriere
-dial=&Formează numărul
-dialpad=Panou taste telefonice
-dndStatus=A nu deranja
-doNotAskAgain=A nu întreba din nou
-doNotShowAgain=A nu reafișa mesajul
-dontSupportWebInfo=Acest contact nu dispune de informații pe web
-duration=Durată
-edit=&Editare
-emptyHistory=&Istoric vid
-enableNotifications=Activează notificările
-enableTypingNotifications=Activează notificările de tastare
-error=Eroare
-exit=I&eșire
-extendedCriteria=Criteriu extins
-general=General
-generalError=Eroare Generala
-group=Grup
-groupName=Nume grup
-failedToCreateChatRoom=Nu a fost posibilă crearea conferinței cu numele: {0}.
-failedToJoinChatRoom=Eroare, nu se poate realiza înscrierea la conferința cu numele {0}.
-ffcStatus=Disponibil(ă) pentru chat
-file=&Fișier
-findChatRoomError=Nu s-a putut găsi conferința "{0}" .
-finish=&ÃŽncheiere
-first=Primul
-font=Font
-haveToBeConnectedToJoin=Trebuie să fiți conectat(ă) pentru a vă putea înscrie la o conferință. Conectați-vă și reîncercați.
-haveToBeConnectedToLeave=Trebuie să fiți conectat(ă) pentru a vă putea deconecta de la o conferință.
-help=?
-hideCallPanel=&Ascunde panoul de taste telefonice
-hideMainWindow=Apăsarea butonului X nu va închide aplicația, ci doar o va ascunde. Dacă doriți să închideți aplicația selectați  Fișier/Închide.
-history=&Istoric
-historyContact=Istoric - {0}
-hour=Ora
-identifier=Identificator
-ignore=&Ignoră
-insertSmiley=Inserează smiley
-invalidCall=Apel invalid
-invitation=Motivul invitației
-invitationReceived=Invitație primită
-invitationReceivedFormInfo={0} v-a invitat să vă înscrieți {1} în conferință. Puteți accepta, respinge sau ignora această invitație.
-invite=&Invită
-inviteContactFormInfo=Scrieți numele utilizatorului pe care doriți să-l invitați. Puteți deasemenea preciza motivul invitației.
-inviteContactToChat=Invită contact pentru chat
-join=&ÃŽnscriere
-joinAs=&Înscriere ca și
-joinChatRoom=&Înscriere la conferință ...
-joinChatRoomTitle=Înscriere la conferință
-joinChatRoomName=Introduceți numele conferinței la care doriți să vă înscrieți.
-joinChatRoomWizard=Asistent de înscriere la conferințe
-kick=&Exclude
-kickFailed=Eroare de excludere
-kickFailedGeneralError=Eroare de excludere {0}. A intervenit o eroare generală la server.
-kickFailedNotAllowed=Eroare de excludere {0}. Proprietarul sau administratorul conferinței nu a putut fi exclus.
-kickFailedNotEnoughPermissions=Eroare de excludere {0}. Nu dispuneți de suficiente privilegii pentru această operație.
-last=Ultimul
-launchBrowserError=A intervenit o eroare în încercarea de lansare a navigatorului Web.
-launchOnStartUp=Lansare la pornire
-leave=&ÃŽnchide
-limitReachedForIp=Adresa dvs IP este înregistrată deja de mai multe ori și serverul {0} nu permite alte înregistrari.
-login=&Identificator
-loginNotSucceeded=A intervenit o eroare în încercarea de conectare a contului: Nume utilizator: {0}, Nume server: {1}.
-loginWindowTitle=Conectare la {0}
-logoffNotSucceeded=A intervenit o eroare în încercarea de deconectare a contului: Nume utilizator: {0}, Nume server: {1}.
-me=eu
-modify=&Modificare
-moveSubcontactMsg=Selectați un contact unde doriți să deplasați contactul ales.
-moveSubcontact=D&eplasează subcontact
-moveSubcontactInSameContact=Contactul selectat este același cu contactul sursa. Selectați un alt contact!
-moveToGroup=&Deplasează în cadrul unui grup
-moveContactError=&Contactul nu poate fi deplasat
-msgDeliveryFailure=Mesajul de mai sus nu a putut fi trimis.
-msgDeliveryOfflineNotSupported=Protocolul pe care îl utilizați nu permite transmiterea de mesaje în mod "deconectat". Puteți încerca să accesați acest contact prin intermediul altui protocol sau așteptând momentul în care el/ea va fi conectat(ă).
-msgDeliveryInternalError=A intervenit o eroare internă. Vă rugăm să o raportați aici: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
-msgNotDelivered=A intervenit o problemă în rețea.
-msgReceived={0} v-a trimis un mesaj.
-msgSendConnectionProblem=Trebuie să fiți conectat(ă) pentru a putea trimite mesaje.
-multipleLogins=Sunteți logat(ă) de mai multe ori cu același cont. Următorul cont: Nume utilizator: {0}, Nume server: {1} este momentan deconectat.
-name=Nume
-networkFailure=Eroare de rețea
-next=&Următorul
-new=&Nou
-newAccount=&Cont nou
-newMessage=Mesaj nou...
-newName=Nume nou:
-newStatusMessage=Nou mesaj de status
-no=Nu
-noAccountFound=Pentru a utiliza SIP-Communicator aveți nevoie de cel puțin un cont înregistrat. Următoarele pagini vă vor asista în procesul de creare a unui cont.
-noAvailableRooms=Lista de conferințe pentru acest server nu este disponibilă momentan.
-noMessage=Nici un mesaj
-noMultiChatAccountAvailable=Nu au fost găsite conturi ce permit conversații în cadrul unei conferințe. Consultați  sip-communicator.org pentru mai multe informații privind protocoalele ce permit conferințe.
-nonEmptyChatWindowClose=Sunteți pe punctul de a închide o conversație având un mesaj netrimis. Sunteți sigur că doriți să închideți această conversație ?
-nonExistingUserId=Serverul {0} nu recunoaște identificatorul utilizatorului specificat.
-notifications=Notificări
-ok=&Ok
-offline=Deconectat(ă)
-olderCalls=Apeluri anterioare
-online=Conectat(ă)
-openInBrowser=Deschide in &navigator
-options=Opțiuni
-passwd=Parolă:
-paste=&Lipește
-previous=Anterior
-print=&Imprimă
-protocol=Protocol
-providerNotConnected=Trebuie să fiți conectat(ă) pentru a putea comunica.
-quit=&ÃŽnchide
-ready=Gata
-reason=Motiv
-reconnectionLimitExceeded=V-ați deconectat și reconectat la server prea repede. Următorul cont : Nume utilizator: {0}, Nume server: {1} este exclus momentan. Va trebui să așteptați un moment înainte de a încerca să vă reconectați.
-refresh=Reîncarcă
-registrationTimeout=Expirarea înregistrării:
-reject=&Respinge
-rememberPassword=Reține parola
-remove=&Elimină
-removeAccount=&Elimină cont
-removeAccountMessage=Sunteți sigur că doriți să eliminați acest cont ?
-removeContact=&Elimină subcontact
-removeGroup=&Elimină grup
-rename=&Redenumește
-renameContact=Re&denumește contact
-renameContactWizard=În câmpul de mai jos puteți specifica numele pe care doriți să-l utilizați pentru contactul dat.
-renameGroup=Re&denumește grup
-renameGroupInfo= În câmpul de mai jos puteți specifica numele pe care doriți să-l utilizați pentru grupul dat.
-request=&Cerere
-requestAuthorization=&Cerere de autorizare
-requestAuthorizationInfo={0} nu poate fi adăugat în Lista dvs de contacte. {0} trebuie să autorizeze cererea dvs de a îl/o adăuga. Introduceți cererea dvs mai jos. 
-requestAuthReason=Motivul cererii
-requestAuthReasonEnter=Introduceți motivul cererii
-responseAuthReasonEnter=Introduceți motivul răspunsului
-rootGroup=Rădăcina grupului
-save=&Salvează
-search=&Căutare
-searchForChatRooms=&Caută conferințe
-searchForChatRoomsText=Apăsați butonul de mai jos pentru afișarea tuturor conferințelor existente pe serverul selectat. Alegeți apoi una la care doriți să vă inscrieți și apăsați butonul de înscriere.
-securityAuthorityRealm=Serverul {0} solicită autentificarea dvs.
-selectAccount=Selectează cont
-selectAccountRegistration=Din lista de mai jos selectați asistentul de înregistrare conturi pentru a-l utiliza la crearea noului cont.
-selectAccountRegWizardTitle=Selecție înregistrare cont
-selectGroup=Selecție grup
-selectGroupWizard=Lista de mai jos conține toate grupurile din Lista de contacte. Selectați-l pe acela în care doriți să adăugați noul contact.
-selectGroupWizardTitle=Specificare grup
-selectProvidersForChatRoom=Lista de mai jos conține toate conturile ce permit participarea la conferințe (chat room). Selectați-l pe acela pe care doriți să-l utilizați la crearea propriei conferințe.
-selectProvidersWizard=Lista de mai jos conține toate conturile înregistrate. Selectați-le pe acelea pe care doriți să le utilizați în conversațiile cu noul contact.
-selectProvidersWizardTitle=Selectează contul(conturile)
-send=&Trimite
-sendFile=Trimite &fișier
-selectContactSupportingInfo=Nu există informații pentru acest contact.
-sendMessage=&Trimite un mesaj
-sendAsSms=Trimite ca și SMS
-sendSms=T&rimite SMS
-sendSmsNotSupported=Protocolul selectat nu permite trimiterea de mesaje SMS.
-sendVia=Trimite via
-setStatusMessage=Definește mesajul de status
-settings=&Setări
-showCallPanel=Afișează tastele telefonice
-showChannelsList=Afișează lista canalelor
-showOfflineUsers=Ascunde/Afișează utilizatorii deconectați
-specifyReason=În câmpul de mai jos puteți specifica motivul acestei operații.
-soundOnOff=Activează/ Dezactivează sunetul.
-statusChangedChatMessage=a devenit {0}
-statusChangeGeneralError=Eroare la schimbarea statusului pentru contul: Nume utilizator: {0}, Nume server: {1}, datorită unei probleme generale.
-statusChangeNetworkFailure=Eroare la schimbarea statusului pentru contul: Nume utilizator: {0}, Nume server: {1}, datorită unei probleme de rețea.
-statusMessageInfo=În câmpul de mai jos puteți specifica noul mesaj pe care doriți să-l utilizați.
-subject=Subiect
-summary=Sumar
-today=Astăzi
-tools=&Unelte
-typeYourRequest=Introduceți aici cererea dvs.
-uin=User identifier:
-unknown=Utilizator necunoscut
-useCtrlEnterToSend=Utilizează Ctrl-&Enter pentru trimitere
-msgDeliveryFailedUnknownError=O eroare necunoscută a intervenit în timpul trimiterii mesajului dvs.
-unregisteredMessage=Conexiune imposibilă pentru contul: Nume utilizator: {0}, Nume Server: {1}. Momentan sunteți deconectat(ă) 
-updateAutomatically=Instalează automat actualizările
-updates=Actualizări
-userInfo=&Informații utilizator
-view=&Vizualizare
-viewHistory=Vizualizează &istoric
-warning=Avertisment
-yes=Da
-yesterday=Ieri
+service.gui.ABOUT=&Despre
+service.gui.ACCEPT=&Acceptă
+service.gui.ACCOUNT=Cont
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Asistent de înregistrare conturi
+service.gui.ACCOUNTS=Conturi
+service.gui.ADD=&Adaugă
+service.gui.ADD_CONTACT=&Adaugă contact
+service.gui.ADD_CONTACT_ERROR=Nu s-a putut adăuga contactul având id: {0}
+service.gui.ADD_CONTACT_ERROR_TITLE=Eroare la adăugarea contactului
+service.gui.ADD_CONTACT_EXIST_ERROR=Contactul {0} există deja în lista dvs de contacte.
+service.gui.ADD_CONTACT_IDENTIFIER=În câmpul de mai jos introduceți identificatorul contactului pe care doriți să îl adăugați.
+service.gui.ADD_CONTACT_WIZARD=Asistent de adăugare contact
+service.gui.ADD_GROUP_LOCAL_ERROR=Nu s-a putut adăuga grupul cu numele: {0}. Problema a intervenit în timpul unei operații I/O.
+service.gui.ADD_GROUP_NET_ERROR=Nu s-a putut adăuga grupul cu numele: {0}. Problema se datorează unei erori de rețea. Verificați conexiunea la rețea și reîncercați.
+service.gui.ADD_GROUP_ERROR=Nu s-a putut adăuga grupul cu numele: {0}.
+service.gui.ADD_GROUP=Eroare la Adăugare grup
+service.gui.ADD_GROUP_EXIST_ERROR=Grupul {0} există deja în lista dvs de contacte.
+service.gui.ADD_SUBCONTACT=&Adaugă subcontact
+service.gui.ALL=&Toate
+service.gui.ALL_CONTACTS=&Toate contactele
+service.gui.APPLY=&Aplică
+service.gui.AT=la
+service.gui.AUTHORIZATION_ACCEPTED=Contactul a acceptat cererea dvs de autorizare.
+service.gui.AUTHENTICATION_WINDOW_TITLE=Autentificare obligatorie
+service.gui.AUTHENTICATION_REJECTED=Contactul a refuzat cererea dvs de autorizare.
+service.gui.AUTHORIZATION_REQUESTED=Autorizare obligatorie
+service.gui.AUTHORIZATION_REQUESTED_INFO=Contactul {0} vă cere permisiunea.
+service.gui.AUTHENTICATION_FAILED=Eroare de autentificare pentru contul: Nume utilizator: {0}, Nume server: {1}. Parola introdusă nu este validă.
+service.gui.AUTHORIZATION_RESPONSE=Răspuns la cererea de autorizare
+service.gui.BAN=&Exclude
+service.gui.BAN_FAILED=Eroare de excludere
+service.gui.BAN_FAILED_GENERAL_ERROR=Eroare de excludere {0}. S-a produs o eroare la server.
+service.gui.BAN_FAILED_NOT_ALLOWED=Eroare de excludere {0}. Proprietarul sau administratorul conferinței nu a putut fi exclus.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Eroare de excludere {0}. Nu dispuneți de suficiente privilegii pentru această operație.
+service.gui.BRB_MESSAGE=Sunt plecat(ă) momentan, dar mă voi întoarce.
+service.gui.BUSY_MESSAGE=Scuze, sunt ocupat(ă) momentan.
+service.gui.CALL=Apelează
+service.gui.CALL_VIA=Apel via:
+service.gui.CANCEL=&Anulează
+service.gui.CHAT_ROOM_ALREADY_JOINED= {0} Sunteți deja înscris(ă) la conferință.
+service.gui.CHAT_ROOM_CONFIGURATION={0} Configurare conferință
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Eroare la obținerea formularului de configurare a conferinței {0}
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Eroare la obținerea formularului de configurare a conferinței {0}. Numai administratorii conferinței pot vizualiza și modifica fereastra de configurare.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=A intervenit o eroare la încercarea de transmitere a formularului de configurare a conferinței {0}.
+service.gui.CHAT_ROOM_USER_JOINED=s-a înscris {0}
+service.gui.CHAT_ROOM_USER_LEFT=a plecat {0}
+service.gui.CHAT_ROOM_USER_KICKED=a fost exclus(ă) din {0}
+service.gui.CHAT_ROOM_USER_QUIT=a părăsit {0}
+service.gui.CHAT_ROOM_NAME=Numele conferinței
+service.gui.CHAT_ROOM_NAME_INFO=În câmpul de mai jos introduceți numele conferinței pe care doriți să o creați.
+service.gui.CHAT_ROOM_NOT_EXIST=Conferința {0} nu a fost gasită pe {1} server. Verificați corectitudinea numelui introdus.
+service.gui.CHAT_ROOM_NOT_CONNECTED=Trebuie să fiți logat pentru a vă înscrie la conferința {0}.
+service.gui.CHAT_ROOM_NOT_JOINED=Trebuie să fiți înscris la conferință pentru a efectua alte operații în cadrul acesteia.
+service.gui.CHAT_ROOM_OPTIONS=Opțiuni conferință
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED={0} Trebuie să fiți înregistrat(ă) pentru a vă înscrie la conferință.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD={0} Conferința necesită o parolă.
+service.gui.CHAT_ROOMS=Conferințe
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} a schimbat subiectul la {1}
+service.gui.CLOSE=&ÃŽnchide
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Ați primit un mesaj acum 2 secunde. Sunteți sigur ca vreți sa terminați conversația ?
+service.gui.OPTIONS=&Configurează
+service.gui.CONNECTION_EXPIRED_MSG=Momentan sunteți deconectat(ă) de la server {0}.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Contactul {0} ales nu permite telefonie.
+service.gui.CONTACT_PAUSED_TYPING={0} s-a oprit din scrierea mesajului
+service.gui.CONTACT_TYPING={0} scrie un mesaj
+service.gui.CONTACT_TYPING_STATE_STALE=Starea de scriere nu poate fi actualizată
+service.gui.CONTACTS=Contacte
+service.gui.COPY=&Copiază
+service.gui.COPY_LINK=Copiază &legatura
+service.gui.CREATE=C&rează
+service.gui.CREATE_CHAT_ROOM=&Crează conferință...
+service.gui.CREATE_CHAT_ROOM_ERROR=Nu s-a putut crea conferința cu numele: {0}.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Asistent de creare conferințe
+service.gui.CREATE_GROUP=&Crează grup
+service.gui.CREATE_GROUP_NAME=În câmpul de mai jos introduceți numele grupului pe care doriți să îl creați.
+service.gui.CREATE_FIRST_GROUP_WIZARD=Lista dvs de contacte nu conține nici un grup. Pentru început creați un grup (Fișier/Crează grup).
+service.gui.CUT=&Taie
+service.gui.DATE=Dată
+service.gui.DIALPAD=Panou taste telefonice
+service.gui.DND_STATUS=A nu deranja
+service.gui.DO_NOT_ASK_AGAIN=A nu întreba din nou
+service.gui.DO_NOT_SHOW_AGAIN=A nu reafișa mesajul
+service.gui.CONTACT_INFO_NOT_SUPPORTED=Acest contact nu dispune de informații pe web
+service.gui.DURATION=Durată
+service.gui.EDIT=&Editare
+service.gui.EMPTY_HISTORY=&Istoric vid
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Activează notificările de tastare
+service.gui.ERROR=Eroare
+service.gui.EXIT=I&eșire
+service.gui.EXTENDED_CRITERIA=Criteriu extins
+service.gui.GENERAL=General
+service.gui.GENERAL_ERROR=Eroare Generala
+service.gui.GROUP_NAME=Nume grup
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Eroare, nu se poate realiza înscrierea la conferința cu numele {0}.
+service.gui.FFC_STATUS=Disponibil(ă) pentru chat
+service.gui.FILE=&Fișier
+service.gui.FINISH=&ÃŽncheiere
+service.gui.FONT=Font
+service.gui.CHAT_ROOM_NOT_CONNECTED=Trebuie să fiți conectat(ă) pentru a vă putea înscrie la o conferință. Conectați-vă și reîncercați.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Trebuie să fiți conectat(ă) pentru a vă putea deconecta de la o conferință.
+service.gui.HELP=?
+service.gui.HIDE_MAIN_WINDOW=Apăsarea butonului X nu va închide aplicația, ci doar o va ascunde. Dacă doriți să închideți aplicația selectați  Fișier/Închide.
+service.gui.HISTORY=&Istoric
+service.gui.HISTORY_CONTACT=Istoric - {0}
+service.gui.HOUR=Ora
+service.gui.IDENTIFIER=Identificator
+service.gui.IGNORE=&Ignoră
+service.gui.INSERT_SMILEY=Inserează smiley
+service.gui.INVITATION=Motivul invitației
+service.gui.INVITATION_RECEIVED=Invitație primită
+service.gui.INVITATION_RECEIVED_MSG={0} v-a invitat să vă înscrieți {1} în conferință. Puteți accepta, respinge sau ignora această invitație.
+service.gui.INVITE=&Invită
+service.gui.INVITE_CONTACT_MSG=Scrieți numele utilizatorului pe care doriți să-l invitați. Puteți deasemenea preciza motivul invitației.
+service.gui.INVITE_CONTACT_TO_CHAT=Invită contact pentru chat
+service.gui.JOIN=&ÃŽnscriere
+service.gui.JOIN_AS=&Înscriere ca și
+service.gui.JOIN_CHAT_ROOM=&Înscriere la conferință ...
+service.gui.JOIN_CHAT_ROOM_TITLE=Înscriere la conferință
+service.gui.JOIN_CHAT_ROOM_NAME=Introduceți numele conferinței la care doriți să vă înscrieți.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Asistent de înscriere la conferințe
+service.gui.KICK=&Exclude
+service.gui.KICK_FAILED=Eroare de excludere
+service.gui.KICK_FAILED_GENERAL_ERROR==Eroare de excludere {0}. A intervenit o eroare generală la server.
+service.gui.KICK_FAILED_NOT_ALLOWED=Eroare de excludere {0}. Proprietarul sau administratorul conferinței nu a putut fi exclus.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Eroare de excludere {0}. Nu dispuneți de suficiente privilegii pentru această operație.
+service.gui.LAST=Ultimul
+service.gui.LEAVE=&ÃŽnchide
+service.gui.LIMIT_REACHED_FOR_IP=Adresa dvs IP este înregistrată deja de mai multe ori și serverul {0} nu permite alte înregistrari.
+service.gui.LOGIN=&Identificator
+service.gui.LOGIN_WINDOW_TITLE=Conectare la {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=A intervenit o eroare în încercarea de deconectare a contului: Nume utilizator: {0}, Nume server: {1}.
+service.gui.ME=eu
+service.gui.MODIFY=&Modificare
+service.gui.MOVE_SUBCONTACT_MSG=Selectați un contact unde doriți să deplasați contactul ales.
+service.gui.MOVE_SUBCONTACT=D&eplasează subcontact
+service.gui.MOVE_SUBCONTACT_FAILED=Contactul selectat este același cu contactul sursa. Selectați un alt contact!
+service.gui.MOVE_TO_GROUP=&Deplasează în cadrul unui grup
+service.gui.MOVE_CONTACT_ERROR=&Contactul nu poate fi deplasat
+service.gui.MSG_DELIVERY_FAILURE=Mesajul de mai sus nu a putut fi trimis.
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=Protocolul pe care îl utilizați nu permite transmiterea de mesaje în mod "deconectat". Puteți încerca să accesați acest contact prin intermediul altui protocol sau așteptând momentul în care el/ea va fi conectat(ă).
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=A intervenit o eroare internă. Vă rugăm să o raportați aici: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
+service.gui.MSG_NOT_DELIVERED=A intervenit o problemă în rețea.
+service.gui.MSG_RECEIVED={0} v-a trimis un mesaj.
+service.gui.MSG_SEND_CONNECTION_PROBLEM=Trebuie să fiți conectat(ă) pentru a putea trimite mesaje.
+service.gui.MULTIPLE_LOGINS=Sunteți logat(ă) de mai multe ori cu același cont. Următorul cont: Nume utilizator: {0}, Nume server: {1} este momentan deconectat.
+service.gui.NETWORK_FAILURE=Eroare de rețea
+service.gui.NEXT=&Următorul
+service.gui.NEW=&Nou
+service.gui.NEW_ACCOUNT=&Cont nou
+service.gui.NEW_MESSAGE=Mesaj nou...
+service.gui.NEW_NAME=Nume nou:
+service.gui.NO=Nu
+service.gui.NO_AVAILABLE_ROOMS=Lista de conferințe pentru acest server nu este disponibilă momentan.
+service.gui.NO_MESSAGE=Nici un mesaj
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Nu au fost găsite conturi ce permit conversații în cadrul unei conferințe. Consultați  sip-communicator.org pentru mai multe informații privind protocoalele ce permit conferințe.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Sunteți pe punctul de a închide o conversație având un mesaj netrimis. Sunteți sigur că doriți să închideți această conversație ?
+service.gui.NON_EXISTING_USER_ID=Serverul {0} nu recunoaște identificatorul utilizatorului specificat.
+service.gui.NOTIFICATIONS=Notificări
+service.gui.OK=&Ok
+service.gui.OFFLINE=Deconectat(ă)
+service.gui.OLDER_CALLS=Apeluri anterioare
+service.gui.ONLINE=Conectat(ă)
+service.gui.OPEN_IN_BROWSER=Deschide in &navigator
+service.gui.PASSWORD=Parolă:
+service.gui.PASTE=&Lipește
+service.gui.PREVIOUS=Anterior
+service.gui.PRINT=&Imprimă
+service.gui.PROTOCOL=Protocol
+service.gui.QUIT=&ÃŽnchide
+service.gui.READY=Gata
+service.gui.REASON=Motiv
+service.gui.RECONNECTION_LIMIT_EXCEEDED=V-ați deconectat și reconectat la server prea repede. Următorul cont : Nume utilizator: {0}, Nume server: {1} este exclus momentan. Va trebui să așteptați un moment înainte de a încerca să vă reconectați.
+service.gui.REJECT=&Respinge
+service.gui.REMEMBER_PASSWORD=Reține parola
+service.gui.REMOVE=&Elimină
+service.gui.REMOVE_ACCOUNT=&Elimină cont
+service.gui.REMOVE_ACCOUNT_MESSAGE=Sunteți sigur că doriți să eliminați acest cont ?
+service.gui.REMOVE_CONTACT=&Elimină subcontact
+service.gui.REMOVE_GROUP=&Elimină grup
+service.gui.RENAME=&Redenumește
+service.gui.RENAME_CONTACT=Re&denumește contact
+service.gui.RENAME_CONTACT_WIZARD=În câmpul de mai jos puteți specifica numele pe care doriți să-l utilizați pentru contactul dat.
+service.gui.RENAME_GROUP=Re&denumește grup
+service.gui.RENAME_GROUP_INFO= În câmpul de mai jos puteți specifica numele pe care doriți să-l utilizați pentru grupul dat.
+service.gui.REQUEST=&Cerere
+service.gui.REQUEST_AUTHORIZATION=&Cerere de autorizare
+service.gui.REQUEST_AUTHORIZATION_MSG={0} nu poate fi adăugat în Lista dvs de contacte. {0} trebuie să autorizeze cererea dvs de a îl/o adăuga. Introduceți cererea dvs mai jos. 
+service.gui.ROOT_GROUP=Rădăcina grupului
+service.gui.SAVE=&Salvează
+service.gui.SEARCH=&Căutare
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Apăsați butonul de mai jos pentru afișarea tuturor conferințelor existente pe serverul selectat. Alegeți apoi una la care doriți să vă inscrieți și apăsați butonul de înscriere.
+service.gui.SECURITY_AUTHORITY_REALM=Serverul {0} solicită autentificarea dvs.
+service.gui.SELECT_ACCOUNT=Selectează cont
+service.gui.SELECT_GROUP=Selecție grup
+service.gui.SELECT_GROUP_WIZARD_MSG=Lista de mai jos conține toate grupurile din Lista de contacte. Selectați-l pe acela în care doriți să adăugați noul contact.
+service.gui.SELECT_GROUP_WIZARD=Specificare grup
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Lista de mai jos conține toate conturile ce permit participarea la conferințe (chat room). Selectați-l pe acela pe care doriți să-l utilizați la crearea propriei conferințe.
+service.gui.SELECT_PROVIDERS_WIZARD_MSG=Lista de mai jos conține toate conturile înregistrate. Selectați-le pe acelea pe care doriți să le utilizați în conversațiile cu noul contact.
+service.gui.SELECT_PROVIDERS_WIZARD=Selectează contul(conturile)
+service.gui.SEND=&Trimite
+service.gui.SEND_FILE=Trimite &fișier
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=Nu există informații pentru acest contact.
+service.gui.SEND_MESSAGE=&Trimite un mesaj
+service.gui.SEND_AS_SMS=Trimite ca și SMS
+service.gui.SEND_SMS=T&rimite SMS
+service.gui.SEND_SMS_NOT_SUPPORTED=Protocolul selectat nu permite trimiterea de mesaje SMS.
+service.gui.SEND_VIA=Trimite via
+service.gui.SET_STATUS_MESSAGE=Definește mesajul de status
+service.gui.SETTINGS=&Setări
+service.gui.SPECIFY_REASON==În câmpul de mai jos puteți specifica motivul acestei operații.
+service.gui.SOUND_ON_OFF=Activează/ Dezactivează sunetul.
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=a devenit {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Eroare la schimbarea statusului pentru contul: Nume utilizator: {0}, Nume server: {1}, datorită unei probleme generale.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=Eroare la schimbarea statusului pentru contul: Nume utilizator: {0}, Nume server: {1}, datorită unei probleme de rețea.
+service.gui.STATUS_MESSAGE_INFO=În câmpul de mai jos puteți specifica noul mesaj pe care doriți să-l utilizați.
+service.gui.SUBJECT=Subiect
+service.gui.SUMMARY=Sumar
+service.gui.TODAY=Astăzi
+service.gui.TOOLS=&Unelte
+service.gui.TYPE_YOUR_REQUEST=Introduceți aici cererea dvs.
+service.gui.USER_IDENTIFIER=User identifier:
+service.gui.UNKNOWN=Utilizator necunoscut
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=O eroare necunoscută a intervenit în timpul trimiterii mesajului dvs.
+service.gui.UNREGISTERED_MESSAGE=Conexiune imposibilă pentru contul: Nume utilizator: {0}, Nume Server: {1}. Momentan sunteți deconectat(ă) 
+service.gui.VIEW=&Vizualizare
+service.gui.VIEW_HISTORY=Vizualizează &istoric
+service.gui.WARNING=Avertisment
+service.gui.YES=Da
+service.gui.YESTERDAY=Ieri
 
-january=Ian
-february=Feb
-march=Mar
-april=Apr
-may=Mai
-june=Iun
-july=Iul
-august=Aug
-september=Sep
-october=Oct
-november=Nov
-december=Dec
+service.gui.JANUARY=Ian
+service.gui.FEBRUARY=Feb
+service.gui.MARCH=Mar
+service.gui.APRIL=AprApr
+service.gui.MAY=MayMai
+service.gui.JUNE=JunIun
+service.gui.JULY=JulIul
+service.gui.AUGUST=AugAug
+service.gui.SEPTEMBER=SepSep
+service.gui.OCTOBER=OctOct
+service.gui.NOVEMBER=NovNov
+service.gui.DECEMBER=DecDec
 
 # ZRTP Securing
-toggleOffSecurity=DeactiveazÄ? modul securizat
-toggleOnSecurity=ActiveazÄ? modul securizat
-engineInitFailure=Eroare la iniÈ?ializare
-allowClearRequestFailure=Nu este suportatÄ? anularea securizÄ?rii
-defaultSASTooltip=Cîmp de stare al securizÄ?rii
-defaultSASMessage= Inactiv 
-sasSecuredTooltip=ConsultaÈ?i acest string prin voce cu interlocutorul pentru a verifica securizarea
-sasSecuredMessage=Securizat: 
-sasNotSecuredTooltip=Mod securizat neactivat
-sasNotSecuredMessage=Nesecurizat
-sasEngineFailTooltip=Securizare eÈ?uatÄ? la iniÈ?ializare
-sasEngineFailMessage=Securizare eÈ?uatÄ?
-sasSecuringFailTooltip=Securizarea apelului eÈ?uatÄ?
-sasUnsecuredAtRequestTooltip=Securizare anulatÄ? la cerere
-peerUnsuportedSecurity=<html>Modul securizat a fost activat<br/>Nu puteÈ?i schimba acest mod la acest moment<br/>Oricum apelul nu este încÄ? securizat</html>
-sasPeerUnsuportedTooltip=Securizarea apelului nu este suportatÄ?/activatÄ? de interlocutor
-peerToggledOffSecurityMessage=Interlocutorul a anulat modul securizat
-peerToggledOffSecurityCaption=Mod securizat anulat
-sasUnsecuredAtPeerRequestTooltip=Securizarea apelului anulatÄ? la cererea interlocutorului
+impl.media.security.TOGGLE_OFF_SECURITY=DeactiveazÄ? modul securizat
+impl.media.security.TOGGLE_ON_SECURITY=ActiveazÄ? modul securizat
+impl.media.security.ENGINE_INIT_FAILURE=Eroare la iniÈ?ializare
+impl.media.security.ALLOW_CLEAR_REQUEST_FAILURE=Nu este suportatÄ? anularea securizÄ?rii
+impl.media.security.DEFAULT_TOOLTIP=Cîmp de stare al securizÄ?rii
+impl.media.security.DEFAULT_MESSAGE=Inactiv 
+impl.media.security.SECURED_TOOLTIP=ConsultaÈ?i acest string prin voce cu interlocutorul pentru a verifica securizarea
+impl.media.security.SECURED_MESSAGE=Securizat: 
+impl.media.security.NOT_SECURED_TOOLTIP=Mod securizat neactivat
+impl.media.security.NOT_SECURED_MESSAGE=Nesecurizat
+impl.media.security.ENGINE_FAIL_TOOLTIP=Securizare eÈ?uatÄ? la iniÈ?ializare
+impl.media.security.ENGINE_FAIL_MESSAGE=Securizare eÈ?uatÄ?
+impl.media.security.SECURING_FAIL_TOOLTIP=Securizarea apelului eÈ?uatÄ?
+impl.media.security.UNSECURED_AT_REQUEST=Securizare anulatÄ? la cerere
+impl.media.security.PEER_UNSUPPORTED_SECURITY=<html>Modul securizat a fost activat<br/>Nu puteÈ?i schimba acest mod la acest moment<br/>Oricum apelul nu este încÄ? securizat</html>
+impl.media.security.PEER_UNSUPPORTED_TOOLTIP=Securizarea apelului nu este suportatÄ?/activatÄ? de interlocutor
+impl.media.security.PEER_TOGGLED_OFF_SECURITY_MESSAGE=Interlocutorul a anulat modul securizat
+impl.media.security.PEER_TOGGLED_OFF_SECURITY_SECTION=Mod securizat anulat
+impl.media.security.UNSECURED_AT_PEER_REQUEST_TOOLTIP=Securizarea apelului anulatÄ? la cererea interlocutorului
 
diff --git a/resources/languages/resources_zh_CN.properties b/resources/languages/resources_zh_CN.properties
index 3388411..a0cd327 100644
--- a/resources/languages/resources_zh_CN.properties
+++ b/resources/languages/resources_zh_CN.properties
@@ -10,298 +10,248 @@
 # "Preferences/General/Content Types/Text/Java Properties File/Default encoding"
 # from "ISO-8859-1" to "UTF-8"
 
-about=&关于
-accept=&接�
-account=��
-accountRegistrationWizard=��注册�导
-accounts=��
-activateOnlyWhenMinimized=最�化窗���用
-add=&添加
-addContact=&添加�系人
-addContactError=添加�系人 {0} 失败
-addContactErrorTitle=添加�系人错误
-addContactExistError=�系人 {0} 已�存在于您的�系人��中了
-addContactIdentifier=请在下�输入�中输入您想�添加的�系人的称呼.
-addContactWizard=添加�系人�导
-addGroupLocalError=添加组 {0} 失败. 错误出自本地读写�作.
-addGroupNetError=添加组 {0} 失败. 错误出自网络错误. 请检查您的网络设置,然��试.
-addGroupError=添加组 {0} 失败
-addGroupErrorTitle=添加组错误
-addGroupExistError=组 {0} 已�存在于您的�系人��中了.
-addSubcontact=&添加所属�系人
-all=&清�
-allContacts=&所有�系人
-alwaysOnTop=窗�最�显示
-appearance=外观
-application=应用
-apply=&应用
-at=在
-authAccepted=�系人已�接�您的加为好�请求.
-authenticationWindowTitle=身份验�
-authRejected=�系人已�拒�您的加为好�请求.
-authorizationRequested=请求加为好�
-authorizationRequestedInfo=�系人 {0} 请求加为好�.
-authenticationFailed=以下��身份验�失败: 用户�: {0}, �务器�: {1}. 您输入的密�错误.
-authorizationResponse=加为好�请求回�
-autoPopup=窗�置顶
-awayStatus=离开
-back=&回�
-ban=&�止
-banFailed=�止�作失败
-banFailedGeneralError=阻止 {0} 失败. �务器错误.
-banFailedNotAllowed=阻止 {0} 失败. �天室的创建人或管�员�能被�止.
-banFailedNotEnoughPermissions=阻止 {0} 失败. 您没有��.
-brbMessage=本人目��在,�过马上回�.
-busyMessage=抱歉,目�很忙.
-call=呼�
-callVia=转接呼�:
-callList=呼���
-cancel=&�消
-chatRoomAlreadyJoined=已加入�天室 {0}.
-chatRoomConfiguration=�天室 {0} 属性�置
-chatRoomOpenConfigFailed=获��天室 {0} �置失败.
-chatRoomOpenConfigForbidden=获��天室 {0} �置失败, �有本�天室管�员能进行�置�作.
-chatRoomConfigFormSubmitFailed=�交�天室 {0} �置失败, �生错误.
-chatRoomUserJoined=已加入 {0}
-chatRoomUserLeft=已离开 {0}
-chatRoomUserKicked=被�出 {0}
-chatRoomUserQuit=已退出 {0}
-chatRoomName=�天室�
-chatRoomNameInfo=请在下�输入�中输入您想�创建的�天室�.
-chatRoomNotExist=在�务器 {1} 上找�到�天室 {0}. 请检查你的输入是�正确.
-chatRoomNotConnected=您需�先登录, 然��能进入�天室 {0}.
-chatRoomNotJoined=您需�先进入�天室, 然��能�进一步�作.
-chatRoomOptions=�天室选项
-chatRoomRegistrationRequired=需�注册�能加入�天室 {0}.
-chatRoomRequiresPassword=输入密�, 然�进入�天室 {0}.
-chatRooms=�天室
-chatRoomSubjectChanged={0} 已�更�了新主题 {1}
-close=C&关闭
-closeChatAfterNewMsg=您刚收到新消�, 是��结�本次�天?
-conference=会议
-configure=&�置
-configuration=�置
-connectionFailed=连接失败
-connectionFailedMessage=账�登录失败: 用户�: {0}, �务器�: {1}.
-connectionExpiredMessage=您已�断开了与�务器 {0} 的连接.
-contactAddress=�系人地�
-contactNotSupportingTelephony=您选择的�系人  {0} �支�通�.
-contactPausedTyping={0} �止输入
-contactTyping={0} 正在输入
-contactTypingStateStale=输入状�未知
-contactInfo=&�系人信�
-contacts=�系人
-continue=&继续
-copy=&�制
-copyLink=�制 &链接
-create=C&新建
-createChatRoom=&创建�天室...
-createChatRoomNotSupported=创建�天室 {0} 失败. 您选择的�务器 {1} �支�此�作.
-createChatRoomError=创建�天室 {0} 失败.
-createChatRoomWizard=�天室新建�导
-createGroup=&新建组
-createGroupName=请在下�输入�中输入您想�创建的组�.
-createFirstGroupWizard=您的�系人��中没有任何组. 请创建一个组 (文件/新建组).
-cut=C&剪切
-date=日期
-description=说明
-dial=&拨�
-dialpad=拨���
-dndStatus=请别打扰
-doNotAskAgain=请����询问
-doNotShowAgain=请����此消�
-dontSupportWebInfo=该�系人�支�网络�片
-duration=�续时间
-edit=&编辑
-emptyHistory=&清空历�
-enableNotifications=�用�示功能
-enableTypingNotifications=�用 &输入�示
-error=错误
-exit=E&退出
-extendedCriteria=延时标准
-general=通用
-generalError=一般错误
-group=组
-groupName=组�
-failedToCreateChatRoom=创建�天室 {0} 失败.
-failedToJoinChatRoom=加入�天室 {0} 失败.
-ffcStatus=�以�天了
-file=&文件
-findChatRoomError=找�到�天室 "{0}".
-finish=&完�
-first=第一个
-font=字体
-haveToBeConnectedToJoin=您必须先登录上�务器�能加入�天室, 请登录��试.
-haveToBeConnectedToLeave=您必须先登录上�务器�能退出�天室.
-help=帮助
-hideCallPanel=&��呼�控制��
-hideMainWindow=点击快�键 X ��窗�. 如果需�退出, 请选择 文件/退出.
-history=&历�
-historyContact=历�记录 - {0}
-hour=æ—¶
-identifier=称呼
-ignore=&忽略
-info=信�
-insertSmiley=�入�图标
-invalidCall=无效/错误 呼�
-invitation=邀请
-invitationReceived=收到邀请
-invitationReceivedFormInfo={0} 邀请 {1} 加入�天室. 您�以选择��, 拒�或者忽略这个邀请.
-invite=&邀请
-inviteContactFormInfo=如果想进行精确查找, 请输入该用户的�称.
-inviteContactToChat=邀请其他�系人加入�天
-join=&加入
-joinAs=J&选择�称加入
-joinChatRoom=&加入�天室...
-joinChatRoomTitle=加入�天室
-joinChatRoomName=请输入您想加入的�天室的�称.
-joinChatRoomWizard=�天室加入�导
-kick=&驱�
-kickFailed=驱��作失败
-kickFailedGeneralError=驱� {0} 失败, �务器出错.
-kickFailedNotAllowed=驱� {0} 失败, �天室的创建人或管�员�能被驱�.
-kickFailedNotEnoughPermissions=驱� {0} 失败, 您没有��.
-last=上一个
-launchBrowserError=打开�览器出错.
-launchOnStartUp=�动程�时打开�览器
-leave=&离开
-limitReachedForIp=本地IP地�注册账户过多, �务器 {0} �能接�更多注册.
-login=&登录
-loginNotSucceeded=登录账户出错: 用户�: {0}, �务器�: {1}.
-loginWindowTitle=登录 {0}
-logoffNotSucceeded=退出账户出错: 用户�: {0}, �务器�: {1}.
-me=我
-modify=&修改
-moveSubcontactMsg=请选择你想�移动�系人到哪个地方.
-moveSubcontact=M&移动所属�系人
-moveSubcontactInSameContact=您选择的�系人已�存在, 请�新选择!
-moveToGroup=&移动到组
-moveContactError=&�系人�能被移动
-msgDeliveryFailure=上�消���失败
-msgDeliveryOfflineNotSupported=您正在使用的�议�支�离线消�. 请�试其他�议或者等待该用户上线.
-msgDeliveryInternalError=内部出错. �能是程�自身错误. 请��您的错误报告到: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
-msgNotDelivered=网络错误.
-msgReceived={0} ��消�给你了
-msgSendConnectionProblem=请先登录�务器, 然���消�.
-multipleLogins=账�在其他地方登录, 本地连接断开: 用户�: {0}, �务器: {1}.
-name=�称
-networkFailure=网络错误
-next=&下一个
-new=&新建
-newAccount=&新建账�
-newMessage=新消�...
-newName=新�称:
-newStatusMessage=新状�的�述
-no=�
-noAccountFound=使用 SIP-Communicator 之�必须创建至少一个账户. 下�的�导将帮助您创建一个新账户.
-noAvailableRooms=该�务器上的�天室清�暂时��获得.
-noMessage=没有消�
-noMultiChatAccountAvailable=支�群�. 进入 sip-communicator.org 查找更多支�群�的�议.
-nonEmptyChatWindowClose=消�还没有��出去, 是�一定退出?
-nonExistingUserId=�务器 {0} �能识别用户身份.
-notifications=通知
-ok=&OK
-offline=离线
-olderCalls=之�的通�
-online=在线
-openInBrowser=在 &�览器 中打开
-options=选项
-passwd=密�:
-paste=&粘贴
-previous=上一个
-print=&打�
-protocol=�议
-providerNotConnected=必须登录�务器��能通信.
-quit=&退出
-ready=就绪
-reason=原因
-reconnectionLimitExceeded=该账户多次��登录�务器: 用户�: {0}, �务器�: {1} 目�已�被�止, 请等待一段时间��试.
-refresh=刷新
-registrationTimeout=账户注册已到期:
-reject=&拒�
-rememberPassword=记�密�
-remove=&删除
-removeAccount=&删除账户
-removeAccountMessage=确认删除该账户?
-removeContact=&删除所属�系人
-removeGroup=&删除组
-rename=&�命�
-renameContact=Re&�命��系人
-renameContactWizard=请在下�的输入�中输入您对该�系人的新�称.
-renameGroup=Re&�命�组
-renameGroupInfo=请在下�的输入�中输入您对该组的新�称.
-request=&请求
-requestAuthorization=&请求加为好�
-requestAuthorizationInfo=�能添加 {0} 到您的�系人��. 必须等待 {0} 加您为他/她的好�. 请输入您的请求信�.
-requestAuthReason=请求原因
-requestAuthReasonEnter=请输入您的请求
-responseAuthReasonEnter=请输入您的回答
-rootGroup=最上级组
-save=&�存
-search=&�索
-searchForChatRooms=&�索�天室
-searchForChatRoomsText=点击按键显示�务器上所有�天室, 然�选择您感兴趣的�天室, 点击加入.
-securityAuthorityRealm=�务器 {0} �求验�您的身份.
-selectAccount=选择账户
-selectAccountRegistration=请通过下�的账户注册�导, 创建新的账户.
-selectAccountRegWizardTitle=选择账户注册
-selectGroup=选择组
-selectGroupWizard=下�的��中包�您所有�系人组, 请选择一个, 然�加入新的�系人.
-selectGroupWizardTitle=指示组�
-selectProvidersForChatRoom=下�的��中包�所有支�群�的账户. 请选择一个, 然�创建您的�天室.
-selectProvidersWizard=下�的��中包�您所有的注册账户. 请选择一个和新�系人对�.
-selectProvidersWizardTitle=选择账户
-send=&��
-sendFile=�� &文件
-selectContactSupportingInfo=没有该�系人信�.
-sendMessage=&��消�
-sendAsSms=作为手机短信, ��消�
-sendSms=S&��手机短信
-sendSmsNotSupported=您选择的�议�支���手机短信.
-sendVia=转�消�
-setStatusMessage=设置状�信�
-settings=&设置
-showCallPanel=显示呼�控制��
-showChannelsList=显示频�清�
-showOffline=离线状�
-showOfflineUsers=��/显示 离线用户
-specifyReason=请在下�输入�输入您此次�作的原因.
-sound=声音
-soundOnOff=打开/关闭 声音
-statusChangedChatMessage={0} 已上线
-statusChangeGeneralError=未知错误, 账�状�更新失败: 用户�: {0}, �务器�: {1}.
-statusChangeNetworkFailure=网络错误, 账�状�更新失败: 用户�: {0}, �务器�: {1}.
-statusMessageInfo=请在下�输入�输入您的新状�信�.
-subject=主题
-summary=概�
-today=今天
-tools=&工具
-typeYourRequest=请在这里输入您的请求
-uin=User identifier:
-unknown=未知用户
-useCtrlEnterToSend=使用组�键 Ctrl-&Enter ��消�
-msgDeliveryFailedUnknownError=��消�失败, 未知错误.
-unregisteredMessage=登录账户失败: 用户�: {0}, �务器: {1}. 您现在处于离线状�.
-updateAutomatically=自动安装更新
-updates=æ›´æ–°
-view=&查看
-viewHistory=查看 &历�
-warning=警告
-yes=是
-yesterday=昨天
+service.gui.ABOUT=&关于
+service.gui.ACCEPT=&接�
+service.gui.ACCOUNT=��
+service.gui.ACCOUNT_REGISTRATION_WIZARD=��注册�导
+service.gui.ACCOUNTS=��
+service.gui.ADD=&添加
+service.gui.ADD_CONTACT=&添加�系人
+service.gui.ADD_CONTACT_ERROR=添加�系人 {0} 失败
+service.gui.ADD_CONTACT_ERROR_TITLE=添加�系人错误
+service.gui.ADD_CONTACT_EXIST_ERROR=�系人 {0} 已�存在于您的�系人��中了
+service.gui.ADD_CONTACT_IDENTIFIER=请在下�输入�中输入您想�添加的�系人的称呼.
+service.gui.ADD_CONTACT_WIZARD=添加�系人�导
+service.gui.ADD_GROUP_LOCAL_ERROR=添加组 {0} 失败. 错误出自本地读写�作.
+service.gui.ADD_GROUP_NET_ERROR=添加组 {0} 失败. 错误出自网络错误. 请检查您的网络设置,然��试.
+service.gui.ADD_GROUP_ERROR=添加组 {0} 失败
+service.gui.ADD_GROUP=添加组错误
+service.gui.ADD_GROUP_EXIST_ERROR=组 {0} 已�存在于您的�系人��中了.
+service.gui.ADD_SUBCONTACT=&添加所属�系人
+service.gui.ALL=&清�
+service.gui.ALL_CONTACTS=&所有�系人
+service.gui.APPLY=&应用
+service.gui.AT=在
+service.gui.AUTHORIZATION_ACCEPTED=�系人已�接�您的加为好�请求.
+service.gui.AUTHENTICATION_WINDOW_TITLE=身份验�
+service.gui.AUTHENTICATION_REJECTED=�系人已�拒�您的加为好�请求.
+service.gui.AUTHORIZATION_REQUESTED=请求加为好�
+service.gui.AUTHORIZATION_REQUESTED_INFO=�系人 {0} 请求加为好�.
+service.gui.AUTHENTICATION_FAILED=以下��身份验�失败: 用户�: {0}, �务器�: {1}. 您输入的密�错误.
+service.gui.AUTHORIZATION_RESPONSE=加为好�请求回�
+service.gui.BAN=&�止
+service.gui.BAN_FAILED=�止�作失败
+service.gui.BAN_FAILED_GENERAL_ERROR=阻止 {0} 失败. �务器错误.
+service.gui.BAN_FAILED_NOT_ALLOWED=阻止 {0} 失败. �天室的创建人或管�员�能被�止.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=阻止 {0} 失败. 您没有��.
+service.gui.BRB_MESSAGE=本人目��在,�过马上回�.
+service.gui.BUSY_MESSAGE=抱歉,目�很忙.
+service.gui.CALL=呼�
+service.gui.CALL_VIA=转接呼�:
+service.gui.CANCEL=&�消
+service.gui.CHAT_ROOM_ALREADY_JOINED=已加入�天室 {0}.
+service.gui.CHAT_ROOM_CONFIGURATION=�天室 {0} 属性�置
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=获��天室 {0} �置失败.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=获��天室 {0} �置失败, �有本�天室管�员能进行�置�作.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=�交�天室 {0} �置失败, �生错误.
+service.gui.CHAT_ROOM_USER_JOINED=已加入 {0}
+service.gui.CHAT_ROOM_USER_LEFT=已离开 {0}
+service.gui.CHAT_ROOM_USER_KICKED=被�出 {0}
+service.gui.CHAT_ROOM_USER_QUIT=已退出 {0}
+service.gui.CHAT_ROOM_NAME=�天室�
+service.gui.CHAT_ROOM_NAME_INFO=请在下�输入�中输入您想�创建的�天室�.
+service.gui.CHAT_ROOM_NOT_EXIST=在�务器 {1} 上找�到�天室 {0}. 请检查你的输入是�正确.
+service.gui.CHAT_ROOM_NOT_CONNECTED=您需�先登录, 然��能进入�天室 {0}.
+service.gui.CHAT_ROOM_NOT_JOINED=您需�先进入�天室, 然��能�进一步�作.
+service.gui.CHAT_ROOM_OPTIONS=�天室选项
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=需�注册�能加入�天室 {0}.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=输入密�, 然�进入�天室 {0}.
+service.gui.CHAT_ROOMS=�天室
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} 已�更�了新主题 {1}
+service.gui.CLOSE=C&关闭
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=您刚收到新消�, 是��结�本次�天?
+service.gui.OPTIONS=&�置
+service.gui.CONNECTION_EXPIRED_MSG=您已�断开了与�务器 {0} 的连接.
+service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=您选择的�系人  {0} �支�通�.
+service.gui.CONTACT_PAUSED_TYPING={0} �止输入
+service.gui.CONTACT_TYPING={0} 正在输入
+service.gui.CONTACT_TYPING_STATE_STALE=输入状�未知
+service.gui.CONTACTS=�系人
+service.gui.COPY=&�制
+service.gui.COPY_LINK=�制 &链接
+service.gui.CREATE=C&新建
+service.gui.CREATE_CHAT_ROOM=&创建�天室...
+service.gui.CREATE_CHAT_ROOM_ERROR=创建�天室 {0} 失败.
+service.gui.CREATE_CHAT_ROOM_WIZARD=�天室新建�导
+service.gui.CREATE_GROUP=&新建组
+service.gui.CREATE_GROUP_NAME=请在下�输入�中输入您想�创建的组�.
+service.gui.CREATE_FIRST_GROUP_WIZARD=您的�系人��中没有任何组. 请创建一个组 (文件/新建组).
+service.gui.CUT=C&剪切
+service.gui.DATE=日期
+service.gui.DIALPAD=拨���
+service.gui.DND_STATUS=请别打扰
+service.gui.DO_NOT_ASK_AGAIN=请����询问
+service.gui.DO_NOT_SHOW_AGAIN=请����此消�
+service.gui.CONTACT_INFO_NOT_SUPPORTED=该�系人�支�网络�片
+service.gui.DURATION=�续时间
+service.gui.EDIT=&编辑
+service.gui.EMPTY_HISTORY=&清空历�
+service.gui.ENABLE_TYPING_NOTIFICATIONS=�用 &输入�示
+service.gui.ERROR=错误
+service.gui.EXIT=E&退出
+service.gui.EXTENDED_CRITERIA=延时标准
+service.gui.GENERAL=通用
+service.gui.GENERAL_ERROR=一般错误
+service.gui.GROUP_NAME=组�
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=加入�天室 {0} 失败.
+service.gui.FFC_STATUS=�以�天了
+service.gui.FILE=&文件
+service.gui.FINISH=&完�
+service.gui.FONT=字体
+service.gui.CHAT_ROOM_NOT_CONNECTED=您必须先登录上�务器�能加入�天室, 请登录��试.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=您必须先登录上�务器�能退出�天室.
+service.gui.HELP=帮助
+service.gui.HIDE_MAIN_WINDOW=点击快�键 X ��窗�. 如果需�退出, 请选择 文件/退出.
+service.gui.HISTORY=&历�
+service.gui.HISTORY_CONTACT=历�记录 - {0}
+service.gui.HOUR=æ—¶
+service.gui.IDENTIFIER=称呼
+service.gui.IGNORE=&忽略
+service.gui.INSERT_SMILEY=�入�图标
+service.gui.INVITATION=邀请
+service.gui.INVITATION_RECEIVED=收到邀请
+service.gui.INVITATION_RECEIVED_MSG={0} 邀请 {1} 加入�天室. 您�以选择��, 拒�或者忽略这个邀请.
+service.gui.INVITE=&邀请
+service.gui.INVITE_CONTACT_MSG=如果想进行精确查找, 请输入该用户的�称.
+service.gui.INVITE_CONTACT_TO_CHAT=邀请其他�系人加入�天
+service.gui.JOIN=&加入
+service.gui.JOIN_AS=J&选择�称加入
+service.gui.JOIN_CHAT_ROOM=&加入�天室...
+service.gui.JOIN_CHAT_ROOM_TITLE=加入�天室
+service.gui.JOIN_CHAT_ROOM_NAME=请输入您想加入的�天室的�称.
+service.gui.JOIN_CHAT_ROOM_WIZARD=�天室加入�导
+service.gui.KICK=&驱�
+service.gui.KICK_FAILED=驱��作失败
+service.gui.KICK_FAILED_GENERAL_ERROR==驱� {0} 失败, �务器出错.
+service.gui.KICK_FAILED_NOT_ALLOWED=驱� {0} 失败, �天室的创建人或管�员�能被驱�.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=驱� {0} 失败, 您没有��.
+service.gui.LAST=上一个
+service.gui.LEAVE=&离开
+service.gui.LIMIT_REACHED_FOR_IP=本地IP地�注册账户过多, �务器 {0} �能接�更多注册.
+service.gui.LOGIN=&登录
+service.gui.LOGIN_WINDOW_TITLE=登录 {0}
+service.gui.LOGOFF_NOT_SUCCEEDED=退出账户出错: 用户�: {0}, �务器�: {1}.
+service.gui.ME=我
+service.gui.MODIFY=&修改
+service.gui.MOVE_SUBCONTACT_MSG=请选择你想�移动�系人到哪个地方.
+service.gui.MOVE_SUBCONTACT=M&移动所属�系人
+service.gui.MOVE_SUBCONTACT_FAILED=您选择的�系人已�存在, 请�新选择!
+service.gui.MOVE_TO_GROUP=&移动到组
+service.gui.MOVE_CONTACT_ERROR=&�系人�能被移动
+service.gui.MSG_DELIVERY_FAILURE=上�消���失败
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=您正在使用的�议�支�离线消�. 请�试其他�议或者等待该用户上线.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=内部出错. �能是程�自身错误. 请��您的错误报告到: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
+service.gui.MSG_NOT_DELIVERED=网络错误.
+service.gui.MSG_RECEIVED={0} ��消�给你了
+service.gui.MSG_SEND_CONNECTION_PROBLEM=请先登录�务器, 然���消�.
+service.gui.MULTIPLE_LOGINS=账�在其他地方登录, 本地连接断开: 用户�: {0}, �务器: {1}.
+service.gui.NETWORK_FAILURE=网络错误
+service.gui.NEXT=&下一个
+service.gui.NEW=&新建
+service.gui.NEW_ACCOUNT=&新建账�
+service.gui.NEW_MESSAGE=新消�...
+service.gui.NEW_NAME=新�称:
+service.gui.NO=�
+service.gui.NO_AVAILABLE_ROOMS=该�务器上的�天室清�暂时��获得.
+service.gui.NO_MESSAGE=没有消�
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=支�群�. 进入 sip-communicator.org 查找更多支�群�的�议.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=消�还没有��出去, 是�一定退出?
+service.gui.NON_EXISTING_USER_ID=�务器 {0} �能识别用户身份.
+service.gui.NOTIFICATIONS=通知
+service.gui.OK=&OK
+service.gui.OFFLINE=离线
+service.gui.OLDER_CALLS=之�的通�
+service.gui.ONLINE=在线
+service.gui.OPEN_IN_BROWSER=在 &�览器 中打开
+service.gui.PASSWORD=密�:
+service.gui.PASTE=&粘贴
+service.gui.PREVIOUS=上一个
+service.gui.PRINT=&打�
+service.gui.PROTOCOL=�议
+service.gui.QUIT=&退出
+service.gui.READY=就绪
+service.gui.REASON=原因
+service.gui.RECONNECTION_LIMIT_EXCEEDED=该账户多次��登录�务器: 用户�: {0}, �务器�: {1} 目�已�被�止, 请等待一段时间��试.
+service.gui.REJECT=&拒�
+service.gui.REMEMBER_PASSWORD=记�密�
+service.gui.REMOVE=&删除
+service.gui.REMOVE_ACCOUNT=&删除账户
+service.gui.REMOVE_ACCOUNT_MESSAGE=确认删除该账户?
+service.gui.REMOVE_CONTACT=&删除所属�系人
+service.gui.REMOVE_GROUP=&删除组
+service.gui.RENAME=&�命�
+service.gui.RENAME_CONTACT=Re&�命��系人
+service.gui.RENAME_CONTACT_WIZARD=请在下�的输入�中输入您对该�系人的新�称.
+service.gui.RENAME_GROUP=Re&�命�组
+service.gui.RENAME_GROUP_INFO=请在下�的输入�中输入您对该组的新�称.
+service.gui.REQUEST=&请求
+service.gui.REQUEST_AUTHORIZATION=&请求加为好�
+service.gui.REQUEST_AUTHORIZATION_MSG=�能添加 {0} 到您的�系人��. 必须等待 {0} 加您为他/她的好�. 请输入您的请求信�.
+service.gui.ROOT_GROUP=最上级组
+service.gui.SAVE=&�存
+service.gui.SEARCH=&�索
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=点击按键显示�务器上所有�天室, 然�选择您感兴趣的�天室, 点击加入.
+service.gui.SECURITY_AUTHORITY_REALM=�务器 {0} �求验�您的身份.
+service.gui.SELECT_ACCOUNT=选择账户
+service.gui.SELECT_GROUP=选择组
+service.gui.SELECT_GROUP_WIZARD_MSG=下�的��中包�您所有�系人组, 请选择一个, 然�加入新的�系人.
+service.gui.SELECT_GROUP_WIZARD=指示组�
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=下�的��中包�所有支�群�的账户. 请选择一个, 然�创建您的�天室.
+service.gui.SELECT_PROVIDERS_WIZARD_MSG=下�的��中包�您所有的注册账户. 请选择一个和新�系人对�.
+service.gui.SELECT_PROVIDERS_WIZARD=选择账户
+service.gui.SEND=&��
+service.gui.SEND_FILE=�� &文件
+service.gui.SELECT_CONTACT_SUPPORTING_INFO=没有该�系人信�.
+service.gui.SEND_MESSAGE=&��消�
+service.gui.SEND_AS_SMS=作为手机短信, ��消�
+service.gui.SEND_SMS=S&��手机短信
+service.gui.SEND_SMS_NOT_SUPPORTED=您选择的�议�支���手机短信.
+service.gui.SEND_VIA=转�消�
+service.gui.SET_STATUS_MESSAGE=设置状�信�
+service.gui.SETTINGS=&设置
+service.gui.SPECIFY_REASON==请在下�输入�输入您此次�作的原因.
+service.gui.SOUND_ON_OFF=打开/关闭 声音
+service.gui.STATUS_CHANGED_CHAT_MESSAGE={0} 已上线
+service.gui.STATUS_CHANGE_GENERAL_ERROR=未知错误, 账�状�更新失败: 用户�: {0}, �务器�: {1}.
+service.gui.STATUS_CHANGE_NETWORK_FAILURE=网络错误, 账�状�更新失败: 用户�: {0}, �务器�: {1}.
+service.gui.STATUS_MESSAGE_INFO=请在下�输入�输入您的新状�信�.
+service.gui.SUBJECT=主题
+service.gui.SUMMARY=概�
+service.gui.TODAY=今天
+service.gui.TOOLS=&工具
+service.gui.TYPE_YOUR_REQUEST=请在这里输入您的请求
+service.gui.USER_IDENTIFIER=User identifier:
+service.gui.UNKNOWN=未知用户
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=��消�失败, 未知错误.
+service.gui.UNREGISTERED_MESSAGE=登录账户失败: 用户�: {0}, �务器: {1}. 您现在处于离线状�.
+service.gui.VIEW=&查看
+service.gui.VIEW_HISTORY=查看 &历�
+service.gui.WARNING=警告
+service.gui.YES=是
+service.gui.YESTERDAY=昨天
 
-january=一月
-february=二月
-march=三月
-april=四月
-may=五月
-june=六月
-july=七月
-august=八月
-september=�月
-october=�月
-november=�一月
-december=�二月
+service.gui.JANUARY=一月
+service.gui.FEBRUARY=二月
+service.gui.MARCH=三月
+service.gui.APRIL=Apr四月
+service.gui.MAY=May五月
+service.gui.JUNE=Jun六月
+service.gui.JULY=Jul七月
+service.gui.AUGUST=Aug八月
+service.gui.SEPTEMBER=Sep�月
+service.gui.OCTOBER=Oct�月
+service.gui.NOVEMBER=Nov�一月
+service.gui.DECEMBER=Dec�二月
 
 #systray
 # Author: Nie Pin
@@ -310,28 +260,7 @@ december=�二月
 # "Preferences/General/Content Types/Text/Java Properties File/Default encoding"
 # from "ISO-8859-1" to "UTF-8"
 
-trayIcon=resources/images/impl/systray/systrayIcon.png
-trayIconWindows=resources/images/impl/systray/systrayIconWindows.png
-trayIconMacOSX=resources/images/impl/systray/systrayIconMacOSX.png
-trayIconMacOSXWhite=resources/images/impl/systray/systrayIconMacOSXWhite.png
-addContactIcon=resources/images/impl/gui/buttons/addContactIcon.png
-statusMenuIcon=resources/images/impl/systray/statusIcon.png
-settingsMenuIcon=resources/images/impl/gui/buttons/configureIcon.png
-closeMenuIcon=resources/images/impl/systray/quit.png
-messageIcon=resources/images/impl/systray/envelope.png
-messageIconWindows=resources/images/impl/systray/envelopeWindows.png
-messageIconMacOSX=resources/images/impl/systray/envelopeMacOSX.png
-messageIconMacOSXWhite=resources/images/impl/systray/envelopeMacOSXWhite.png
-newStatusMessageIcon=resources/images/impl/gui/common/renameDialogIcon.png
-settings=设置...
-addContact=添加�系人...
-setStatus=设置状�
-close=关闭
-onlineStatus=上线
-offlineStatus=离线
-messageReceived=消��自
-failedToLoadAddContactDialog=加载"添加�系人"�导失败.
-newStatusMessage=新状��述
-noMessage=暂无消�
-busyMessage=抱歉, 目�很忙.
-
+impl.systray.SET_STATUS=设置状�
+impl.systray.ONLINE_STATUS=上线
+impl.systray.OFFLINE_STATUS=离线
+impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=加载"添加�系人"�导失败.
diff --git a/resources/languages/resourcesnew.properties b/resources/languages/resourcesnew.properties
deleted file mode 100644
index a060d05..0000000
--- a/resources/languages/resourcesnew.properties
+++ /dev/null
@@ -1,682 +0,0 @@
-# SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
-#
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
-
-# Note to translators:
-# To translate SIP Communicator to your language
-# - copy messages.properties to messages_xx.properties
-#   (where xx is the ISO 639-1 language code of your language)
-# - the file must use UTF-8 encoding
-# - all entries are of the form key=translation, where only the
-#   translation part has to be changed
-# - {0}, {1}... are parameters which will be replaced by the
-#   actual text at runtime, place them as you wish
-# - you don't have to translate all entries, if an entry is not
-#   found in your translation, the text in messages.properties will
-#   be used
-# - \ at the end of a line means that the translation is continued
-#   in the next line
-#
-# To start SIP Communicator with a language that is different
-# from your system's language, pass the language code to ant:
-# ant -Duser.language=xx run
-#
-# The same rules apply to the properties files found in the other
-# directories.
-
-service.gui.ABOUT=&About
-service.gui.ACCEPT=&Accept
-service.gui.ACCOUNT=Account
-service.gui.ACCOUNT_REGISTRATION_WIZARD=Account Registration Wizard
-service.gui.ACCOUNTS=Accounts
-service.gui.ACTIVATE_ONLY_WHEN_MINIMIZED=Activate only when minimized
-service.gui.ADD=&Add
-service.gui.ADD_ACCOUNT=Add account
-service.gui.ADD_CONTACT=&Add contact
-service.gui.ADD_CONTACT_ERROR=Failed to add contact with id: {0}
-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_ID=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_GROUP_LOCAL_ERROR=Failed to add group with name: {0}. The problem occured during a local IO operation.
-service.gui.ADD_GROUP_NET_ERROR=Failed to add group with name: {0}. The problem occured 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_ERROR_TITLE=Add group Error
-service.gui.ADD_GROUP_EXIST_ERROR=The group {0} already exists in your contact list.
-service.gui.ADD_GROUP=Create group
-service.gui.ADD_SUBCONTACT=&Add subcontact
-service.gui.ADVANCED=Advanced
-service.gui.ALL=&All
-service.gui.ALL_CONTACTSs=&All contacts
-service.gui.ALWAYS_ON_TOP=Always on top
-service.gui.APPEARANCE=Appearance
-service.gui.APPLICATION=Application
-service.gui.APPLY=&Apply
-service.gui.AT=at
-service.gui.AUTHORIZATION_ACCEPTED=contact has accepted your authorization request.
-service.gui.AUTHENTICATION_WINDOW_TITLE=Authentication requested
-service.gui.AUTHORIZATION_REJECTED=contact has rejected your authorization request.
-service.gui.AUTHORIZATION_REQUESTED=Authorization requested
-service.gui.AUTHORIZATION_REQUESTED_INFO=The {0} contact requests your authorization.
-service.gui.AUTHENTICATION_FAILED=Authentication failed. The password you entered is not valid.
-service.gui.AUTHORIZATION_RESPONSE=Authorization response
-service.gui.AUTO_POPUP=Bring window to front
-service.gui.AWAY_STATUS=Away
-service.gui.BACK=&Back
-service.gui.BAN=&Ban
-service.gui.BAN_FAILED=Ban failed
-service.gui.BAN_FAILED_GENERAL_ERROR=Failed to ban {0}. A general server error occured.
-service.gui.BAN_FAILED_NOT_ALLOWED=Failed to ban {0}. The owner and the administratior of the room could not be banned.
-service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Failed to ban {0}. You don't have enough privileges to do that.
-service.gui.BRB_MESSAGE=I'm gone right now, but I'll be back.
-service.gui.BUSY_MESSAGE=Sorry, I'm busy right now.
-service.gui.CALL=Call
-service.gui.CALL_VIA=Call via:
-service.gui.CALL_LIST=Call list
-service.gui.CANCEL=&Cancel
-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_OPEN_CONFIG_FAILED=Failed to obtain the {0} chat room configuration form.
-service.gui.CHAT_ROOM_OPEN_CONFIG_FORBIDDEN=Could not obtain the {0} chat room configuration form. Only administrators of the chat room could see and change the configuration form.
-service.gui.CHAT_ROOM_CONFIG_FORM_SUBMIT_FAILED=An error occured 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_NAME=Chat room name
-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_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.
-service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} has changed the subject to {1}
-service.gui.CHAT_ROOMS=Chat rooms
-service.gui.CLOSE=Cl&ose
-service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=You have received a new message less than 2 seconds ago. Are you sure you want to close this chat?
-service.gui.CONFERENCE=Conference
-service.gui.CONFIGURE=&Configure
-service.gui.CONFIGURATION=Configuration
-service.gui.CONNECTION_FAILED=Connection failed
-service.gui.CONNECTION_FAILED_MESSAGE=<DIV>Connection failed for the following account: <BR> \
-User name: {0} <BR>\
-Server name: {1}. <BR>\
-Please check your network connection or contact <BR>\
-your network administrator for more information.</DIV>
-service.gui.CONNECTION_EXPIRED=You are currently disconnected from the {0} server.
-service.gui.CONTACT_ADDRESS=Contact address
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen  {0} contact doesn't support telephony.
-service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message
-service.gui.CONTACT_TYPING={0} is typing a message
-service.gui.CONTACT_TYPEING_STATE_STALE=typing state not updated
-service.gui.CONTACT_INFO=&Contact info
-service.gui.CONTACTS=Contacts
-service.gui.CONTINUE=&Continue
-service.gui.COPY=&Copy
-service.gui.COPY_LINK=Copy &link
-service.gui.CREATE=C&reate
-service.gui.CREATE_CHAT_ROOM=&Create chat room...
-service.gui.CREATE_CHAT_ROOM_NOT_SUPPORTED=Failed to create chat room with name: {0}. The server you have choosen: {1} doesn't support this operation.
-service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create chat room with name: {0}.
-service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard
-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.CUT=C&ut
-service.gui.DATE=Date
-service.gui.DESCRIPTION=Description
-service.gui.DIAL=&Dial
-service.gui.DIALPAD=Dialpad
-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.DOES_NOT_SUPPORT_WEB_INFO=This contact doesn't support web contact info
-service.gui.DURATION=Duration
-service.gui.EDIT=&Edit
-service.gui.EMPTY_HISTORY=&Empty history
-service.gui.ENABLE_NOTIFICATIONS=Enable notifications
-service.gui.ENABLE_TYPING_NOTIFICATIONS=Enable &typing notifications
-service.gui.ENTER_PHONE_NUMBER=Enter phone number
-service.gui.ERROR=Error
-service.gui.EXIT=E&xit
-service.gui.EXTENDED_CRITERIA=Extended criteria
-service.gui.GENERAL=General
-service.gui.GENERAL_ERROR=General error
-service.gui.GROUP=Group
-service.gui.GROUP_NAME=Group name
-service.gui.FAILED_TO_CREATE_CHAT_ROOM=Failed to create chat room with name: {0}.
-service.gui.FAILED_TO_JOIN_CHAT_ROOM=Failed to join chat room with name: {0}.
-service.gui.FREE_FOR_CHAT_STATUS=Free for chat
-service.gui.FILE=&File
-service.gui.FIND_CHAT_ROOM_ERROR=Failed to find the "{0}" chat room.
-service.gui.FINISH=&Finish
-service.gui.FIRST=First
-service.gui.FONT=Font
-service.gui.HANG_UP=Hang up
-service.gui.HAVE_TO_BE_CONNECTED_TO_JOIN=You have to be connected in order to join a chat room. Please connect and then try again.
-service.gui.HAVE_TO_BE_CONNECTED_TO_LEAVE=You have to be connected in order to leave a chat room.
-service.gui.HELP=&Help
-service.gui.HIDE_OFFLINE=Hide
-service.gui.HIDE_OfflineContacts=Hide inactive contacts
-service.gui.HIDE_CallPanel=&Hide call panel
-service.gui.HIDE_MAIN_WINDOW=<DIV>Clicking the X window button will not exit the application, \
-but only <BR> hide it. If you wish to exit the application choose File/Quit.</DIV>
-service.gui.HISTORY=&History
-service.gui.HISTORY_CONTACT=History - {0}
-service.gui.HOUR=Hour
-service.gui.IDENTIFIER=Identifier
-service.gui.IGNORE=&Ignore
-service.gui.INFO=Info
-service.gui.INSERT_SMILEY=Insert smiley
-service.gui.INVALID_CALL=Invalid call
-service.gui.INVITATION=Invitation text
-service.gui.INVITATION_RECEIVED=Invitation received
-service.gui.INVITATION_RECEIVED_FORM_INFO={0} has invited you to join {1} chat room. You could accept, reject or ignore this invitation.
-service.gui.INVITE=&Invite
-service.gui.INVITE_CONTACT_FORM_INFO=Please write the name of the user you would like to invite. If you wish you could also precise the reason for this invitation.
-service.gui.INVITE_CONTACT_TO_CHAT=Invite contact to chat
-service.gui.JOIN=&Join
-service.gui.JOIN_AS=J&oin as
-service.gui.JOIN_CHAT_ROOM=&Join chat room...
-service.gui.JOIN_CHAT_ROOM_TITLE=Join chat room
-service.gui.JOIN_CHAT_ROOM_NAME=Please enter the name of the chat room you would like to join.
-service.gui.JOIN_CHAT_ROOM_WIZARD=Join chat room wizard
-service.gui.KICK=&Kick
-service.gui.KICK_FAILED=Kick failed
-service.gui.KICK_FAILED_GENERAL_ERROR=Failed to kick {0}. A general server error occured.
-service.gui.KICK_FAILED_NOT_ALLOWED=Failed to kick {0}. The owner and the administratior 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.LAUNCH_BROWSER_ERROR=Error attempting to launch web browser.
-service.gui.LAUNCE_ON_STARTUP=Launch on start up
-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.
-service.gui.LOGIN=&Login
-service.gui.LOGIN_NETWORK_ERROR=<DIV>Unable to log in with account:<BR>\
-User name: {0}<BR>\
-Server name: {1}<BR>\
-due to a network failure. Please check your network connection.</DIV>
-service.gui.LOGIN_GENERAL_ERROR=An error occured while logging in with account: User name: {0}, Server name: {1}.
-service.gui.LOGIN_INTERNAL_ERROR=An error occured while logging in with account: User name: {0}, Server name: {1}. This is most probably an internal application error. You could report your problem to issues@sip-communicator.dev.java.net.
-service.gui.LOGIN_INVALID_PROPERTIES_ERROR=Unable to log in with account: User name: {0}, Server name: {1}, due to an account configuration problem. Please check your account configuration.
-service.gui.LOGIN_WINDOW_TITLE=Login {0}
-service.gui.LOG_OFF_ERROR=An error occured while logging off with the following account: User name: {0}, Server name: {1}.
-service.gui.ME=me
-service.gui.MODIFY=&Modify
-service.gui.MOVE=Move
-service.gui.MOVE_SUBCONTACT=M&ove contact
-service.gui.MOVE_SUBCONTACT_MESSAGE=Select the contact, where you would like to move.
-service.gui.MOVE_SUBCONTACT_IN_SAME_CONTACT=The contact you have choosen is the same as \n the source one. Please choose another contact!
-service.gui.MOVE_SUBCONTACT_QUESTION=<DIV>Are you sure you want to move <B> {0} </B> to <B> {1} </B> ?</DIV>
-service.gui.MOVE_TO_GROUP=&Move to group
-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_OFFLINE_NOT_SUPPORTED=The protocol you are using doesn't support offline messages. You could try to reach this contact through another protocol or wait until he/she becomes online.
-service.gui.MSG_DELIVERY_INTERNAL_ERROR=An internal error occured. This is most probably a bug. Please report it here: http://www.sip-communicator.org/index.php/Development/BugsAndIssues. Server returned error: {0}
-service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Your message could not be delivered due to the following problem: {0}.
-service.gui.MSG_NOT_DELIVERED=A network problem occured. Please check your network configuration and try again. Server returned error: {0}.
-service.gui.MSG_RECEIVED={0} has sent you a message
-service.gui.MSG_SEND_CONNECTION_PROBLEM=You should be connected to be able to send messages.
-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.NAME=Name
-service.gui.NETWORK=Network
-service.gui.NETWORK_FAILURE=Network failure
-service.gui.NEXT=&Next
-service.gui.NEW=&New
-service.gui.NEW_ACCOUNT=Add &new account
-service.gui.NEW_MESSAGE=New message...
-service.gui.NEW_NAME=New name:
-service.gui.NEW_STATUS_MESSAGE=New status message
-service.gui.NO=No
-service.gui.NO_AVAILABLE_ROOMS=The list of rooms for this server is currently not available.
-service.gui.NO_MESSAGE=No message
-service.gui.NO_MULTI_CHAT_ACCOUNT_AVAILABLE=No accounts, supporting multi user chat found. Check sip-communicator.org for more information on which protocols support multi user chat.
-service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=You're trying to close a chat with a non-sent message. Are you sure you want to close this chat?
-service.gui.NON_EXISTING_USERNAME=The {0} server does not recognize specified user id.
-service.gui.NOTIFICATIONS=Notifications
-service.gui.OK=&Ok
-service.gui.OFFLINE=Offline
-service.gui.OLDER_CALLS=Older calls
-service.gui.ONLINE=Online
-service.gui.OPEN_IN_BROWSER=Open in &browser
-service.gui.OPTIONS=Options
-service.gui.PASSWORD=Password
-service.gui.PASTE=&Paste
-service.gui.PREVIOUS=Previous
-service.gui.PRINT=&Print
-service.gui.PROTOCOL=Protocol
-service.gui.PROVIDER_NOT_CONNECTED=You must be connected to be able to communicate.
-service.gui.QUIT=&Quit
-service.gui.READY=Ready
-service.gui.REASON=Reason
-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.REFRESH=Refresh
-service.gui.REGISTRATION_TIMEOUT=Registration timeout:
-service.gui.REJECT=&Reject
-service.gui.REMEMBER_PASSWORD=Remember password
-service.gui.REMOVE=&Remove
-service.gui.REMOVE_ACCOUNT=&Remove account
-service.gui.REMOVE_ACCOUNT_CONFIRM=Are you sure you want to remove this account?
-service.gui.REMOVE_CONTACT=&Remove subcontact
-service.gui.REMOVE_CONTACT_TEXT=<DIV>Are you sure you want to remove <B> {0} </B><BR>from your contact list?</DIV>
-service.gui.REMOVE_GROUP=&Remove group
-service.gui.RENAME=&Rename
-service.gui.RENAME_CONTACT=Re&name contact
-service.gui.RENAME_CONTACT_WIZARD=In the field below you can specify the name you would like to use for the given contact.
-service.gui.RENAME_GROUP=Re&name group
-service.gui.RENAME_GROUP_INFO=In the field below you can specify the name you would like to use for the given group.
-service.gui.REQUEST=&Request
-service.gui.REQUEST_AUTHORIZATION=&Request authorization
-service.gui.REQUEST_AUTHORIZATION_INFO=Can't add {0} to your Contact List. {0} must authorize your request to add him/her. Please enter your request below.
-service.gui.REQUEST_AUTHORIZATION_REASON=Request reason
-service.gui.REQUEST_AUTHORIZATION_REASON_ENTER=Enter request reason
-service.gui.RESPONSE_AUTHORIZATION_REASON_ENTER=Enter response reason
-service.gui.RETRY=Retry
-service.gui.ROOT_GROUP=Root group
-service.gui.SAVE=&Save
-service.gui.SEARCH=&Search
-service.gui.SEARCH_FOR_CHAT_ROOMS=&Search for chat rooms
-service.gui.SEARCH_FOR_CHAT_ROOMS_TEXT=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.SECURITY_AUTHORITY_REALM=The {0} server has requested your authentication.
-service.gui.SELECT_ACCOUNT=Select account
-service.gui.SELECT_ACCOUNT_REGISTRATION=From the list below select the account registration wizard to use for creating a new account.
-service.gui.SELECT_ACCOUNT_REGISTRATION_WIZARD_TITLE=Select account registration
-service.gui.SELECT_GROUP=Select group
-service.gui.SELECT_GROUP_WIZARD=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_GROUP_WIZARD_TITLE=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=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_TITLE=Select account
-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_SMS=S&end SMS
-service.gui.SEND_SMS_DETAILS=Remember that you need to enter the number in international \
-format e.g. starting with +44 for the UK for example, +447777000000
-service.gui.SEND_SMS_NOT_SUPPORTED=The protocol you have selected doesn't support SMS messages.
-service.gui.SEND_VIA=Send via
-service.gui.SET_STATUS_MESSAGE=Set status message
-service.gui.SETTINGS=&Settings
-service.gui.SHOW_CALL_PANEL=Show call panel
-service.gui.SHOW_CHANNELS_LIST=Show channels list
-service.gui.SHOW_OFFLINE=Show
-service.gui.SHOW_OFFLINE_CONTACTS=Show inactive contacts
-service.gui.SIGN_IN=Sign in
-service.gui.SMILEY=Smiley
-service.gui.SMS_SUCCESSFULLY_SENT=SMS message successfully sent!
-service.gui.SMS_SEND_CONNECTION_PROBLEM=You need to be connected before being able to send SMS messages. Please connect your SMS provider account.
-service.gui.SPECIFY_REASON=In the field below you could specify the reason of this operation.
-service.gui.SOUND=Sound
-service.gui.SOUND_ON_OFF=Turn sound on/off
-service.gui.STATUS_CHANGED_CHAT_MESSAGE=has become {0}
-service.gui.STATUS_CHANGE_GENERAL_ERROR=Failed to change status for account: User name: {0}, Server name: {1}, due to a general error.
-service.gui.STATUS_CHANGE_NETWORK_FAILURE=Failed to change status for account: User name: {0}, Server name: {1}, due to a network problem.
-service.gui.STATUS_MESSAGE_INFO=In the field below you can specify the new message you would like to use.
-service.gui.SUBJECT=Subject
-service.gui.SUMMARY=Summary
-service.gui.TODAY=Today
-service.gui.TOOLS=&Tools
-service.gui.TYPE_YOUR_REQUEST=Type your request here
-service.gui.USERNAME=User identifier:
-service.gui.UNKNOWN=Unknown user
-service.gui.USE_CTRL_ENTER_TO_SEND=Use Ctrl-&Enter to send
-service.gui.USERNAME=Username
-service.gui.MESSAGE_DELIVERY_FAILED_UNKNOWN_ERROR=Unknown error has occured while delivering your message. Server returned error: {0}
-service.gui.UNREGISTERED_MESSAGE=Unable to connect the following account: User name: {0}, Server name: {1}. You are currently offline.
-service.gui.UPDATE_AUTOMATICALLY=Automatically install new updates
-service.gui.UPDATES=Updates
-service.gui.VIEW=&View
-service.gui.VIEW_HISTORY=View &history
-service.gui.WARNING=Warning
-service.gui.YES=Yes
-service.gui.YESTERDAY=Yesterday
-
-service.gui.JANUARY=Jan
-service.gui.FEBRUARY=Feb
-service.gui.MARCH=Mar
-service.gui.APRIL=Apr
-service.gui.MAY=May
-service.gui.JUNE=Jun
-service.gui.JULY=Jul
-service.gui.AUGUST=Aug
-service.gui.SEPTEMBER=Sep
-service.gui.OCTOBER=Oct
-service.gui.NOVEMBER=Nov
-service.gui.DECEMBER=Dec
-
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
-
-# impl.systray
-impl.systray.SET_STATUS=Set Status
-impl.systray.ONLINE_STATUS=Online
-impl.systray.OFFLINE_STATUS=Offline
-impl.systray.MESSAGE_RECEIVED=Message received from
-impl.systray.ADD_CONTACT_DIALOG_ERROR=Failed to load the "Add contact" wizard dialog.
-
-# plugin.accountinfo
-plugin.accountinfo.ACCOUNT_INFO=Account info for 
-plugin.accountinfo.TITLE=Account Info
-plugin.accountinfo.BROWSE=Browse
-plugin.accountinfo.SUMMARY_DESCRIPTION=Summary of account info for
-plugin.accountinfo.EXTENDED=Extended
-plugin.accountinfo.EXTENDED_DESCRIPTION=Extended account info for
-plugin.accountinfo.NOT_SUPPORTED=Account info not available.
-plugin.accountinfo.CLICK_WEB=Click for Web Info
-plugin.accountinfo.WEB_INFO=Web Info
-plugin.accountinfo.FIRST_NAME=First Name:
-plugin.accountinfo.MIDDLE_NAME=Middle Name:
-plugin.accountinfo.LAST_NAME=Last Name:
-plugin.accountinfo.AGE=Age:
-plugin.accountinfo.BDAY=Birth Date:
-plugin.accountinfo.GENDER=Gender:
-plugin.accountinfo.EMAIL=E-mail:
-plugin.accountinfo.PHONE=Phone:
-plugin.accountinfo.USER_PICTURES=User Pictures
-plugin.accountinfo.CHANGE=Change
-plugin.accountinfo.ONLY_MESSAGE=Only messages
-
-# plugin.aimaccregwizz
-plugin.aimaccregwizz.PROTOCOL_NAME=AIM
-plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=The AIM service protocol
-plugin.aimaccregwizz.USERNAME=AIM Screenname:
-plugin.aimaccregwizz.PASSWORD=Password:
-plugin.aimaccregwizz.USERNAME_AND_PASSWORD=UIN 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.EXISTING_ACCOUNT_ERROR=* The account you entered is already installed.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
-plugin.aimaccregwizz.ADVANCED_OPTIONS=Advanced Options
-plugin.aimaccregwizz.PROXY=Proxy
-plugin.aimaccregwizz.PROXY_PORT=Proxy port
-plugin.aimaccregwizz.PROXY_TYPE=Proxy type
-plugin.aimaccregwizz.PROXY_USERNAME=Proxy username
-plugin.aimaccregwizz.PROXY_PASSWORD=Proxy password
-
-# plugin.autoaway
-plugin.autoaway.AUTO_STATUS=Auto Away
-plugin.autoaway.ENABLE_CHANGE_STATUS=Change status while away
-plugin.autoaway.AWAY_MINUTES=Minutes before switching to away :
-plugin.autoaway.INFO_TEXT=Set "Idle", when your computer is not used for X minutes. The status is reset to the status before, when activity is detected.
-
-# plugin.branding
-plugin.branding.ABOUT_WINDOW_TITLE=About {0}
-plugin.branding.LOAD_MESSAGE=Open Source VoIP & Instant Messaging
-plugin.branding.LOADING=Loading
-plugin.branding.ABOUT_MENU_ENTRY=About
-plugin.branding.BASED_ON=based on
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1} is currently under active development. \
-               The version you are running is only experimental and MAY NOT \
-               work as expected. Please refer to {2} for more information.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2007 Copyright \
-          <b>sip-communicator.org</b>. All rights reserved. Visit \
-          <a href="http://sip-communicator.org">http://sip-communicator.org</a>.\
-          </font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>The <b>SIP Communicator</b> is distributed under \
-        the terms of the LGPL (<a href=\"http://www.gnu.org\">\
-        http://www.gnu.org</a>).</DIV>
-
-# plugin.contactinfo
-plugin.contactinfo.CONTACT_DETAILS=Contact details
-plugin.contactinfo.SELECT_USER=Select a user
-plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=Summary of contact info for
-plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=Extended contact info for
-plugin.contactinfo.CONTACT_INFO_NOT_SUPPORTED=This protocol doesn't support server stored details for now. Try one of the other protocols.
-plugin.contactinfo.NOT_SPECIFIED=[Not specified]
-
-# plugin.dictaccregwizz
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=The Dict service protocol
-plugin.dictaccregwizz.STRATEGY_LIST=List of strategies:
-plugin.dictaccregwizz.STRATEGY_ACTUAL=Search strategies
-plugin.dictaccregwizz.STRATEGY_DESCRPTION=Strategy is use to search similar words,if a translation was not found, thanks to different approaches. For example the Prefix strategies will search words which begin like the word you would translate.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict Account Information
-plugin.dictaccregwizz.FIRST_ACCOUNT_TEXT=This wizard will create your first Dict Account for you on dict.org.\n\n\
-You can add new dictionary by going on Account Registration Wizard. Fill the host Field with dictionnary you would like to add.
-
-# plugin.extendedcallsearchhistory
-plugin.extendedcallsearchhistory.ADVANCED_CALL_HISTORY_SEARCH=&Advanced call history search
-plugin.extendedcallsearchhistory.SEARCH=Search
-plugin.extendedcallsearchhistory.CONTACT_NAME=Contact Name
-plugin.extendedcallsearchhistory.SINCE=Since
-plugin.extendedcallsearchhistory.UNTIL=Until
-plugin.extendedcallsearchhistory.CALLTYPE=Call Type
-plugin.extendedcallsearchhistory.INCOMING=Incoming
-plugin.extendedcallsearchhistory.OUTGOING=Outgoing
-plugin.extendedcallsearchhistory.OLDER_CALLS=Older Calls
-plugin.extendedcallsearchhistory.ALL=all
-
-# plugin.generalconfig
-plugin.generalconfig.AUTO_START=Auto - start MotoGP Impact when computer restarts or reboots.
-plugin.generalconfig.GROUP_CHAT_MESSAGES=Group chat messages in one window.
-plugin.generalconfig.LOG_HISTORY=Log chat history
-plugin.generalconfig.SHOW_HISTORY=Show history
-plugin.generalconfig.HISTORY_SIZE=recent messages in new chats
-plugin.generalconfig.SEND_MESSAGES_WITH=Send messages with:
-plugin.generalconfig.ENABLE_TYPING_NOTIFICATIONS=Enable typing notifications
-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.gibberishaccregwizz
-plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
-plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=A SIP Communicator test protocol.
-plugin.gibberishaccregwizz.USERNAME=User ID:
-plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=Identification
-
-# plugin.googletalkaccregwizz
-plugin.googletalkaccregwizz.PROTOCOL_NAME=GOOGLE TALK
-plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=The Google Talk protocol
-plugin.googletalkaccregwizz.USERNAME=Google Talk username
-plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Google Talk account, click on this button to create a new one.
-
-# plugin.icqaccregwizz
-plugin.icqaccregwizz.PROTOCOL_NAME=ICQ
-plugin.icqaccregwizz.PROTOCOL_DESCRIPTION=The AOL ICQ service protocol
-plugin.icqaccregwizz.USERNAME=ICQ Number:
-plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have an ICQ account, click on this button to create a new one.
-
-# plugin.ircaccregwizz
-plugin.ircaccregwizz.PROTOCOL_NAME=IRC
-plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC protocol.
-plugin.ircaccregwizz.USERNAME=Nickname:
-plugin.ircaccregwizz.INFO_PASSWORD=Most IRC servers do not require password.
-plugin.ircaccregwizz.AUTO_NICK_CHANGE=Automatically change nick when it's already used
-plugin.ircaccregwizz.USE_DEFAULT_PORT=Use default port
-plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=My nickname doesn't require identification
-plugin.ircaccregwizz.HOST=Hostname:
-plugin.ircaccregwizz.PORT=Port:
-plugin.ircaccregwizz.IRC_SERVER=Server
-
-# plugin.jabberaccregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=JABBER
-plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=The Jabber protocol
-plugin.jabberaccregwizz.USERNAME=Jabber username
-plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirm password
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID and Password
-plugin.jabberaccregwizz.CSERVER=Server
-plugin.jabberaccregwizz.SERVER=Connect Server
-plugin.jabberaccregwizz.PORT=Port
-plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Enable keep alive
-plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=Jabber new account registration
-plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have a Jabber account, click on this button to create a new one.
-plugin.jabberaccregwizz.CHOOSE_SERVER_TITLE=Jabber new account server chooser
-plugin.jabberaccregwizz.CHOOSE_SERVER_TEXT=Choose the server for your new account in the list below.
-plugin.jabberaccregwizz.OK=&Ok
-plugin.jabberaccregwizz.CANCEL=C&ancel
-plugin.jabberaccregwizz.CHOSE=&Choose
-plugin.jabberaccregwizz.SERVER_COLUMN=Server
-plugin.jabberaccregwizz.COMMENT_COLUMN=Comment
-plugin.jabberaccregwizz.RESOURCE=Resource
-plugin.jabberaccregwizz.PRIORITY=Priority
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP Error
-plugin.jabberaccregwizz.USER_EXISTS_ERROR=This user already exist on this server. Choose another user or server.
-plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unknown XMPP error. Verify that the server name is correct.
-plugin.jabberaccregwizz.NOT_SAME_PASSWORD=The two entered password aren't the same.
-
-# plugin.keybindingchooser
-plugin.keybindingchooser.KEYBINDINGS=Keybindings
-plugin.keybindingchooser.CHAT_NEXT_TAB=Next Chat Tab
-plugin.keybindingchooser.CHAT_PREVIOUS_TAB=Previous Chat Tab
-plugin.keybindingchooser.CHAT_COPY=Copy
-plugin.keybindingchooser.CHAT_PASTE=Paste
-plugin.keybindingchooser.CHAT_OPEN_SMILIES=Show Smilies
-plugin.keybindingchooser.CHAT_OPEN_HISTORY=Show History
-plugin.keybindingchooser.CHAT_CLOSE=Close Chat Window
-plugin.keybindingchooser.CHAT_CUT=Cut
-plugin.keybindingchooser.MAIN_RENAME=Rename
-plugin.keybindingchooser.MAIN_NEXT_TAB=Next Contact List Tab
-plugin.keybindingchooser.MAIN_PREVIOUS_TAB=Previous Contact List Tab
-
-# plugin.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.msnaccregwizz 
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=A protocol to connect and chat on the  MSN Service.
-plugin.msnaccregwizz.USERNAME=Email:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID and Password
-plugin.msnaccregwizz.NEW_MAIL=<b>You have one new Mail!</b><br/><b>From:</b> {0} {1} <br/><b>Subject:</b> {2} <br/>{3};
-
-# plugin.notificationconfiguration
-plugin.notificationconfiguration.PLAY=Play
-plugin.notificationconfiguration.TURN_ON_ALL=Turn On All
-plugin.notificationconfiguration.TURN_OFF_ALL=Turn Off All
-plugin.notificationconfiguration.ACTIONS=Actions
-plugin.notificationconfiguration.QUICK_CONTROLS=Quick Controls
-plugin.notificationconfiguration.RESTORE=Restore Defaults
-plugin.notificationconfiguration.PLAY_SOUND=Play a sound:
-plugin.notificationconfiguration.EXECUTE_PROGRAM=Execute a program:
-plugin.notificationconfiguration.DISPLAY_POPUP=Show a message in a pop-up window
-
-# plugin.pluginmanager
-plugin.pluginmanager.ACTIVATE=Activate
-plugin.pluginmanager.DEACTIVATE=Deactivate
-plugin.pluginmanager.INSTALL=Install
-plugin.pluginmanager.UNINSTALL=Uninstall
-plugin.pluginmanager.UPDATE=Update
-plugin.pluginmanager.NEW=New
-plugin.pluginmanager.PLUGINS=Plug-ins
-plugin.pluginmanager.CANCEL=Cancel
-plugin.pluginmanager.URL=Url
-plugin.pluginmanager.CHOOSE_FILE=Select File
-plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=Show system bundles
-plugin.pluginmanager.SYSTEM=System
-
-# plugin.rssaccregwizz
-plugin.rssaccregwizz.PROTOCOL_NAME=RSS
-plugin.rssaccregwizz.PROTICOL_DESCRIPTION=Add your preferred RSS feeds into SIP Communicator !
-plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS=RSS account already exists!
-plugin.rssaccregwizz.ACCOUNT_INFO=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.
-plugin.rssaccregwizz.ACCOUNT_INFO_TITLE=RSS Account Information
-plugin.rssaccregwizz.ACCOUNT_ATTENTION=Please read attentively the information provided below!
-plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL=The folloing RSS flow seems to be no longer accessible. Would you like to remove it?\n\n Address: {0}
-plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL_TITLE=Remove missing contactems to be no longer accessible. Would you like to remove it?\n\n 
-
-# plugin.simpleaccregwizz
-plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION=Configure all your favorite protocols in one click.
-plugin.simpleaccregwizz.SIGNUP=Not registered yet?
-plugin.simpleaccregwizz.SPECIAL_SIGNUP=Not registered yet ? - click here to get a new username
-plugin.simpleaccregwizz.CANCEL=Cancel
-
-# plugin.sipaccregwizz
-plugin.sipaccregwizz.PROTOCOL_NAME=SIP
-plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=The SIP protocol
-plugin.sipaccregwizz.USERNAME=SIP id
-plugin.sipaccregwizz.USERNAME_AND_PASSWORD=User name and password
-plugin.sipaccregwizz.REGISTRAR=Registrar
-plugin.sipaccregwizz.SERVER_PORT=Server port
-plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport
-plugin.sipaccregwizz.ENABLE_PRESENCE=Enable presence (SIMPLE)
-plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Force peer-to-peer presence mode
-plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Offline contacts polling period (in s.)
-plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION=Default subscription duration (in s.)
-plugin.sipaccregwizz.PRESENCE_OPTIONS=Presence Options
-plugin.sipaccregwizz.KEEP_ALIVE=Keep alive
-plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Keep alive method
-plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Keep alive interval
-plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Between 1 and 3600 seconds
-plugin.sipaccregwizz.REGISTER=REGISTER
-
-# plugin.sshaccregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=A Protocol to connect to remote machines over SSH.
-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.updatechecker
-plugin.updatechecker.DIALOG_TITLE=New version available
-plugin.updatechecker.DIALOG_MESSAGE=<html>A new version of {0} is available for download.
-plugin.updatechecker.DIALOG_MESSAGE_2=<br>{0} ({1}): <br>
-plugin.updatechecker.DIALOG_MESSAGE_DEBIAN=
-plugin.updatechecker.BUTTON_DOWNLOAD=Download
-plugin.updatechecker.BUTTON_CLOSE=Close
-
-# plugin.whiteboard
-plugin.whiteboard.INVITATION_RECEIVED_FORM_INFO={0} has invited you to join {1} whiteboard. You could accept, reject or ignore this invitation.
-plugin.whiteboard.WHITEBOARD_TITLE=Whiteboard [Beta]
-plugin.whiteboard.WHITEBOARD_MENU_ITEM_TEXT=Whiteboard
-plugin.whiteboard.WHITEBOARD_NOT_SUPPORTED_TEXT=This contact does not support whiteboarding
-plugin.whiteboard.CANCEL=Cancel
-plugin.whiteboard.DO_NOT_ASK_AGAIN=Do not ask me again.
-plugin.whiteboard.CLOSE_SESSION_QUESTION=Would you like to end current session ? If you choose "yes" the current session will be ended, otherwise only your whiteboard window will be closed.
-plugin.whiteboard.FILE=File
-plugin.whiteboard.DRAW=Draw
-plugin.whiteboard.NEW=New
-plugin.whiteboard.SAVE=Save
-plugin.whiteboard.OPEN=Open
-plugin.whiteboard.COPY=Copy
-plugin.whiteboard.PASTE=Paste
-plugin.whiteboard.PEN=Pen
-plugin.whiteboard.SELECT=Select
-plugin.whiteboard.LINE=Line
-plugin.whiteboard.RECTANGLE=Rectangle
-plugin.whiteboard.FILLED_RECTANGLE=Filled rectangle
-plugin.whiteboard.TEXT=Text
-plugin.whiteboard.IMAGE=Image
-plugin.whiteboard.POLYGON=Polygon
-plugin.whiteboard.FILLEDPOLYGON=Filled polygon
-plugin.whiteboard.POLYLINE=Polyline
-plugin.whiteboard.CIRCLE=Circle
-plugin.whiteboard.FILLED_CIRCLE=Filled circle
-plugin.whiteboard.COLOR=Color
-plugin.whiteboard.MODIFICATION=Modification
-plugin.whiteboard.THICKNESS=Thickness:
-plugin.whiteboard.SEND=Send
-plugin.whiteboard.PRINT=Print
-plugin.whiteboard.EXIT=Exit
-plugin.whiteboard.EDIT=Edit
-plugin.whiteboard.GRID=Grid
-plugin.whiteboard.DESELECT=Deselect
-plugin.whiteboard.DELETE=Delete
-plugin.whiteboard.PROPERTIES=Properties
-plugin.whiteboard.HELP=Help
-plugin.whiteboard.ABOUT=About
-
-# plugin.yahooaccregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=YAHOO
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=A protocol to connect and chat on the  Yahoo Service.
-plugin.yahooaccregwizz.USERNAME=Username:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID and Password
-plugin.yahooaccregwizz.NEW_MAIL=New mail, subject
-plugin.yahooaccregwizz.FROM=From
-
-# plugin.zeroaccregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=The Zeroconf (Bonjour) service protocol.
-plugin.zeroaccregwizz.FIRSTNAME=Firstname:
diff --git a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
index b247dd0..ffd1f5e 100644
--- a/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/UIServiceImpl.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
@@ -924,8 +923,10 @@ public class UIServiceImpl
                 if (isTransparentWindowEnabled)
                 {
                     new ErrorDialog(mainFrame,
-                        Messages.getI18NString("error").getText(),
-                        Messages.getI18NString("transparencyNotEnabled").getText())
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.ERROR"),
+                        GuiActivator.getResources()
+                        .getI18NString("service.gui.TRANSPARENCY_NOT_ENABLED"))
                     .showDialog();
                 }
 
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
index 8f3966d..bc4da54 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/ErrorDialog.java
@@ -13,7 +13,7 @@ import java.io.*;
 import javax.swing.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
@@ -36,7 +36,7 @@ public class ErrorDialog
     private Logger logger = Logger.getLogger(ErrorDialog.class);
 
     private JButton okButton = new JButton(
-        Messages.getI18NString("ok").getText());
+        GuiActivator.getResources().getI18NString("service.gui.OK"));
 
     private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
             .getImage(ImageLoader.ERROR_ICON)));
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
index caa7fa5..b01924f 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/MessageDialog.java
@@ -12,7 +12,7 @@ import java.lang.reflect.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -30,13 +30,14 @@ public class MessageDialog
     implements ActionListener
 {
     private JButton cancelButton = new JButton(
-        Messages.getI18NString("cancel").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
     private JButton okButton = new JButton(
-        Messages.getI18NString("ok").getText());
+        GuiActivator.getResources().getI18NString("service.gui.OK"));
 
-    private JCheckBox doNotAskAgain =
-        new SIPCommCheckBox(Messages.getI18NString("doNotAskAgain").getText());
+    private JCheckBox doNotAskAgain = new JCheckBox(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.DO_NOT_ASK_AGAIN"));
 
     private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
             .getImage(ImageLoader.WARNING_ICON)));
@@ -172,8 +173,8 @@ public class MessageDialog
 
         if(!isCancelButtonEnabled)
         {
-            doNotAskAgain.setText(
-                Messages.getI18NString("doNotShowAgain").getText());
+            doNotAskAgain.setText(GuiActivator.getResources()
+                .getI18NString("service.gui.DO_NOT_SHOW_AGAIN"));
 
             buttonsPanel.remove(cancelButton);
         }
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 10ae623..5b45f35 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
@@ -14,7 +14,8 @@ import java.util.*;
 import javax.swing.*;
 import javax.swing.border.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -469,11 +470,12 @@ public class Wizard
         nextButton.addActionListener(wizardController);
         cancelButton.addActionListener(wizardController);
 
-        backButton
-            .setMnemonic(Messages.getI18NString("previous").getMnemonic());
-        nextButton.setMnemonic(Messages.getI18NString("next").getMnemonic());
-        cancelButton
-            .setMnemonic(Messages.getI18NString("cancel").getMnemonic());
+        backButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.PREVIOUS"));
+        nextButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.NEXT"));
+        cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
 
         // Create the buttons with a separator above them, then place them
         // on the east side of the panel with a small amount of space between
@@ -511,10 +513,14 @@ public class Wizard
 
     static
     {
-        BACK_TEXT = Messages.getI18NString("previous").getText();
-        NEXT_TEXT = Messages.getI18NString("next").getText();
-        CANCEL_TEXT = Messages.getI18NString("cancel").getText();
-        FINISH_TEXT = Messages.getI18NString("finish").getText();
+        BACK_TEXT
+            = GuiActivator.getResources().getI18NString("service.gui.PREVIOUS");
+        NEXT_TEXT
+            = GuiActivator.getResources().getI18NString("service.gui.NEXT");
+        CANCEL_TEXT
+            = GuiActivator.getResources().getI18NString("service.gui.CANCEL");
+        FINISH_TEXT
+            = GuiActivator.getResources().getI18NString("service.gui.FINISH");
     }
 
     public BufferedImage getWizzardIcon()
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java
index d4e652b..9793a18 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/WizardController.java
@@ -9,9 +9,9 @@ package net.java.sip.communicator.impl.gui.customcontrols.wizard;
 
 import java.awt.event.*;
 
-import net.java.sip.communicator.service.gui.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.service.gui.*;
 
 /**
  * This class is responsible for reacting to events generated by pushing any
@@ -82,10 +82,11 @@ public class WizardController implements ActionListener {
             //validation or account initialization. If this is what happened here
             //just show an error and leave everything on the same page so that
             //the user would have the chance to correct errors.
-            new ErrorDialog(null,
-                            Messages.getI18NString("error").getText(),
-                            ex.getMessage(),
-                            ex).showDialog();
+            new ErrorDialog(
+                null,
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+                ex.getMessage(),
+                ex).showDialog();
             return;
         }
 
diff --git a/src/net/java/sip/communicator/impl/gui/i18n/I18NString.java b/src/net/java/sip/communicator/impl/gui/i18n/I18NString.java
deleted file mode 100644
index 83bf110..0000000
--- a/src/net/java/sip/communicator/impl/gui/i18n/I18NString.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.impl.gui.i18n;
-
-public class I18NString
-{
-
-    private String text;
-    
-    private char mnemonic;
-
-    public char getMnemonic()
-    {
-        return mnemonic;
-    }
-
-    public void setMnemonic(char mnemonic)
-    {
-        this.mnemonic = mnemonic;
-    }
-
-    public String getText()
-    {
-        return text;
-    }
-
-    public void setText(String text)
-    {
-        this.text = text;
-    }
-}
diff --git a/src/net/java/sip/communicator/impl/gui/i18n/Messages.java b/src/net/java/sip/communicator/impl/gui/i18n/Messages.java
deleted file mode 100644
index 8f1a053..0000000
--- a/src/net/java/sip/communicator/impl/gui/i18n/Messages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package net.java.sip.communicator.impl.gui.i18n;
-
-import java.text.*;
-import java.util.*;
-
-import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.service.resources.*;
-
-/**
- * The Messages class manages the access to the internationalization properties
- * files.
- * 
- * @author Yana Stamcheva
- */
-public class Messages {
-
-    /**
-     * Returns an internationalized string corresponding to the given key.
-     * @param key The key of the string.
-     * @return An internationalized string corresponding to the given key.
-     */
-    public static I18NString getI18NString(String key) {        
-        I18NString i18nString = new I18NString();
-
-        try {
-            ResourceManagementService resources = GuiActivator.getResources();
-            String resourceString = resources.getI18NString(key);
-            char mnemonic = resources.getI18nMnemonic(key);
-
-            if(mnemonic > 0) 
-                i18nString.setMnemonic(mnemonic);            
-            i18nString.setText(resourceString);
-
-        } catch (MissingResourceException e) {
-            i18nString.setText('!' + key + '!');
-        }
-        
-        return i18nString;
-    }
-
-    /**
-     * Returns an internationalized string corresponding to the given key, by
-     * replacing all occurrences of '?' with the given string param.
-     * 
-     * @param key The key of the string.
-     * @param params the params, that should replace {1}, {2}, etc. in the
-     *            string given by the key parameter
-     * @return An internationalized string corresponding to the given key, by
-     *         replacing all occurrences of '?' with the given string param.
-     */
-    public static I18NString getI18NString(String key, String[] params) {        
-        I18NString i18nString = new I18NString();
-
-        try {
-            ResourceManagementService resources = GuiActivator.getResources();
-            String resourceString = resources.getI18NString(key);
-
-            // Escape the single quote
-            resourceString = resourceString.replaceAll("'", "''");
-            resourceString =
-                MessageFormat.format(resourceString, (Object[]) params);
-
-            char mnemonic = resources.getI18nMnemonic(key);
-
-            if(mnemonic > 0) 
-                i18nString.setMnemonic(mnemonic);
-            i18nString.setText(resourceString);
-
-        } catch (MissingResourceException e) {
-            i18nString.setText('!' + key + '!');
-        }
-        
-        return i18nString;
-    }
-}
diff --git a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
index 13911e4..5433d6e 100755
--- a/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/MainFrame.java
@@ -18,7 +18,6 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
@@ -160,7 +159,8 @@ public class MainFrame
             this.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 
         this.setKeybindingInput(KeybindingSet.Category.MAIN);
-        this.addKeybindingAction("main-rename", new RenameAction());
+        this.addKeybindingAction("plugin.keybindings.MAIN_RENAME",
+                                new RenameAction());
 
         TransparentPanel northPanel = new TransparentPanel(new BorderLayout());
 
@@ -196,7 +196,7 @@ public class MainFrame
 
         moreActionsPanel.add(moreActionsLabel);
         moreActionsLabel.setToolTipText(GuiActivator.getResources()
-            .getI18NString("openTools"));
+            .getI18NString("service.gui.OPEN_TOOLS"));
 
         moreActionsLabel.addMouseListener(new ActionMenuMouseListener());
 
@@ -1453,9 +1453,11 @@ public class MainFrame
                     if (ConfigurationManager.isQuitWarningShown())
                     {
                         MessageDialog dialog =
-                            new MessageDialog(null, Messages.getI18NString(
-                                "close").getText(), Messages.getI18NString(
-                                "hideMainWindow").getText(), false);
+                            new MessageDialog(null,
+                                GuiActivator.getResources().getI18NString(
+                                "service.gui.CLOSE"),
+                                GuiActivator.getResources().getI18NString(
+                                "service.gui.HIDE_MAIN_WINDOW"), false);
 
                         if (dialog.showDialog() == MessageDialog.OK_DONT_ASK_CODE)
                             ConfigurationManager.setQuitWarningShown(false);
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
index 2be2ecc..c9ff6ac 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegSummaryPage.java
@@ -10,8 +10,8 @@ import java.util.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -37,8 +37,9 @@ public class AccountRegSummaryPage
 
     private AccountRegWizardContainerImpl wizardContainer;
 
-    private JLabel pageTitleLabel =
-        new JLabel(Messages.getI18NString("summary").getText(), JLabel.CENTER);
+    private JLabel pageTitleLabel = new JLabel(
+        GuiActivator.getResources().getI18NString("service.gui.SUMMARY"),
+        JLabel.CENTER);
 
     /**
      * Creates an <tt>AccountRegSummaryPage</tt>.
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
index eb275ea..9406f0a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountRegWizardContainerImpl.java
@@ -14,7 +14,6 @@ import javax.imageio.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.wizard.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
@@ -48,8 +47,8 @@ public class AccountRegWizardContainerImpl
     {
         super(mainFrame);
 
-        this.setTitle(Messages.getI18NString("accountRegistrationWizard")
-            .getText());
+        this.setTitle(GuiActivator.getResources()
+            .getI18NString("service.gui.ACCOUNT_REGISTRATION_WIZARD"));
 
         this.summaryPage = new AccountRegSummaryPage(this);
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
index 9316f25..e0fbf4f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationForm.java
@@ -15,8 +15,9 @@ import javax.imageio.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
+
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.configuration.*;
 import net.java.sip.communicator.service.gui.*;
@@ -43,9 +44,11 @@ public class AccountsConfigurationForm
 
     private final JPanel accountsPanel = new TransparentPanel();
 
-    private final JButton newButton;
+    private final JButton newButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.NEW_ACCOUNT"));
 
-    private final JButton saveButton;
+    private final JButton saveButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.SAVE"));
 
     private final Map<ProtocolProviderService, AccountPanel> accounts =
         new Hashtable<ProtocolProviderService, AccountPanel>();
@@ -69,16 +72,18 @@ public class AccountsConfigurationForm
         this.add(scrollPane, BorderLayout.CENTER);
         this.add(buttonsPanel, BorderLayout.SOUTH);
 
-        I18NString newString = Messages.getI18NString("newAccount");
-        newButton = new JButton(newString.getText());
         newButton.addActionListener(this);
-        this.newButton.setMnemonic(newString.getMnemonic());
-        buttonsPanel.add(newButton);
-
-        I18NString saveString = Messages.getI18NString("save");
-        saveButton = new JButton(saveString.getText());
         saveButton.addActionListener(this);
-        saveButton.setMnemonic(saveString.getMnemonic());
+
+        this.newButton.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.NEW_ACCOUNT"));
+
+        this.saveButton.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.SAVE"));
+
+        buttonsPanel.add(newButton);
         buttonsPanel.add(saveButton);
 
         scrollPane.getViewport().add(wrapAccountsPanel);
@@ -138,13 +143,11 @@ public class AccountsConfigurationForm
 
         private JPasswordField passwordField = new JPasswordField();
 
-        private I18NString modifyString = Messages.getI18NString("settings");
-
-        private I18NString removeString = Messages.getI18NString("remove");
-
-        private JButton modifyButton = new JButton(modifyString.getText());
+        private JButton modifyButton = new JButton(
+            GuiActivator.getResources().getI18NString("service.gui.MODIFY"));
 
-        private JButton removeButton = new JButton(removeString.getText());
+        private JButton removeButton = new JButton(
+            GuiActivator.getResources().getI18NString("service.gui.REMOVE"));
 
         private GridBagConstraints constraints = new GridBagConstraints();
 
@@ -263,9 +266,12 @@ public class AccountsConfigurationForm
                 if (providerFactory != null)
                 {
                     int result =
-                        JOptionPane.showConfirmDialog(this, Messages
-                            .getI18NString("removeAccountMessage").getText(),
-                            Messages.getI18NString("removeAccount").getText(),
+                        JOptionPane.showConfirmDialog(
+                            this,
+                            GuiActivator.getResources().getI18NString(
+                                "service.gui.REMOVE_ACCOUNT_MESSAGE"),
+                            GuiActivator.getResources().getI18NString(
+                                "service.gui.REMOVE_ACCOUNT"),
                             JOptionPane.YES_NO_OPTION);
 
                     if (result == JOptionPane.YES_OPTION)
@@ -304,8 +310,8 @@ public class AccountsConfigurationForm
                     (AccountRegWizardContainerImpl) GuiActivator.getUIService()
                         .getAccountRegWizardContainer();
 
-                wizard.setTitle(Messages.getI18NString(
-                    "accountRegistrationWizard").getText());
+                wizard.setTitle(GuiActivator.getResources().getI18NString(
+                    "service.gui.ACCOUNT_REGISTRATION_WIZARD"));
 
                 wizard.modifyAccount(protocolProvider);
                 wizard.showDialog(false);
@@ -320,7 +326,7 @@ public class AccountsConfigurationForm
      */
     public String getTitle()
     {
-        return Messages.getI18NString("accounts").getText();
+        return GuiActivator.getResources().getI18NString("service.gui.ACCOUNTS");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
index 10f4243..92fcafe 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/NewAccountDialog.java
@@ -13,7 +13,6 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -38,18 +37,18 @@ public class NewAccountDialog
         = new TransparentPanel(new BorderLayout());
 
     private JLabel networkLabel = new JLabel(
-        Messages.getI18NString("network").getText());
+        GuiActivator.getResources().getI18NString("service.gui.NETWORK"));
 
     private JComboBox networkComboBox = new JComboBox();
 
     private JButton advancedButton = new JButton(
-        Messages.getI18NString("advanced").getText());
+        GuiActivator.getResources().getI18NString("service.gui.ADVANCED"));
 
     private JButton addAccountButton = new JButton(
-        Messages.getI18NString("add").getText());
+        GuiActivator.getResources().getI18NString("service.gui.ADD"));
 
     private JButton cancelButton = new JButton(
-        Messages.getI18NString("cancel").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
     private TransparentPanel rightButtonPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0));
@@ -63,7 +62,8 @@ public class NewAccountDialog
     {
         super(GuiActivator.getUIService().getMainFrame());
 
-        this.setTitle(Messages.getI18NString("newAccount").getText());
+        this.setTitle(
+            GuiActivator.getResources().getI18NString("service.gui.NEW_ACCOUNT"));
 
         this.getContentPane().add(mainPanel);
 
@@ -263,8 +263,9 @@ public class NewAccountDialog
         {
             wizard.setModification(false);
 
-            wizardContainer.setTitle(Messages.getI18NString(
-                "accountRegistrationWizard").getText());
+            wizardContainer.setTitle(
+                GuiActivator.getResources().getI18NString(
+                "service.gui.ACCOUNT_REGISTRATION_WIZARD"));
 
             wizardContainer.setCurrentWizard(wizard);
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
index 07720a3..6fe313c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationRequestedDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -49,17 +50,14 @@ public class AuthorizationRequestedDialog
     private JLabel iconLabel = new JLabel(new ImageIcon(
             ImageLoader.getImage(ImageLoader.AUTHORIZATION_ICON)));
     
-    private I18NString acceptString = Messages.getI18NString("accept");
-    
-    private I18NString rejectString = Messages.getI18NString("reject");
-    
-    private I18NString ignoreString = Messages.getI18NString("ignore");
+    private JButton acceptButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.ACCEPT"));
     
-    private JButton acceptButton = new JButton(acceptString.getText());
+    private JButton rejectButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.REJECT"));
     
-    private JButton rejectButton = new JButton(rejectString.getText());
-    
-    private JButton ignoreButton = new JButton(ignoreString.getText());
+    private JButton ignoreButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.IGNORE"));
     
     private JScrollPane requestScrollPane = new JScrollPane();
     
@@ -69,7 +67,8 @@ public class AuthorizationRequestedDialog
         new TransparentPanel(new GridLayout(0, 1, 5, 5));
     
     private String title
-        = Messages.getI18NString("authorizationRequested").getText();
+        = GuiActivator.getResources()
+            .getI18NString("service.gui.AUTHORIZATION_REQUESTED");
     
     private Object lock = new Object();
     
@@ -89,13 +88,15 @@ public class AuthorizationRequestedDialog
         this.setModal(false);
         
         this.setTitle(title);
-
+        
         titleLabel.setHorizontalAlignment(JLabel.CENTER);
         titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f));
         titleLabel.setText(title);
         
-        infoTextArea.setText(Messages.getI18NString("authorizationRequestedInfo", 
-                new String[]{contact.getDisplayName()}).getText());
+        infoTextArea.setText(
+            GuiActivator.getResources().getI18NString(
+                "service.gui.AUTHORIZATION_REQUESTED_INFO", 
+                new String[]{contact.getDisplayName()}));
         
         this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
         this.infoTextArea.setLineWrap(true);
@@ -109,49 +110,51 @@ public class AuthorizationRequestedDialog
         this.northPanel.add(iconLabel, BorderLayout.WEST);
         this.northPanel.add(titlePanel, BorderLayout.CENTER);
         
-        if(request.getReason() != null && !request.getReason().equals("")) {
-            
+        if(request.getReason() != null && !request.getReason().equals(""))
+        {
             this.requestScrollPane.setBorder(BorderFactory.createCompoundBorder(
                 BorderFactory.createEmptyBorder(3, 3, 3, 3),
                 SIPCommBorders.getBoldRoundBorder()));
-        
+            
             this.requestPane.setEditable(false);
             this.requestPane.setOpaque(false);
             this.requestPane.setText(request.getReason());
-                    
+            
             this.requestScrollPane.getViewport().add(requestPane);
             
             this.reasonsPanel.add(requestScrollPane);
             
-            this.mainPanel.setPreferredSize(new Dimension(550, 300));            
+            this.mainPanel.setPreferredSize(new Dimension(550, 300));
         }
         else {
             this.mainPanel.setPreferredSize(new Dimension(550, 200));
         }
-        
-        
-        this.acceptButton.setName("accept");
+
+        this.acceptButton.setName("service.gui.ACCEPT");
         this.rejectButton.setName("reject");
         this.ignoreButton.setName("ignore");
-        
+
         this.getRootPane().setDefaultButton(acceptButton);
         this.acceptButton.addActionListener(this);
         this.rejectButton.addActionListener(this);
         this.ignoreButton.addActionListener(this);
-                
-        this.acceptButton.setMnemonic(acceptString.getMnemonic());
-        this.rejectButton.setMnemonic(rejectString.getMnemonic());
-        this.ignoreButton.setMnemonic(ignoreString.getMnemonic());
-        
+
+        this.acceptButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.ACCEPT"));
+        this.rejectButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.REJECT"));
+        this.ignoreButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.IGNORE"));
+
         this.buttonsPanel.add(acceptButton);
         this.buttonsPanel.add(rejectButton);
         this.buttonsPanel.add(ignoreButton);
-        
+
         this.mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         this.mainPanel.add(northPanel, BorderLayout.NORTH);        
         this.mainPanel.add(reasonsPanel, BorderLayout.CENTER);
         this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
-        
+
         this.getContentPane().add(mainPanel);
     }
 
@@ -159,11 +162,14 @@ public class AuthorizationRequestedDialog
      * Shows this modal dialog.
      * @return the result code, which shows what was the choice of the user
      */
-    public int showDialog() {
+    public int showDialog()
+    {
         this.setVisible(true);
         
-        synchronized (lock) {
-            try {                    
+        synchronized (lock)
+        {
+            try
+            {
                 lock.wait();
             }
             catch (InterruptedException e) {
@@ -183,7 +189,7 @@ public class AuthorizationRequestedDialog
         JButton button = (JButton)e.getSource();
         String name = button.getName();
         
-        if (name.equals("accept")) {
+        if (name.equals("service.gui.ACCEPT")) {
             this.result = ACCEPT_CODE;
         }
         else if (name.equals("reject")) {
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
index 508a408..b65dbab 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/AuthorizationResponseDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -28,9 +29,8 @@ public class AuthorizationResponseDialog extends SIPCommDialog
     private JPanel buttonsPanel =
         new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
-    private I18NString okString = Messages.getI18NString("ok");
-    
-    private JButton okButton = new JButton(okString.getText());
+    private JButton okButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.OK"));
     
     private JScrollPane responseScrollPane = new JScrollPane();
     
@@ -46,8 +46,9 @@ public class AuthorizationResponseDialog extends SIPCommDialog
     private JLabel titleLabel = new JLabel();
     
     private String title
-        = Messages.getI18NString("authorizationResponse").getText();
-        
+        = GuiActivator.getResources()
+            .getI18NString("service.gui.AUTHORIZATION_RESPONSE");
+    
     /**
      * Constructs the <tt>RequestAuthorisationDialog</tt>.
      * 
@@ -68,17 +69,19 @@ public class AuthorizationResponseDialog extends SIPCommDialog
         titleLabel.setText(title);
         
         this.mainPanel.setPreferredSize(new Dimension(400, 250));
-                
+        
         AuthorizationResponse.AuthorizationResponseCode responseCode
             = response.getResponseCode();
         
         if(responseCode.equals(AuthorizationResponse.ACCEPT)) {
             infoTextArea.setText(contact.getDisplayName() + " "
-                    + Messages.getI18NString("authAccepted").getText());
+                + GuiActivator.getResources().getI18NString(
+                    "service.gui.AUTHORIZATION_ACCEPTED"));
         }
         else if(responseCode.equals(AuthorizationResponse.REJECT)) {
             infoTextArea.setText(contact.getDisplayName() + " "
-                    + Messages.getI18NString("authRejected").getText());
+                + GuiActivator.getResources()
+                    .getI18NString("service.gui.AUTHENTICATION_REJECTED"));
         }
         
         if(response.getReason() != null && !response.getReason().equals("")) {
@@ -117,7 +120,8 @@ public class AuthorizationResponseDialog extends SIPCommDialog
         
         this.okButton.requestFocus();
         this.okButton.setName("ok");
-        this.okButton.setMnemonic(okString.getMnemonic());
+        this.okButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.OK"));
         this.getRootPane().setDefaultButton(okButton);
         
         this.okButton.addActionListener(this);
@@ -128,7 +132,7 @@ public class AuthorizationResponseDialog extends SIPCommDialog
         this.mainPanel.add(northPanel, BorderLayout.NORTH);
         this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
         
-        this.getContentPane().add(mainPanel);        
+        this.getContentPane().add(mainPanel);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
index 1ed011d..5c3adda 100644
--- a/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/authorization/RequestAuthorizationDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -34,7 +35,8 @@ public class RequestAuthorizationDialog
     private JTextArea infoTextArea = new JTextArea();
     
     private JLabel requestLabel = new JLabel(
-        Messages.getI18NString("typeYourRequest").getText() + ": ");
+        GuiActivator.getResources()
+            .getI18NString("service.gui.TYPE_YOUR_REQUEST") + ": ");
     
     private JTextField requestField = new JTextField();
 
@@ -43,13 +45,13 @@ public class RequestAuthorizationDialog
     private JPanel buttonsPanel =
         new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
-    private I18NString requestString = Messages.getI18NString("request");
-    
-    private I18NString cancelString = Messages.getI18NString("cancel");
+    private String cancelString
+        = GuiActivator.getResources().getI18NString("service.gui.CANCEL");
     
-    private JButton requestButton = new JButton(requestString.getText());
+    private JButton requestButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.REQUEST"));
     
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(cancelString);
     
     private JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10));
     
@@ -62,8 +64,8 @@ public class RequestAuthorizationDialog
     
     private JLabel titleLabel = new JLabel();
     
-    private String title
-        = Messages.getI18NString("requestAuthorization").getText();
+    private String title = GuiActivator.getResources()
+        .getI18NString("service.gui.REQUEST_AUTHORIZATION");
     
     private AuthorizationRequest request;
     
@@ -85,7 +87,7 @@ public class RequestAuthorizationDialog
         this.setModal(false);
         
         this.setTitle(title);
-    
+        
         titleLabel.setHorizontalAlignment(JLabel.CENTER);
         titleLabel.setFont(Constants.FONT.deriveFont(Font.BOLD, 18f));
         titleLabel.setText(title);
@@ -94,15 +96,16 @@ public class RequestAuthorizationDialog
         
         this.request = request;
         
-        infoTextArea.setText(Messages.getI18NString("requestAuthorizationInfo", 
-                new String[]{contact.getDisplayName()}).getText());
+        infoTextArea.setText(GuiActivator.getResources().getI18NString(
+            "service.gui.REQUEST_AUTHORIZATION_MSG", 
+            new String[]{contact.getDisplayName()}));
         
         this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
         this.infoTextArea.setLineWrap(true);
         this.infoTextArea.setOpaque(false);
         this.infoTextArea.setWrapStyleWord(true);
         this.infoTextArea.setEditable(false);
-                
+        
         this.titlePanel.add(titleLabel);
         this.titlePanel.add(infoTextArea);
         
@@ -122,15 +125,17 @@ public class RequestAuthorizationDialog
         this.buttonsPanel.add(cancelButton);
         
         this.getRootPane().setDefaultButton(requestButton);
-        this.requestButton.setMnemonic(requestString.getMnemonic());
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.requestButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.REQUEST"));
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         this.mainPanel.add(northPanel, BorderLayout.NORTH);
         this.mainPanel.add(requestPanel, BorderLayout.CENTER);
         this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
         
-        this.getContentPane().add(mainPanel);                   
+        this.getContentPane().add(mainPanel);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
index fc1e390..f16637f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallDialog.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.swing.*;
@@ -45,7 +44,8 @@ public class CallDialog
     {
         this.callPanel = callPanel;
 
-        this.setTitle(GuiActivator.getResources().getI18NString("call"));
+        this.setTitle(
+            GuiActivator.getResources().getI18NString("service.gui.CALL"));
 
         this.setPreferredSize(new Dimension(500, 400));
 
@@ -60,7 +60,8 @@ public class CallDialog
 
         dialButton.setName(DIAL_BUTTON);
 
-        dialButton.setToolTipText(Messages.getI18NString("dialpad").getText());
+        dialButton.setToolTipText(
+            GuiActivator.getResources().getI18NString("service.gui.DIALPAD"));
 
         dialButton.addActionListener(this);
 
@@ -71,7 +72,7 @@ public class CallDialog
         hangupButton.setName(HANGUP_BUTTON);
 
         hangupButton.setToolTipText(
-            Messages.getI18NString("hangUp").getText());
+            GuiActivator.getResources().getI18NString("service.gui.HANG_UP"));
 
         hangupButton.addActionListener(this);
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index 54c83dd..53e7673 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -261,7 +261,7 @@ public class CallManager
                 logger.error("The call could not be created: " + e);
 
                 new ErrorDialog(null,
-                    GuiActivator.getResources().getI18NString("error"),
+                    GuiActivator.getResources().getI18NString("service.gui.ERROR"),
                     e.getMessage(),
                     ErrorDialog.ERROR).showDialog();
             }
@@ -270,7 +270,7 @@ public class CallManager
                 logger.error("The call could not be created: " + e);
 
                 new ErrorDialog(null,
-                    GuiActivator.getResources().getI18NString("error"),
+                    GuiActivator.getResources().getI18NString("service.gui.ERROR"),
                     e.getMessage(),
                     ErrorDialog.ERROR).showDialog();
             }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
index b19648e..59845ab 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallParticipantPanel.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import javax.swing.Timer;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
+
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
@@ -328,19 +328,22 @@ public class CallParticipantPanel
 
                 secureButton.setActionCommand("startSecureMode");
                 secureButton.setName("secureButton");
-                secureButton.setToolTipText(Messages.getI18NString(
-                    "toggleOnSecurity").getText());
+                secureButton.setToolTipText(
+                    GuiActivator.getResources().getI18NString(
+                    "impl.media.security.TOGGLE_ON_SECURITY"));
                 return secureButton;
             }
         }
         return null;
     }
 
-    public void changeSecureCallButton(boolean onOff) {
+    public void changeSecureCallButton(boolean onOff)
+    {
         secureButton.updateSecureButton(onOff);
     }
 
-    public void changeZrtpPanel(SecurityGUIEventZrtp securityEvent) {
+    public void changeZrtpPanel(SecurityGUIEventZrtp securityEvent)
+    {
         Call call = callParticipant.getCall();
 
         if (call != null) {
@@ -710,7 +713,7 @@ public class CallParticipantPanel
                 .getImage(ImageLoader.ENTER_FULL_SCREEN_BUTTON)));
 
         button.setToolTipText(GuiActivator.getResources().getI18NString(
-            "CallParticipantPanel_enterFullScreenButtonToolTipText"));
+            "service.gui.ENTER_FULL_SCREEN_TOOL_TIP"));
         button.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent event)
@@ -728,7 +731,7 @@ public class CallParticipantPanel
                 .getImage(ImageLoader.EXIT_FULL_SCREEN_BUTTON)));
 
         button.setToolTipText(GuiActivator.getResources().getI18NString(
-            "CallParticipantPanel_exitFullScreenButtonToolTipText"));
+            "service.gui.EXIT_FULL_SCREEN_TOOL_TIP"));
         button.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent event)
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
index 6f4b916..41f8bc2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/HoldButton.java
@@ -39,7 +39,7 @@ public class HoldButton
 
         setModel(new HoldButtonModel(callParticipant));
         setToolTipText(GuiActivator.getResources().getI18NString(
-            "HoldButton_toolTipText"));
+            "service.gui.HOLD_BUTTON_TOOL_TIP"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
index 84c6571..049bc5f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MainCallPanel.java
@@ -16,7 +16,6 @@ import javax.swing.event.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
@@ -65,7 +64,9 @@ public class MainCallPanel
         = new TransparentPanel(new BorderLayout());
 
     private JLabel callViaLabel
-        = new JLabel(Messages.getI18NString("callVia").getText() + " ");
+        = new JLabel(
+            GuiActivator.getResources().getI18NString("service.gui.CALL_VIA")
+            + " ");
 
     private TransparentPanel callViaPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT, 0, 4));
@@ -113,7 +114,7 @@ public class MainCallPanel
         dialButton.setName(DIAL_BUTTON);
 
         callButton.setToolTipText(
-            Messages.getI18NString("call").getText());
+            GuiActivator.getResources().getI18NString("service.gui.CALL"));
 
         callButton.addActionListener(this);
         dialButton.addActionListener(this);
@@ -157,12 +158,12 @@ public class MainCallPanel
                         {
                             new ErrorDialog(
                                 this.mainFrame,
-                                Messages.getI18NString("warning").getText(),
-                                Messages.getI18NString(
-                                    "contactNotSupportingTelephony",
+                                GuiActivator.getResources()
+                                    .getI18NString("service.gui.WARNING"),
+                                GuiActivator.getResources().getI18NString(
+                                    "service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY",
                                     new String[]
-                                    { ((MetaContact) o).getDisplayName() })
-                                        .getText())
+                                    { ((MetaContact) o).getDisplayName() }))
                                 .showDialog();
                         }
                     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
index f86f98a..c4ce822 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/MuteButton.java
@@ -37,7 +37,7 @@ public class MuteButton
 
         setModel(new MuteButtonModel(callParticipant));
         setToolTipText(GuiActivator.getResources().getI18NString(
-            "MuteButton_toolTipText"));
+            "service.gui.MUTE_BUTTON_TOOL_TIP"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
index 7dc8d04..5ceb010 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/ReceivedCallDialog.java
@@ -151,14 +151,15 @@ public class ReceivedCallDialog
                 text = callLabel.getText()
                     + participant.getDisplayName()
                     + " "
-                    + GuiActivator.getResources().getI18NString("isCalling");
+                    + GuiActivator.getResources().getI18NString("service.gui.IS_CALLING");
 
                 imageIcon = getParticipantImage(participant);
             }
         }
 
         if (hasMoreParticipants)
-            text += GuiActivator.getResources().getI18NString("areCalling");
+            text += GuiActivator.getResources()
+                .getI18NString("service.gui.ARE_CALLING");
 
         callLabel.setIcon(imageIcon);
         callLabel.setText(text);
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
index f1cd898..7226b07 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/SecureButton.java
@@ -10,7 +10,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -84,7 +85,7 @@ public class SecureButton
             // We deactivate the tooltip at the moment, because the 
             // secure mode cannot be toggled off
             //this.setToolTipText(
-            //        Messages.getI18NString("toggleOffSecurity").getText());
+            //        GuiActivator.getResources().getI18NString("impl.media.security.TOGGLE_OFF_SECURITY").getText());
             this.setToolTipText(null);
         }
         else
@@ -93,7 +94,8 @@ public class SecureButton
                 new ImageIcon(
                     ImageLoader.getImage(ImageLoader.SECURE_BUTTON_OFF)));
             this.setToolTipText(
-                    Messages.getI18NString("toggleOnSecurity").getText());
+                GuiActivator.getResources()
+                    .getI18NString("impl.media.security.TOGGLE_ON_SECURITY"));
         }
     }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
index e39d052..fe7e59e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallButton.java
@@ -54,7 +54,7 @@ public class TransferCallButton
         this.callParticipant = callParticipant;
 
         setToolTipText(GuiActivator.getResources().getI18NString(
-            "TransferCallButton_toolTipText"));
+            "service.gui.TRANSFER_BUTTON_TOOL_TIP"));
         addActionListener(new ActionListener()
         {
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java
index 9493c2a..9d0d9df 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/TransferCallDialog.java
@@ -12,8 +12,8 @@ import java.awt.event.*;
 import javax.swing.*;

 import javax.swing.event.*;

 

+import net.java.sip.communicator.impl.gui.*;

 import net.java.sip.communicator.impl.gui.customcontrols.*;

-import net.java.sip.communicator.impl.gui.i18n.*;

 import net.java.sip.communicator.impl.gui.lookandfeel.*;

 import net.java.sip.communicator.util.swing.*;

 

@@ -41,7 +41,8 @@ public class TransferCallDialog
     {

         super(owner);

 

-        setTitle(Messages.getI18NString("transferCallTitle").getText());

+        setTitle(GuiActivator.getResources()

+            .getI18NString("service.gui.TRANSFER_CALL_TITLE"));

 

         JPanel mainPanel = new TransparentPanel(new BorderLayout(5, 5));

         mainPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));

@@ -52,8 +53,9 @@ public class TransferCallDialog
         mainPanel.add(contentPanel, BorderLayout.NORTH);

 

         JLabel targetLabel =

-            new JLabel(Messages.getI18NString("transferCallTargetLabel")

-                .getText());

+            new JLabel(

+                GuiActivator.getResources().getI18NString("service.gui.TO"));

+

         contentPanel.add(targetLabel);

 

         targetComboBox = new SIPCommSmartComboBox();

@@ -65,11 +67,15 @@ public class TransferCallDialog
         mainPanel.add(buttonPanel, BorderLayout.SOUTH);

 

         okButton =

-            new JButton(Messages.getI18NString("transferCallButton").getText());

+            new JButton(GuiActivator.getResources()

+                .getI18NString("service.gui.TRANSFER"));

+

         buttonPanel.add(okButton);

         getRootPane().setDefaultButton(okButton);

 

-        cancelButton = new JButton(Messages.getI18NString("cancel").getText());

+        cancelButton = new JButton(

+            GuiActivator.getResources().getI18NString("service.gui.CANCEL"));

+

         buttonPanel.add(cancelButton);

 

         /*

diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
index fbd1fdc..b5bba70 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatContactRightButtonMenu.java
@@ -11,8 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -32,17 +32,11 @@ public class ChatContactRightButtonMenu
 {
     private Logger logger = Logger.getLogger(ChatContactRightButtonMenu.class);
     
-    private I18NString kickString
-        = Messages.getI18NString("kick");
-    
-    private I18NString banString
-        = Messages.getI18NString("ban");
-
     private JMenuItem kickItem = new JMenuItem(
-        kickString.getText());
+        GuiActivator.getResources().getI18NString("service.gui.KICK"));
     
     private JMenuItem banItem = new JMenuItem(
-        banString.getText());
+        GuiActivator.getResources().getI18NString("service.gui.BAN"));
     
     private static String KICK_OPERATION = "Kick";
     
@@ -78,11 +72,11 @@ public class ChatContactRightButtonMenu
         this.kickItem.setName("kick");
         this.banItem.setName("ban");
 
-        this.kickItem
-            .setMnemonic(kickString.getMnemonic());
+        this.kickItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.KICK"));
 
-        this.banItem
-            .setMnemonic(banString.getMnemonic());
+        this.banItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.BAN"));
 
         this.kickItem.addActionListener(this);
         this.banItem.addActionListener(this);
@@ -113,22 +107,24 @@ public class ChatContactRightButtonMenu
             ImageLoader.getImage(ImageLoader.REASON_DIALOG_ICON)));
         
         private JLabel infoLabel = new JLabel(
-            Messages.getI18NString("specifyReason").getText());
+            GuiActivator.getResources()
+                .getI18NString("service.gui.SPECIFY_REASON"));
         
         private JLabel reasonLabel = new JLabel(
-            Messages.getI18NString("reason").getText() + ":");
+            GuiActivator.getResources()
+                .getI18NString("service.gui.REASON") + ":");
         
         private JTextField reasonField = new JTextField();
         
         private JButton okButton = new JButton(
-            Messages.getI18NString("ok").getText());
+            GuiActivator.getResources().getI18NString("service.gui.OK"));
         
         private JButton cancelButton = new JButton(
-            Messages.getI18NString("cancel").getText());
+            GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
         
         private JPanel buttonsPanel
             = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-    
+        
         private JPanel titlePanel = new JPanel(new BorderLayout(10, 10));
         
         private JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
@@ -139,13 +135,14 @@ public class ChatContactRightButtonMenu
         {
             super(chatPanel.getChatWindow());
             
-            this.setTitle(Messages.getI18NString("reason").getText());
+            this.setTitle(
+                GuiActivator.getResources().getI18NString("service.gui.REASON"));
             
             this.operationType = operation;
             
             this.buttonsPanel.add(okButton);
             this.buttonsPanel.add(cancelButton);
-         
+            
             okButton.addActionListener(new ActionListener()
             {
                 public void actionPerformed(ActionEvent e)
@@ -161,11 +158,12 @@ public class ChatContactRightButtonMenu
                     if(chatRoom == null)
                     {
                         new ErrorDialog(chatPanel.getChatWindow(),
-                            Messages.getI18NString("error").getText(),
-                            Messages.getI18NString("chatRoomNotJoined")
-                                .getText())
+                            GuiActivator.getResources()
+                                .getI18NString("service.gui.ERROR"),
+                            GuiActivator.getResources()
+                                .getI18NString("service.gui.CHAT_ROOM_NOT_JOINED"))
                                 .setVisible(true);
-                        
+
                         return;
                     }
                     
@@ -248,10 +246,11 @@ public class ChatContactRightButtonMenu
                 {
                     ErrorDialog errorDialog
                         = new ErrorDialog(chatPanel.getChatWindow(),
-                            Messages.getI18NString("kickFailed").getText(),
-                            Messages.getI18NString(
-                            "kickFailedNotEnoughPermissions",
-                            new String[]{chatContact.getName()}).getText(),
+                            GuiActivator.getResources()
+                                .getI18NString("service.gui.KICK_FAILED"),
+                            GuiActivator.getResources().getI18NString(
+                            "service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS",
+                            new String[]{chatContact.getName()}),
                             e);
 
                     errorDialog.showDialog();
@@ -260,17 +259,21 @@ public class ChatContactRightButtonMenu
                     == OperationFailedException.FORBIDDEN)
                 {   
                     new ErrorDialog(chatPanel.getChatWindow(),
-                        Messages.getI18NString("kickFailed").getText(),
-                        Messages.getI18NString("kickFailedNotAllowed",
-                            new String[]{chatContact.getName()}).getText(),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.KICK_FAILED"),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.KICK_FAILED_NOT_ALLOWED",
+                            new String[]{chatContact.getName()}),
                             e).showDialog();
                 }
                 else
                 {
                     new ErrorDialog(chatPanel.getChatWindow(),
-                        Messages.getI18NString("kickFailed").getText(),
-                        Messages.getI18NString("kickFailedGeneralError",
-                            new String[]{chatContact.getName()}).getText(),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.KICK_FAILED"),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.KICK_FAILED_GENERAL_ERROR",
+                            new String[]{chatContact.getName()}),
                         e).showDialog();
                 }
             }
@@ -304,33 +307,37 @@ public class ChatContactRightButtonMenu
             catch (OperationFailedException e)
             {
                 logger.error("Failed to ban participant.", e);
-                
+
+                String errorTitle = GuiActivator.getResources()
+                    .getI18NString("service.gui.BAN_FAILED");
+
                 if (e.getErrorCode()
                     == OperationFailedException.NOT_ENOUGH_PRIVILEGES)
                 {
                     new ErrorDialog(chatPanel.getChatWindow(),
-                        Messages.getI18NString("banFailed").getText(),
-                        Messages.getI18NString("banFailedNotEnoughPermissions",
-                            new String[]{chatContact.getName()})
-                            .getText(),
+                        errorTitle,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS",
+                            new String[]{chatContact.getName()}),
                         e).showDialog();
                 }
                 else if (e.getErrorCode()
                     == OperationFailedException.FORBIDDEN)
                 {
                     new ErrorDialog(chatPanel.getChatWindow(),
-                        Messages.getI18NString("banFailed").getText(),
-                        Messages.getI18NString("banFailedNotAllowed",
-                            new String[]{chatContact.getName()}).getText(),
+                        errorTitle,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.BAN_FAILED_NOT_ALLOWED",
+                            new String[]{chatContact.getName()}),
                         e).showDialog();
                 }
                 else
                 {
                     new ErrorDialog(chatPanel.getChatWindow(),
-                        Messages.getI18NString("banFailed").getText(),
-                        Messages.getI18NString("banFailedGeneralError",
-                            new String[]{chatContact.getName()})
-                            .getText(),
+                        errorTitle,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.BAN_FAILED_GENERAL_ERROR",
+                            new String[]{chatContact.getName()}),
                         e).showDialog();
                 }
             }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
index e6a3a88..b53287d 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatConversationPanel.java
@@ -20,7 +20,6 @@ import javax.swing.text.html.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -118,10 +117,13 @@ public class ChatConversationPanel
 
         ToolTipManager.sharedInstance().registerComponent(chatEditorPane);
 
-        I18NString copyLinkString = Messages.getI18NString("copyLink");
+        String copyLinkString
+            = GuiActivator.getResources().getI18NString("service.gui.COPY_LINK");
+
         copyLinkItem =
-            new JMenuItem(copyLinkString.getText(), new ImageIcon(ImageLoader
-                .getImage(ImageLoader.COPY_ICON)));
+            new JMenuItem(copyLinkString,
+                new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON)));
+
         copyLinkItem.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent e)
@@ -135,10 +137,15 @@ public class ChatConversationPanel
             }
         });
 
-        I18NString openLinkString = Messages.getI18NString("openInBrowser");
+        String openLinkString
+            = GuiActivator.getResources().getI18NString(
+                "service.gui.OPEN_IN_BROWSER");
+
         openLinkItem =
-            new JMenuItem(openLinkString.getText(), new ImageIcon(ImageLoader
-                .getImage(ImageLoader.BROWSER_ICON)));
+            new JMenuItem(
+                openLinkString,
+                new ImageIcon(ImageLoader.getImage(ImageLoader.BROWSER_ICON)));
+
         openLinkItem.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent e)
@@ -147,8 +154,13 @@ public class ChatConversationPanel
             }
         });
 
-        openLinkItem.setMnemonic(openLinkString.getMnemonic());
-        copyLinkItem.setMnemonic(copyLinkString.getMnemonic());
+        openLinkItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic(
+                "service.gui.OPEN_IN_BROWSER"));
+
+        copyLinkItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic(
+                "service.gui.COPY_LINK"));
 
         /*
          * Tooltip on hyperlinks - JDK 1.5+
@@ -270,10 +282,12 @@ public class ChatConversationPanel
                             + msgHeaderID
                             + "\" date=\""
                             + msgDate + "\">";
-            
+
             endHeaderTag = "</h3>";
 
-            chatString += timeString + Messages.getI18NString("me").getText()
+            chatString += timeString
+                + GuiActivator.getResources()
+                    .getI18NString("service.gui.ME")
                 + " at " + GuiUtils.formatTime(date) + endHeaderTag
                 + startDivTag + startPlainTextTag
                 + formatMessage(message, contentType) + endPlainTextTag
@@ -323,7 +337,8 @@ public class ChatConversationPanel
                     .getImage(ImageLoader.EXCLAMATION_MARK)) + "' </IMG>";
 
             chatString += errorIcon
-                + Messages.getI18NString("msgDeliveryFailure").getText()
+                + GuiActivator.getResources()
+                    .getI18NString("service.gui.MSG_DELIVERY_FAILURE")
                 + endHeaderTag + "<h5>" + message + "</h5>";
         }
         else if (messageType.equals(Constants.HISTORY_INCOMING_MESSAGE))
@@ -349,7 +364,9 @@ public class ChatConversationPanel
             
             endHeaderTag = "</h3>";
 
-            chatString += timeString + Messages.getI18NString("me").getText()
+            chatString += timeString
+                + GuiActivator.getResources()
+                    .getI18NString("service.gui.ME")
                 + " at " + GuiUtils.formatTime(date) + endHeaderTag
                 + startHistoryDivTag + startPlainTextTag
                 + formatMessage(message, contentType) + endPlainTextTag
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
index 892bf41..1c7241a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatPanel.java
@@ -13,13 +13,13 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.*;
 import java.util.*;
+
 import javax.swing.*;
 import javax.swing.text.*;
 import javax.swing.text.html.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -54,8 +54,8 @@ public class ChatPanel
 
     private final JSplitPane messagePane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
 
-    private final JCheckBox sendSmsCheckBox =
-        new SIPCommCheckBox(Messages.getI18NString("sendAsSms").getText());
+    private final JCheckBox sendSmsCheckBox = new JCheckBox(
+        GuiActivator.getResources().getI18NString("service.gui.SEND_AS_SMS"));
 
     private JSplitPane topSplitPane;
 
@@ -819,8 +819,9 @@ public class ChatPanel
                 smsChatTransport.getName(),
                 new Date(System.currentTimeMillis()),
                 Constants.ERROR_MESSAGE,
-                Messages.getI18NString("sendSmsNotSupported")
-                .getText(), "plain/text");
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.SEND_SMS_NOT_SUPPORTED"),
+                "plain/text");
 
             return;
         }
@@ -883,8 +884,9 @@ public class ChatPanel
                 chatSession.getCurrentChatTransport().getName(),
                 new Date(System.currentTimeMillis()),
                 Constants.ERROR_MESSAGE,
-                Messages.getI18NString("msgSendConnectionProblem")
-                .getText(), "text");
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_SEND_CONNECTION_PROBLEM"),
+                "text");
         }
         catch (Exception ex)
         {
@@ -903,9 +905,10 @@ public class ChatPanel
                 chatSession.getCurrentChatTransport().getName(),
                 new Date(System.currentTimeMillis()),
                 Constants.ERROR_MESSAGE,
-                Messages.getI18NString("msgDeliveryUnknownError",
-                    new String[]{ex.getMessage()})
-                    .getText(), "text");
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                    new String[]{ex.getMessage()}),
+                "text");
         }
 
         if (chatSession.getCurrentChatTransport().allowsTypingNotifications())
@@ -931,8 +934,9 @@ public class ChatPanel
             transportSelectorBox = new ChatTransportSelectorBox(
                 this, chatSession, chatSession.getCurrentChatTransport());
 
-            sendViaLabel
-                = new JLabel(Messages.getI18NString("sendVia").getText());
+            sendViaLabel = new JLabel(
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.SEND_VIA"));
         }
 
         JPanel sendPanel = getChatSendPanel().getSendPanel();
@@ -985,8 +989,9 @@ public class ChatPanel
                     contact.getDisplayName(),
                     new Date(System.currentTimeMillis()),
                     Constants.ACTION_MESSAGE,
-                    Messages.getI18NString("smsSuccessfullySent")
-                    .getText(), "text");
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.SMS_SUCCESSFULLY_SENT"),
+                    "text");
         }
 
         public void messageDeliveryFailed(MessageDeliveryFailedEvent evt)
@@ -1005,29 +1010,30 @@ public class ChatPanel
             if (evt.getErrorCode() 
                     == MessageDeliveryFailedEvent.OFFLINE_MESSAGES_NOT_SUPPORTED)
             {
-                errorMsg = Messages.getI18NString(
-                        "msgDeliveryOfflineNotSupported").getText();
+                errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_NOT_SUPPORTED");
             }
             else if (evt.getErrorCode()
                     == MessageDeliveryFailedEvent.NETWORK_FAILURE)
             {
-                errorMsg = Messages.getI18NString("msgNotDelivered").getText();
+                errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_NOT_DELIVERED");
             }
             else if (evt.getErrorCode()
                     == MessageDeliveryFailedEvent.PROVIDER_NOT_REGISTERED)
             {
-                errorMsg = Messages.getI18NString(
-                        "msgSendConnectionProblem").getText();
+                errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_SEND_CONNECTION_PROBLEM");
             }
             else if (evt.getErrorCode()
                     == MessageDeliveryFailedEvent.INTERNAL_ERROR)
             {
-                errorMsg = Messages.getI18NString(
-                        "msgDeliveryInternalError").getText();
+                errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_INTERNAL_ERROR");
             }
             else {
-                errorMsg = Messages.getI18NString(
-                        "msgDeliveryFailedUnknownError").getText();
+                errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_UNKNOWN_ERROR");
             }
 
             processMessage(
@@ -1211,9 +1217,9 @@ public class ChatPanel
             chatTransport.getName(),
             new Date(System.currentTimeMillis()),
             Constants.STATUS_MESSAGE,
-            Messages.getI18NString("statusChangedChatMessage",
-                new String[]{chatTransport.getStatus().getStatusName()})
-                    .getText(),
+            GuiActivator.getResources().getI18NString(
+                "service.gui.STATUS_CHANGED_CHAT_MESSAGE",
+                new String[]{chatTransport.getStatus().getStatusName()}),
                 "text/plain");
 
         getChatConversationPanel().appendMessageToEnd(message);
@@ -1362,9 +1368,10 @@ public class ChatPanel
                 chatSession.getChatName(),
                 new Date(System.currentTimeMillis()),
                 Constants.STATUS_MESSAGE,
-                Messages.getI18NString("chatRoomSubjectChanged",
-                    new String []{chatSession.getChatName(),
-                    subject}).getText(),
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.CHAT_ROOM_SUBJECT_CHANGED",
+                    new String []{  chatSession.getChatName(),
+                                    subject}),
                 ChatConversationPanel.TEXT_CONTENT_TYPE);
         }
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
index 48fddc3..58997e5 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatSendPanel.java
@@ -11,7 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
@@ -48,8 +48,8 @@ public class ChatSendPanel
     {
         super(new BorderLayout(5, 0));
 
-        I18NString sendString = Messages.getI18NString("send");
-        sendButton = new JButton(sendString.getText());
+        sendButton = new JButton(
+            GuiActivator.getResources().getI18NString("service.gui.SEND"));
 
         this.chatPanel = chatPanel;
 
@@ -61,7 +61,8 @@ public class ChatSendPanel
         this.add(sendPanel, BorderLayout.EAST);
 
         this.sendButton.addActionListener(this);
-        this.sendButton.setMnemonic(sendString.getMnemonic());
+        this.sendButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.SEND"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
index 88c017a..237cacc 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindow.java
@@ -136,10 +136,10 @@ public class ChatWindow
         this.initPluginComponents();
 
         this.setKeybindingInput(KeybindingSet.Category.CHAT);
-        this.addKeybindingAction("chat-nextTab", new ForwordTabAction());
-        this.addKeybindingAction("chat-previousTab", new BackwordTabAction());
-        this.addKeybindingAction("chat-copy", new CopyAction());
-        this.addKeybindingAction("chat-paste", new PasteAction());
+        this.addKeybindingAction("plugin.keybindings.CHAT_NEXT_TAB", new ForwordTabAction());
+        this.addKeybindingAction("plugin.keybindings.CHAT_PREVIOUS_TAB", new BackwordTabAction());
+        this.addKeybindingAction("plugin.keybindings.CHAT_COPY", new CopyAction());
+        this.addKeybindingAction("plugin.keybindings.CHAT_PASTE", new PasteAction());
         this.addKeybindingAction("chat-openSmilies", new OpenSmileyAction());
         this.addKeybindingAction("chat-openHistory", new OpenHistoryAction());
         this.addKeybindingAction("chat-close", new CloseAction());
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
index 22b450f..d2c169c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWindowManager.java
@@ -10,9 +10,8 @@ import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.GuiActivator;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
@@ -188,11 +187,17 @@ public class ChatWindowManager
 
                 if (!chatPanel.isWriteAreaEmpty())
                 {
-                    SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages
-                        .getI18NString("nonEmptyChatWindowClose").getText());
-                    int answer = JOptionPane.showConfirmDialog(chatWindow,
-                        msgText, Messages.getI18NString("warning").getText(),
-                        JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+                    SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE"));
+
+                    int answer = JOptionPane.showConfirmDialog(
+                        chatWindow,
+                        msgText,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.WARNING"),
+                        JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.WARNING_MESSAGE);
 
                     if (answer == JOptionPane.OK_OPTION)
                     {
@@ -202,12 +207,18 @@ public class ChatWindowManager
                 else if (System.currentTimeMillis() - chatWindow
                     .getLastIncomingMsgTimestamp(chatPanel) < 2 * 1000)
                 {
-                    SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages
-                        .getI18NString("closeChatAfterNewMsg").getText());
-
-                    int answer = JOptionPane.showConfirmDialog(chatWindow,
-                        msgText, Messages.getI18NString("warning").getText(),
-                        JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+                    SIPCommMsgTextArea msgText
+                        = new SIPCommMsgTextArea(GuiActivator.getResources()
+                            .getI18NString(
+                                "service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE"));
+
+                    int answer = JOptionPane.showConfirmDialog(
+                        chatWindow,
+                        msgText,
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.WARNING"),
+                        JOptionPane.OK_CANCEL_OPTION,
+                        JOptionPane.WARNING_MESSAGE);
 
                     if (answer == JOptionPane.OK_OPTION)
                         closeChatPanel(chatPanel);
@@ -231,11 +242,16 @@ public class ChatWindowManager
 
             if (!chatPanel.isWriteAreaEmpty())
             {
-                SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages
-                    .getI18NString("nonEmptyChatWindowClose").getText());
-                int answer = JOptionPane.showConfirmDialog(chatWindow,
-                    msgText, Messages.getI18NString("warning").getText(),
-                    JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+                SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE"));
+                int answer = JOptionPane.showConfirmDialog(
+                    chatWindow,
+                    msgText,
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.WARNING"),
+                    JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.WARNING_MESSAGE);
 
                 if (answer == JOptionPane.OK_OPTION)
                 {
@@ -245,11 +261,15 @@ public class ChatWindowManager
             else if (System.currentTimeMillis() - chatWindow
                 .getLastIncomingMsgTimestamp(chatPanel) < 2 * 1000)
             {
-                SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(Messages
-                    .getI18NString("closeChatAfterNewMsg").getText());
-
-                int answer = JOptionPane.showConfirmDialog(chatWindow,
-                    msgText, Messages.getI18NString("warning").getText(),
+                SIPCommMsgTextArea msgText = new SIPCommMsgTextArea(
+                    GuiActivator.getResources()
+                    .getI18NString("service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE"));
+
+                int answer = JOptionPane.showConfirmDialog(
+                    chatWindow,
+                    msgText,
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.WARNING"),
                     JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
 
                 if (answer == JOptionPane.OK_OPTION)
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
index ef64326..31300c2 100755
--- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatWritePanel.java
@@ -17,7 +17,6 @@ import javax.swing.undo.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.menus.*;
 import net.java.sip.communicator.impl.gui.main.chat.toolBars.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -163,7 +162,9 @@ public class ChatWritePanel
                 KeyEvent.SHIFT_DOWN_MASK), "newLine");
 
             chatPanel.getChatSendPanel().getSendButton().setToolTipText(
-                "<html>" + Messages.getI18NString("sendMessage").getText()
+                "<html>"
+                    + GuiActivator.getResources()
+                        .getI18NString("service.gui.SEND_MESSAGE")
                     + " - Enter <br> "
                     + "Use Ctrl-Enter or Shift-Enter to make a new line"
                     + "</html>");
@@ -176,7 +177,8 @@ public class ChatWritePanel
 
             chatPanel.getChatSendPanel().getSendButton()
                 .setToolTipText(
-                    Messages.getI18NString("sendMessage").getText()
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.SEND_MESSAGE")
                         + " Ctrl-Enter");
         }
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java
index 5878124..13db4d9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatContact.java
@@ -56,7 +56,7 @@ public class MetaContactChatContact
         String name = metaContact.getDisplayName();
 
         if (name == null || name.length() < 1)
-            name = GuiActivator.getResources().getI18NString("unknown");
+            name = GuiActivator.getResources().getI18NString("service.gui.UNKNOWN");
 
         return name;
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java
index a648b29..2afe27d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/MetaContactChatSession.java
@@ -12,7 +12,6 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
@@ -113,7 +112,7 @@ public class MetaContactChatSession
         if (displayName != null && displayName.length() > 0)
             return metaContact.getDisplayName();
 
-        return Messages.getI18NString("unknown").getText();
+        return GuiActivator.getResources().getI18NString("service.gui.UNKNOWN");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
index 6348c0d..362f672 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SendSmsDialog.java
@@ -12,7 +12,8 @@ import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
@@ -29,21 +30,22 @@ public class SendSmsDialog
 {
     private Logger logger = Logger.getLogger(SendSmsDialog.class);
     
-    private String title = Messages.getI18NString("sendSms").getText();
+    private String title
+        = GuiActivator.getResources().getI18NString("service.gui.SEND_SMS");
     
     private JLabel phoneNumberLabel = new JLabel(
-        Messages.getI18NString("enterPhoneNumber").getText());
+        GuiActivator.getResources().getI18NString("service.gui.ENTER_PHONE_NUMBER"));
     
     private JTextField phoneNumberBox
         = new JTextField();
     
     private JTextArea detailsArea = new JTextArea(
-        Messages.getI18NString("sendSmsDetails").getText());
+        GuiActivator.getResources().getI18NString("service.gui.SEND_SMS_DETAILS"));
     
     private JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
     
     private JButton sendButton = new JButton(
-        Messages.getI18NString("send").getText());
+        GuiActivator.getResources().getI18NString("service.gui.SEND"));
     
     private JPanel buttonPanel = new JPanel(
         new FlowLayout(FlowLayout.RIGHT));
@@ -141,8 +143,9 @@ public class SendSmsDialog
                 phoneNumber,
                 new Date(System.currentTimeMillis()),
                 Constants.ERROR_MESSAGE,
-                Messages.getI18NString("smsSendConnectionProblem")
-                .getText(), "text");
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.SMS_SEND_CONNECTION_PROBLEM"),
+                "text");
         }
         catch (Exception ex)
         {
@@ -161,9 +164,10 @@ public class SendSmsDialog
                 phoneNumber,
                 new Date(System.currentTimeMillis()),
                 Constants.ERROR_MESSAGE,
-                Messages.getI18NString("msgDeliveryUnknownError",
-                    new String[]{ex.getMessage()})
-                .getText(), "text");
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                    new String[]{ex.getMessage()}),
+                "text");
         }
         
         this.dispose();
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java
index f98b17d..26b275d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatContactCellRenderer.java
@@ -11,7 +11,7 @@ import java.awt.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 
@@ -44,7 +44,8 @@ public class ChatContactCellRenderer
 
         if (displayName == null || displayName.length() < 1)
         {
-            displayName = Messages.getI18NString("unknown").getText();
+            displayName = GuiActivator.getResources()
+                .getI18NString("service.gui.UNKNOWN");
         }
 
         this.nameLabel.setFont(this.getFont().deriveFont(Font.PLAIN));
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
index 54f208e..a6d0d1a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatInviteDialog.java
@@ -13,7 +13,6 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
@@ -36,10 +35,10 @@ public class ChatInviteDialog
     private JTextArea reasonArea = new JTextArea();
 
     private JButton inviteButton = new JButton(
-        GuiActivator.getResources().getI18NString("invite"));
+        GuiActivator.getResources().getI18NString("service.gui.INVITE"));
 
     private JButton cancelButton = new JButton(
-        GuiActivator.getResources().getI18NString("cancel"));
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
     private DefaultListModel contactListModel = new DefaultListModel();
 
@@ -61,8 +60,8 @@ public class ChatInviteDialog
 
         this.setModal(false);
 
-        String title
-            = Messages.getI18NString("inviteContactToChat").getText();
+        String title = GuiActivator.getResources()
+            .getI18NString("service.gui.INVITE_CONTACT_TO_CHAT");
 
         this.setTitle(title);
 
@@ -78,12 +77,13 @@ public class ChatInviteDialog
             BorderFactory.createEmptyBorder(15, 15, 15, 15));
 
         this.reasonArea.setBorder(BorderFactory.createTitledBorder(
-            GuiActivator.getResources().getI18NString("inviteReason")));
+            GuiActivator.getResources()
+                .getI18NString("service.gui.INVITE_REASON")));
 
         JTextArea infoTextArea = new JTextArea();
 
-        infoTextArea.setText(
-            Messages.getI18NString("inviteContactFormInfo").getText());
+        infoTextArea.setText(GuiActivator.getResources()
+            .getI18NString("service.gui.INVITE_CONTACT_MSG"));
 
         infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
         infoTextArea.setLineWrap(true);
@@ -108,9 +108,9 @@ public class ChatInviteDialog
 
         this.getRootPane().setDefaultButton(inviteButton);
         inviteButton.setMnemonic(
-            GuiActivator.getResources().getI18nMnemonic("invite"));
+            GuiActivator.getResources().getI18nMnemonic("service.gui.INVITE"));
         cancelButton.setMnemonic(
-            GuiActivator.getResources().getI18nMnemonic("cancel"));
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
 
         MainFrame mainFrame = GuiActivator.getUIService().getMainFrame();
 
@@ -179,10 +179,10 @@ public class ChatInviteDialog
         JPanel addRemoveButtonsPanel = new JPanel(new GridLayout(0, 2, 5, 5));
 
         JButton addContactButton = new JButton(
-            GuiActivator.getResources().getI18NString("add"));
+            GuiActivator.getResources().getI18NString("service.gui.ADD"));
 
         JButton removeContactButton = new JButton(
-            GuiActivator.getResources().getI18NString("remove"));
+            GuiActivator.getResources().getI18NString("service.gui.REMOVE"));
 
         addRemoveButtonsPanel.add(addContactButton);
         addRemoveButtonsPanel.add(removeContactButton);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
index edd5f06..3c6f611 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomConfigurationWindow.java
@@ -13,8 +13,8 @@ import java.util.*;
 import javax.swing.*;
 import javax.swing.text.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -35,10 +35,10 @@ public class ChatRoomConfigurationWindow
     private JPanel mainPanel = new JPanel();
     
     private JButton saveButton = new JButton(
-        Messages.getI18NString("apply").getText());
+        GuiActivator.getResources().getI18NString("service.gui.APPLY"));
     
     private JButton cancelButton = new JButton(
-        Messages.getI18NString("cancel").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private JPanel roomOptionsPanel = new JPanel(new GridLayout(0, 1));
     
@@ -62,11 +62,12 @@ public class ChatRoomConfigurationWindow
     {
         this.configForm = configForm;
         
-        this.setTitle(Messages.getI18NString(
-            "chatRoomConfiguration", new String[]{chatRoomName}).getText());
+        this.setTitle(GuiActivator.getResources().getI18NString(
+            "service.gui.CHAT_ROOM_CONFIGURATION",
+            new String[]{chatRoomName}));
         
-        titlePanel.setTitleText(Messages.getI18NString(
-            "configuration").getText());
+        titlePanel.setTitleText(GuiActivator.getResources().getI18NString(
+            "service.gui.SETTINGS"));
         
         this.generalScrollPane.setPreferredSize(new Dimension(550, 500));
         this.generalScrollPane.setHorizontalScrollBarPolicy(
@@ -92,11 +93,11 @@ public class ChatRoomConfigurationWindow
             BorderLayout.NORTH);
         
         this.tabbedPane.add(
-            Messages.getI18NString("general").getText(),
+            GuiActivator.getResources().getI18NString("service.gui.GENERAL"),
             generalScrollPane);
         
         this.tabbedPane.add(
-            Messages.getI18NString("options").getText(),
+            GuiActivator.getResources().getI18NString("service.gui.OPTIONS"),
             optionsScrollPane);
         
         this.getContentPane().add(titlePanel, BorderLayout.NORTH);
@@ -106,7 +107,8 @@ public class ChatRoomConfigurationWindow
         this.roomOptionsPanel.setBorder(BorderFactory.createCompoundBorder(
             BorderFactory.createEmptyBorder(15, 15, 15, 15),
             BorderFactory.createTitledBorder(
-                Messages.getI18NString("chatRoomOptions").getText())));
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.CHAT_ROOM_OPTIONS"))));
         
         this.loadConfigurationForm();
     }
@@ -391,9 +393,10 @@ public class ChatRoomConfigurationWindow
                     {
                         new ErrorDialog(
                             ChatRoomConfigurationWindow.this,
-                            Messages.getI18NString("error").getText(),
-                            Messages.getI18NString(
-                                "chatRoomConfigFormSubmitFailed").getText(),
+                            GuiActivator.getResources()
+                                .getI18NString("service.gui.ERROR"),
+                            GuiActivator.getResources().getI18NString(
+                                "service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED"),
                             e).showDialog();
                     }
                 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
index 2ac73ca..69c7aca 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ChatRoomSubjectPanel.java
@@ -11,8 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -30,7 +30,7 @@ public class ChatRoomSubjectPanel
     private Logger logger = Logger.getLogger(ChatRoomSubjectPanel.class);
 
     private JLabel subjectLabel = new JLabel(
-        Messages.getI18NString("subject").getText() + ": ");
+        GuiActivator.getResources().getI18NString("service.gui.SUBJECT") + ": ");
 
     private JTextField subjectField = new JTextField();
 
@@ -119,11 +119,11 @@ public class ChatRoomSubjectPanel
                 {
                     new ErrorDialog(
                         chatWindow,
-                        Messages.getI18NString("warning").getText(),
-                        Messages.getI18NString(
-                            "chatRoomOpenConfigForbidden",
-                            new String[]{chatSession.getChatName()})
-                            .getText(),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.WARNING"),
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN",
+                            new String[]{chatSession.getChatName()}),
                         ErrorDialog.WARNING)
                             .showDialog();
                 }
@@ -131,12 +131,12 @@ public class ChatRoomSubjectPanel
                 {
                     new ErrorDialog(
                         chatWindow,
-                        Messages.getI18NString("error").getText(),
-                        Messages.getI18NString(
-                            "chatRoomOpenConfigFailed",
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.ERROR"),
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.CHAT_ROOM_CONFIGURATION_FAILED",
                             new String[]{
-                            chatSession.getChatName()})
-                            .getText(),
+                            chatSession.getChatName()}),
                         e).showDialog();
                 }
             }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java
index 29c90ca..4eb6113 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatContact.java
@@ -56,7 +56,7 @@ public class ConferenceChatContact
         String name = chatRoomMember.getName();
 
         if (name == null || name.length() < 1)
-            name = GuiActivator.getResources().getI18NString("unknown");
+            name = GuiActivator.getResources().getI18NString("service.gui.UNKNOWN");
 
         return name;
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
index b3d605d..3b0a816 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatManager.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
@@ -24,7 +23,7 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
 import net.java.sip.communicator.util.*;
 
-import org.jdesktop.swingworker.SwingWorker;
+import org.jdesktop.swingworker.*;
 import org.osgi.framework.*;
 
 /**
@@ -213,8 +212,10 @@ public class ConferenceChatManager
         chatWindowManager.openChat(chatPanel, false);
 
         // Fire notification
-        String title = Messages.getI18NString("msgReceived",
-            new String[]{sourceMember.getName()}).getText();
+        String title
+            = GuiActivator.getResources().getI18NString(
+                "service.gui.MSG_RECEIVED",
+                new String[]{sourceMember.getName()});
 
         NotificationManager.fireChatNotification(
             sourceChatRoom,
@@ -242,29 +243,30 @@ public class ConferenceChatManager
         if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.OFFLINE_MESSAGES_NOT_SUPPORTED) {
 
-            errorMsg = Messages.getI18NString(
-                    "msgDeliveryOfflineNotSupported").getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_NOT_SUPPORTED");
         }
         else if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.NETWORK_FAILURE) {
 
-            errorMsg = Messages.getI18NString("msgNotDelivered").getText();
+            errorMsg = GuiActivator.getResources()
+                .getI18NString("service.gui.MSG_NOT_DELIVERED");
         }
         else if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.PROVIDER_NOT_REGISTERED) {
 
-            errorMsg = Messages.getI18NString(
-                    "msgSendConnectionProblem").getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_SEND_CONNECTION_PROBLEM");
         }
         else if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.INTERNAL_ERROR) {
 
-            errorMsg = Messages.getI18NString(
-                    "msgDeliveryInternalError").getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_INTERNAL_ERROR");
         }
         else {
-            errorMsg = Messages.getI18NString(
-                    "msgDeliveryFailedUnknownError").getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_UNKNOWN_ERROR");
         }
 
         ChatWindowManager chatWindowManager
@@ -348,11 +350,11 @@ public class ConferenceChatManager
         {
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("error").getText(),
-                Messages.getI18NString("failedToJoinChatRoom",
-                    new String[]{sourceChatRoom.getName()})
-                        .getText() + evt.getReason())
-                    .showDialog();
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.FAILED_TO_JOIN_CHAT_ROOM",
+                    new String[]{sourceChatRoom.getName()}) + evt.getReason())
+                .showDialog();
         }
         else if (evt.getEventType().equals(
             LocalUserChatRoomPresenceChangeEvent.LOCAL_USER_LEFT))
@@ -445,9 +447,9 @@ public class ConferenceChatManager
         {
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("warning").getText(),
-                Messages.getI18NString("haveToBeConnectedToJoin")
-                        .getText())
+                GuiActivator.getResources().getI18NString("service.gui.WARNING"),
+                GuiActivator.getResources().getI18NString(
+                    "haveToBeConnectedToJoin"))
                     .showDialog();
 
             return;
@@ -488,10 +490,10 @@ public class ConferenceChatManager
 
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("error").getText(),
-                Messages.getI18NString(
-                    "createChatRoomError",
-                    new String[]{chatRoomName}).getText(),
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.CREATE_CHAT_ROOM_ERROR",
+                    new String[]{chatRoomName}),
                     ex)
             .showDialog();
         }
@@ -501,10 +503,10 @@ public class ConferenceChatManager
 
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("error").getText(),
-                Messages.getI18NString(
-                    "createChatRoomError",
-                    new String[]{chatRoomName}).getText(),
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.CREATE_CHAT_ROOM_ERROR",
+                    new String[]{chatRoomName}),
                     ex)
             .showDialog();
         }
@@ -538,9 +540,8 @@ public class ConferenceChatManager
         {
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("warning").getText(),
-                Messages.getI18NString("haveToBeConnectedToJoin")
-                        .getText())
+                GuiActivator.getResources().getI18NString("service.gui.WARNING"),
+                GuiActivator.getResources().getI18NString("haveToBeConnectedToJoin"))
                     .showDialog();
 
             return;
@@ -660,12 +661,12 @@ public class ConferenceChatManager
         else
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("error").getText(),
-                Messages.getI18NString("chatRoomNotExist",
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.CHAT_ROOM_NOT_EXIST",
                     new String[]{chatRoomName,
                     chatRoomProvider.getProtocolProvider()
-                        .getAccountID().getService()})
-                    .getText())
+                        .getAccountID().getService()}))
                     .showDialog();
     }
 
@@ -682,9 +683,9 @@ public class ConferenceChatManager
         {
             new ErrorDialog(
                 GuiActivator.getUIService().getMainFrame(),
-                Messages.getI18NString("warning").getText(),
-                Messages.getI18NString("haveToBeConnectedToLeave")
-                        .getText())
+                GuiActivator.getResources().getI18NString("service.gui.WARNING"),
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED="))
                     .showDialog();
 
             return;
@@ -1027,28 +1028,29 @@ public class ConferenceChatManager
             {
                 errorMessage
                     = GuiActivator.getResources()
-                        .getI18NString("chatRoomRegistrationRequired",
+                        .getI18NString(
+                            "service.gui.CHAT_ROOM_REGISTRATION_REQUIRED",
                             new String[]{chatRoomWrapper.getChatRoomName()});
             }
             else if(returnCode.equals(PROVIDER_NOT_REGISTERED))
             {
                 errorMessage
                     = GuiActivator.getResources()
-                        .getI18NString("chatRoomNotConnected",
+                        .getI18NString("service.gui.CHAT_ROOM_NOT_CONNECTED",
                         new String[]{chatRoomWrapper.getChatRoomName()});
             }
             else if(returnCode.equals(SUBSCRIPTION_ALREADY_EXISTS))
             {
                 errorMessage
                     = GuiActivator.getResources()
-                        .getI18NString("chatRoomAlreadyJoined",
+                        .getI18NString("service.gui.CHAT_ROOM_ALREADY_JOINED",
                             new String[]{chatRoomWrapper.getChatRoomName()});
             }
             else
             {
                 errorMessage
                     = GuiActivator.getResources()
-                        .getI18NString("failedToJoinChatRoom",
+                        .getI18NString("service.gui.FAILED_TO_JOIN_CHAT_ROOM",
                             new String[]{chatRoomWrapper.getChatRoomName()});
             }
 
@@ -1057,7 +1059,7 @@ public class ConferenceChatManager
             {
                 new ErrorDialog(
                     GuiActivator.getUIService().getMainFrame(),
-                    Messages.getI18NString("error").getText(),
+                    GuiActivator.getResources().getI18NString("service.gui.ERROR"),
                     errorMessage).showDialog();
             }
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
index 3fc147c..c0f150d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/ConferenceChatSession.java
@@ -11,7 +11,6 @@ import java.util.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.msghistory.*;
@@ -385,8 +384,9 @@ public class ConferenceChatSession
 
             sessionRenderer.addChatContact(chatContact);
 
-            statusMessage = Messages.getI18NString("chatRoomUserJoined",
-                new String[] {sourceChatRoom.getName()}).getText();
+            statusMessage = GuiActivator.getResources().getI18NString(
+                "service.gui.CHAT_ROOM_USER_JOINED",
+                new String[] {sourceChatRoom.getName()});
 
             sessionRenderer.updateChatContactStatus(chatContact, statusMessage);
         }
@@ -396,20 +396,23 @@ public class ConferenceChatSession
         {
             if(eventType.equals(ChatRoomMemberPresenceChangeEvent.MEMBER_LEFT))
             {
-                statusMessage = Messages.getI18NString("chatRoomUserLeft",
-                    new String[] {sourceChatRoom.getName()}).getText();
+                statusMessage = GuiActivator.getResources().getI18NString(
+                    "service.gui.CHAT_ROOM_USER_LEFT",
+                    new String[] {sourceChatRoom.getName()});
             }
             else if(eventType.equals(
                 ChatRoomMemberPresenceChangeEvent.MEMBER_KICKED))
             {
-                statusMessage = Messages.getI18NString("chatRoomUserKicked",
-                    new String[] {sourceChatRoom.getName()}).getText();
+                statusMessage = GuiActivator.getResources().getI18NString(
+                    "service.gui.CHAT_ROOM_USER_KICKED",
+                    new String[] {sourceChatRoom.getName()});
             }
             else if(eventType.equals(
                 ChatRoomMemberPresenceChangeEvent.MEMBER_QUIT))
             {
-                statusMessage = Messages.getI18NString("chatRoomUserQuit",
-                    new String[] {sourceChatRoom.getName()}).getText();
+                statusMessage = GuiActivator.getResources().getI18NString(
+                    "service.gui.CHAT_ROOM_USER_QUIT",
+                    new String[] {sourceChatRoom.getName()});
             }
 
             Iterator<ConferenceChatContact> chatContactsIter
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
index 37795a5..b4bce6a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/conference/InvitationReceivedDialog.java
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.swing.*;
@@ -33,7 +32,7 @@ public class InvitationReceivedDialog
     private JPanel reasonPanel = new JPanel(new BorderLayout());
     
     private JLabel reasonLabel = new JLabel(
-        Messages.getI18NString("reason").getText() + ": ");
+        GuiActivator.getResources().getI18NString("service.gui.REASON") + ": ");
     
     private JTextField reasonField = new JTextField();
 
@@ -41,17 +40,14 @@ public class InvitationReceivedDialog
     
     private JPanel buttonsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
     
-    private I18NString acceptString = Messages.getI18NString("accept");
+    private JButton acceptButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.ACCEPT"));
     
-    private I18NString rejectString = Messages.getI18NString("reject");
+    private JButton rejectButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.REJECT"));
     
-    private I18NString ignoreString = Messages.getI18NString("ignore");
-    
-    private JButton acceptButton = new JButton(acceptString.getText());
-    
-    private JButton rejectButton = new JButton(rejectString.getText());
-    
-    private JButton ignoreButton = new JButton(ignoreString.getText());
+    private JButton ignoreButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.IGNORE"));
     
     private JPanel mainPanel = new JPanel(new BorderLayout(10, 10));
     
@@ -60,8 +56,8 @@ public class InvitationReceivedDialog
     private JLabel iconLabel = new JLabel(new ImageIcon(
             ImageLoader.getImage(ImageLoader.INVITE_DIALOG_ICON)));
     
-    private String title
-        = Messages.getI18NString("invitationReceived").getText();
+    private String title = GuiActivator.getResources()
+        .getI18NString("service.gui.INVITATION_RECEIVED");
     
     /**
      * The <tt>ChatRoomInvitation</tt> for which this dialog is.
@@ -108,17 +104,17 @@ public class InvitationReceivedDialog
         this.mainPanel.setPreferredSize(new Dimension(400, 230));
 
         infoTextArea.setText(
-            Messages.getI18NString("invitationReceivedFormInfo",
+            GuiActivator.getResources().getI18NString("service.gui.INVITATION_RECEIVED_MSG",
                 new String[] {  invitation.getInviter(),
-                                invitation.getTargetChatRoom().getName()})
-                                .getText());
+                                invitation.getTargetChatRoom().getName()}));
 
         if(invitation.getReason() != null && invitation.getReason() != "")
         {
             invitationReasonTextArea.setText(invitation.getReason());
             invitationReasonTextArea.setBorder(
                 BorderFactory.createTitledBorder(
-                    Messages.getI18NString("invitation").getText()));
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.INVITATION")));
 
             this.dataPanel.add(invitationReasonTextArea, BorderLayout.CENTER);
         }
@@ -146,9 +142,12 @@ public class InvitationReceivedDialog
         this.buttonsPanel.add(ignoreButton);
         
         this.getRootPane().setDefaultButton(acceptButton);
-        this.acceptButton.setMnemonic(acceptString.getMnemonic());
-        this.rejectButton.setMnemonic(rejectString.getMnemonic());
-        this.ignoreButton.setMnemonic(ignoreString.getMnemonic());
+        this.acceptButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.ACCEPT"));
+        this.rejectButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.REJECT"));
+        this.ignoreButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.IGNORE"));
         
         this.mainPanel.setBorder(
             BorderFactory.createEmptyBorder(15, 15, 15, 15));
@@ -157,7 +156,7 @@ public class InvitationReceivedDialog
         this.mainPanel.add(dataPanel, BorderLayout.CENTER);
         this.mainPanel.add(buttonsPanel, BorderLayout.SOUTH);
         
-        this.getContentPane().add(mainPanel);        
+        this.getContentPane().add(mainPanel);
     }
     
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java
index 24fe4ae..3063da7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryMenu.java
@@ -11,8 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 
 /**
  * The <tt>HistoryMenu</tt> is the main menu in the history window.
@@ -21,17 +21,13 @@ import net.java.sip.communicator.impl.gui.i18n.*;
  */
 public class HistoryMenu
     extends SIPCommMenu
-    implements ActionListener {
+    implements ActionListener
+{
+    private JMenuItem emptyMenuItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.EMPTY_HISTORY"));
 
-    private I18NString emptyHistoryString
-        = Messages.getI18NString("emptyHistory");
-    
-    private I18NString closeString
-        = Messages.getI18NString("close");
-    
-    private JMenuItem emptyMenuItem = new JMenuItem(emptyHistoryString.getText());
-
-    private JMenuItem closeMenuItem = new JMenuItem(closeString.getText());
+    private JMenuItem closeMenuItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.CLOSE"));
 
     private JFrame parentWindow;
 
@@ -41,22 +37,25 @@ public class HistoryMenu
      */
     public HistoryMenu(JFrame parentWindow) {
 
-        super(Messages.getI18NString("history").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.HISTORY"));
 
         this.parentWindow = parentWindow;
 
         this.emptyMenuItem.setName("empty");
-        this.closeMenuItem.setName("close");
-        
-        this.emptyMenuItem.setMnemonic(emptyHistoryString.getMnemonic());
-        this.closeMenuItem.setMnemonic(closeString.getMnemonic());
+        this.closeMenuItem.setName("service.gui.CLOSE");
+
+        this.emptyMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic(
+                "service.gui.EMPTY_HISTORY"));
+        this.closeMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE"));
 
         this.emptyMenuItem.addActionListener(this);
         this.closeMenuItem.addActionListener(this);
-        
+
         this.add(emptyMenuItem);
         this.add(closeMenuItem);
-        
+
         //disable meni items that are not yet implemented
         this.emptyMenuItem.setEnabled(false);
     }
@@ -71,7 +70,7 @@ public class HistoryMenu
 
         if (menuName.equalsIgnoreCase("empty")) {
             //TODO: Implement - "empty" history.
-        } else if (menuName.equalsIgnoreCase("close")) {
+        } else if (menuName.equalsIgnoreCase("service.gui.CLOSE")) {
             this.parentWindow.setVisible(false);
             this.parentWindow.dispose();
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
index 3c125a6..1dd3e61 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java
@@ -17,7 +17,6 @@ import javax.swing.text.*;
 import javax.swing.text.html.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -70,7 +69,7 @@ public class HistoryWindow
     private Hashtable dateHistoryTable = new Hashtable();
     
     private JLabel readyLabel = new JLabel(
-        Messages.getI18NString("ready").getText());
+        GuiActivator.getResources().getI18NString("service.gui.READY"));
     
     private String searchKeyword;
     
@@ -117,9 +116,9 @@ public class HistoryWindow
         {
             MetaContact metaContact = (MetaContact) historyContact;
 
-            this.setTitle(Messages.getI18NString(
-                    "historyContact",
-                    new String[]{metaContact.getDisplayName()}).getText());
+            this.setTitle(GuiActivator.getResources().getI18NString(
+                    "service.gui.HISTORY_CONTACT",
+                    new String[]{metaContact.getDisplayName()}));
 
             Iterator protoContacts = metaContact.getContacts();
             
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
index df62720..2d5ff22 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/SearchPanel.java
@@ -12,7 +12,7 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -28,14 +28,14 @@ public class SearchPanel
     implements  ActionListener,
                 DocumentListener
 {
+    private static final String searchString
+        = GuiActivator.getResources().getI18NString("service.gui.SEARCH");
 
-    private I18NString searchString = Messages.getI18NString("search");
-    
-    private JButton searchButton = new JButton(searchString.getText(),
-            new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON)));
+    private JButton searchButton = new JButton(
+        searchString,
+        new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON)));
 
-    private JLabel searchLabel
-        = new JLabel(searchString.getText() + ": ");
+    private JLabel searchLabel = new JLabel(searchString + ": ");
 
     private JTextField searchTextField = new JTextField();
     
@@ -44,37 +44,37 @@ public class SearchPanel
 
     /*
     private JRadioButton todayMessagesRadio = new JRadioButton(Messages
-            .getString("today"));
+            .getString("service.gui.TODAY"));
 
     private JRadioButton yesterdayMessagesRadio = new JRadioButton(Messages
-            .getString("yesterday")); //$NON-NLS-1$
+            .getString("service.gui.YESTERDAY")); //$NON-NLS-1$
 
     private JRadioButton allMessagesRadio = new JRadioButton(Messages
-            .getString("all")); //$NON-NLS-1$
+            .getString("service.gui.ALL")); //$NON-NLS-1$
 
     private ButtonGroup radiosGroup = new ButtonGroup();
 
     private JLabel dateLabel
-        = new JLabel(Messages.getString("date") + ": "); //$NON-NLS-1$
+        = new JLabel(Messages.getString("service.gui.DATE") + ": "); //$NON-NLS-1$
 
     private JTextField dateTextField = new JTextField(10);
 
     private JLabel hourLabel
-        = new JLabel(Messages.getString("hour") + ": "); //$NON-NLS-1$
+        = new JLabel(Messages.getString("service.gui.HOUR") + ": "); //$NON-NLS-1$
 
     private JTextField hourTextField = new JTextField(10);
 
     private JLabel lastNMessagesLabel = new JLabel(
-            Messages.getString("last") + ": "); //$NON-NLS-1$
+            Messages.getString("service.gui.LAST") + ": "); //$NON-NLS-1$
 
     private JTextField lastNMessagesTextField = new JTextField(10);
     
     private SIPCommButton extendedSearchButton = new SIPCommButton
-        (Messages.getString("extendedCriteria"), //$NON-NLS-1$
+        (Messages.getString("service.gui.EXTENDED_CRITERIA"), //$NON-NLS-1$
         Constants.RIGHT_ARROW_ICON, Constants.RIGHT_ARROW_ROLLOVER_ICON);
     
     private SIPCommButton extendedSearchOpenedButton = new SIPCommButton
-        (Messages.getString("extendedCriteria"), //$NON-NLS-1$
+        (Messages.getString("service.gui.EXTENDED_CRITERIA"), //$NON-NLS-1$
         Constants.BOTTOM_ARROW_ICON, Constants.BOTTOM_ARROW_ROLLOVER_ICON);
 
     private JPanel datePanel = new JPanel(new GridLayout(0, 2, 10, 0));
@@ -105,7 +105,7 @@ public class SearchPanel
         this.historyWindow = historyWindow;
 
         this.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createTitledBorder(searchString.getText()),
+                BorderFactory.createTitledBorder(searchString),
                 BorderFactory.createEmptyBorder(5, 5, 5, 5))); 
         
         this.textFieldPanel.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -151,7 +151,8 @@ public class SearchPanel
         */
         
         this.searchButton.setName("search");
-        this.searchButton.setMnemonic(searchString.getMnemonic());
+        this.searchButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.SEARCH"));
         
         // this.extendedSearchButton.setName("extendedSearch");
         // this.extendedSearchOpenedButton.setName("extendedSearchOpened");
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
index 34593b9..f1421f3 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/ChatRightButtonMenu.java
@@ -11,7 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 
@@ -26,29 +26,21 @@ public class ChatRightButtonMenu extends JPopupMenu
     implements ActionListener {
 
     private ChatConversationPanel chatConvPanel;
-    
-    private I18NString copyString = Messages.getI18NString("copy");
-    
-    private I18NString saveString = Messages.getI18NString("save");
-    
-    private I18NString printString = Messages.getI18NString("print");
-    
-    private I18NString closeString = Messages.getI18NString("close");
-    
+
     private JMenuItem copyMenuItem = new JMenuItem(
-        copyString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.COPY"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON)));
-    
+
     private JMenuItem saveMenuItem = new JMenuItem(
-        saveString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.SAVE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.SAVE_ICON)));
 
     private JMenuItem printMenuItem = new JMenuItem(
-        printString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.PRINT"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.PRINT_ICON)));
 
     private JMenuItem closeMenuItem = new JMenuItem(
-        closeString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.CLOSE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON)));
     /**
      * Creates an instance of <tt>ChatRightButtonMenu</tt>.
@@ -82,17 +74,21 @@ public class ChatRightButtonMenu extends JPopupMenu
         this.copyMenuItem.setName("copy");
         this.saveMenuItem.setName("save");
         this.printMenuItem.setName("print");
-        this.closeMenuItem.setName("close");
+        this.closeMenuItem.setName("service.gui.CLOSE");
 
         this.copyMenuItem.addActionListener(this);
         this.saveMenuItem.addActionListener(this);
         this.printMenuItem.addActionListener(this);
         this.closeMenuItem.addActionListener(this);
         
-        this.copyMenuItem.setMnemonic(copyString.getMnemonic());
-        this.saveMenuItem.setMnemonic(saveString.getMnemonic());
-        this.printMenuItem.setMnemonic(printString.getMnemonic());
-        this.closeMenuItem.setMnemonic(closeString.getMnemonic());
+        this.copyMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.COPY"));
+        this.saveMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.SAVE"));
+        this.printMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.PRINT"));
+        this.closeMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE"));
         
         this.copyMenuItem.setAccelerator(
                 KeyStroke.getKeyStroke(KeyEvent.VK_C,
@@ -139,7 +135,7 @@ public class ChatRightButtonMenu extends JPopupMenu
 
         } else if (itemText.equalsIgnoreCase("print")) {
 
-        } else if (itemText.equalsIgnoreCase("close")) {
+        } else if (itemText.equalsIgnoreCase("service.gui.CLOSE")) {
             
             Window window = this.chatConvPanel
                 .getChatContainer().getConversationContainerWindow();
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
index 5537ff1..12fc62f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/EditMenu.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 
@@ -24,24 +23,18 @@ import net.java.sip.communicator.impl.gui.utils.*;
  * @author Yana Stamcheva
  */
 public class EditMenu extends SIPCommMenu 
-    implements ActionListener {
-
-    private I18NString cutString = Messages.getI18NString("cut");
-    
-    private I18NString copyString = Messages.getI18NString("copy");
-    
-    private I18NString pasteString = Messages.getI18NString("paste");
-    
+    implements ActionListener
+{
     private JMenuItem cutMenuItem = new JMenuItem(
-        cutString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.CUT"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CUT_ICON)));
 
     private JMenuItem copyMenuItem = new JMenuItem(
-        copyString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.COPY"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON)));
 
     private JMenuItem pasteMenuItem = new JMenuItem(
-        pasteString.getText(), 
+        GuiActivator.getResources().getI18NString("service.gui.PASTE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.PASTE_ICON)));
 
     private ChatWindow chatWindow;
@@ -53,7 +46,7 @@ public class EditMenu extends SIPCommMenu
      */
     public EditMenu(ChatWindow chatWindow) {
 
-        super(Messages.getI18NString("edit").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.EDIT"));
 
         this.setOpaque(false);
 
@@ -74,20 +67,24 @@ public class EditMenu extends SIPCommMenu
         this.add(cutMenuItem);
         this.add(copyMenuItem);
         this.add(pasteMenuItem);
-        
-        this.setMnemonic(Messages.getI18NString("edit").getMnemonic());
-        this.cutMenuItem.setMnemonic(cutString.getMnemonic());
-        this.copyMenuItem.setMnemonic(copyString.getMnemonic());
-        this.pasteMenuItem.setMnemonic(pasteString.getMnemonic());
-        
+
+        this.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.EDIT"));
+        this.cutMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CUT"));
+        this.copyMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.COPY"));
+        this.pasteMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.PASTE"));
+
         this.cutMenuItem.setAccelerator(
                 KeyStroke.getKeyStroke(KeyEvent.VK_X,
                 KeyEvent.CTRL_MASK));
-        
+
         this.copyMenuItem.setAccelerator(
                 KeyStroke.getKeyStroke(KeyEvent.VK_C,
                 KeyEvent.CTRL_MASK));
-        
+
         this.pasteMenuItem.setAccelerator(
                 KeyStroke.getKeyStroke(KeyEvent.VK_P,
                 KeyEvent.CTRL_MASK));
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
index b360392..eac8a61 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/FileMenu.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -27,17 +26,12 @@ import net.java.sip.communicator.impl.gui.utils.*;
 public class FileMenu extends SIPCommMenu 
     implements ActionListener
 {
-    private I18NString myChatRoomsString
-        = Messages.getI18NString("myChatRooms");
-
-    private I18NString closeString = Messages.getI18NString("close");
-
     private JMenuItem myChatRoomsItem = new JMenuItem(
-        myChatRoomsString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.MY_CHAT_ROOMS"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON)));
 
     private JMenuItem closeMenuItem = new JMenuItem(
-        closeString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.CLOSE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON)));
 
     private ChatWindow parentWindow;
@@ -48,7 +42,7 @@ public class FileMenu extends SIPCommMenu
      */
     public FileMenu(ChatWindow parentWindow) {
 
-        super(Messages.getI18NString("file").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.FILE"));
 
         this.setOpaque(false);
 
@@ -58,7 +52,8 @@ public class FileMenu extends SIPCommMenu
             GuiActivator.getResources()
                 .getColor("service.gui.CHAT_MENU_FOREGROUND")));
 
-        this.setMnemonic(Messages.getI18NString("file").getMnemonic());
+        this.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.FILE"));
 
         this.add(myChatRoomsItem);
 
@@ -72,8 +67,12 @@ public class FileMenu extends SIPCommMenu
         this.myChatRoomsItem.addActionListener(this);
         this.closeMenuItem.addActionListener(this);
 
-        this.myChatRoomsItem.setMnemonic(myChatRoomsString.getMnemonic());
-        this.closeMenuItem.setMnemonic(closeString.getMnemonic());
+        this.myChatRoomsItem.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.MY_CHAT_ROOMS"));
+
+        this.closeMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE"));
     }
 
     /**
@@ -93,7 +92,7 @@ public class FileMenu extends SIPCommMenu
             chatRoomsDialog.setPreferredSize(new Dimension(500, 400));
             chatRoomsDialog.setVisible(true);
         }
-        else if (itemText.equalsIgnoreCase("close"))
+        else if (itemText.equalsIgnoreCase("service.gui.CLOSE"))
         {
             this.parentWindow.setVisible(false);
             this.parentWindow.dispose();
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java
index 64143ae..f7820c4 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/HelpMenu.java
@@ -13,7 +13,6 @@ import java.awt.event.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
@@ -37,9 +36,9 @@ public class HelpMenu
      * Creates an instance of <tt>HelpMenu</tt>.
      * @param chatWindow The parent <tt>MainFrame</tt>.
      */
-    public HelpMenu(ChatWindow chatWindow) {
-
-        super(Messages.getI18NString("help").getText());
+    public HelpMenu(ChatWindow chatWindow)
+    {
+        super(GuiActivator.getResources().getI18NString("service.gui.HELP"));
 
         this.setOpaque(false);
 
@@ -47,7 +46,8 @@ public class HelpMenu
             GuiActivator.getResources()
                 .getColor("service.gui.CHAT_MENU_FOREGROUND")));
 
-        this.setMnemonic(Messages.getI18NString("help").getMnemonic());
+        this.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.HELP"));
 
         this.initPluginComponents();
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
index 9749659..8160dca 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/menus/WritePanelRightButtonMenu.java
@@ -10,7 +10,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 
@@ -24,29 +24,21 @@ public class WritePanelRightButtonMenu extends JPopupMenu
     implements ActionListener {
 
     private ChatWindow parentWindow;
-    
-    private I18NString cutString = Messages.getI18NString("cut");
-    
-    private I18NString copyString = Messages.getI18NString("copy");
-    
-    private I18NString pasteString = Messages.getI18NString("paste");
-    
-    private I18NString closeString = Messages.getI18NString("close");
-    
+
     private JMenuItem cutMenuItem = new JMenuItem(
-        cutString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.CUT"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CUT_ICON)));
 
     private JMenuItem copyMenuItem = new JMenuItem(
-        copyString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.COPY"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.COPY_ICON)));
 
     private JMenuItem pasteMenuItem = new JMenuItem(
-        pasteString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.PASTE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.PASTE_ICON)));
-    
+
     private JMenuItem closeMenuItem = new JMenuItem(
-        closeString.getText(), 
+        GuiActivator.getResources().getI18NString("service.gui.CLOSE"), 
         new ImageIcon(ImageLoader.getImage(ImageLoader.CLOSE_ICON)));
     /**
      * Creates an instance of <tt>WritePanelRightButtonMenu</tt>.
@@ -77,17 +69,21 @@ public class WritePanelRightButtonMenu extends JPopupMenu
         this.copyMenuItem.setName("copy");
         this.cutMenuItem.setName("cut");
         this.pasteMenuItem.setName("paste");
-        this.closeMenuItem.setName("close");
+        this.closeMenuItem.setName("service.gui.CLOSE");
 
         this.copyMenuItem.addActionListener(this);
         this.cutMenuItem.addActionListener(this);
         this.pasteMenuItem.addActionListener(this);
         this.closeMenuItem.addActionListener(this);
         
-        this.copyMenuItem.setMnemonic(copyString.getMnemonic());
-        this.cutMenuItem.setMnemonic(cutString.getMnemonic());
-        this.pasteMenuItem.setMnemonic(pasteString.getMnemonic());
-        this.closeMenuItem.setMnemonic(closeString.getMnemonic());
+        this.copyMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.COPY"));
+        this.cutMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CUT"));
+        this.pasteMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.PASTE"));
+        this.closeMenuItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CLOSE"));
         
         this.cutMenuItem.setAccelerator(
                 KeyStroke.getKeyStroke(KeyEvent.VK_X,
@@ -121,7 +117,7 @@ public class WritePanelRightButtonMenu extends JPopupMenu
 
             this.parentWindow.getCurrentChatPanel().paste();
         }
-        else if (itemText.equalsIgnoreCase("close")) {
+        else if (itemText.equalsIgnoreCase("service.gui.CLOSE")) {
 
             this.parentWindow.setVisible(false);
             this.parentWindow.dispose();
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
index 17b9359..9f3520e 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/EditTextToolBar.java
@@ -13,11 +13,12 @@ import javax.swing.event.*;
 import javax.swing.text.*;
 import javax.swing.text.html.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
+
 import net.java.sip.communicator.util.swing.*;
 
 import say.swing.*;
@@ -81,8 +82,8 @@ public class EditTextToolBar
             ImageLoader.getDefaultSmiliesPack(), chatWritePanel);
 
         this.smiliesBox.setName("smiley");
-        this.smiliesBox.setToolTipText(
-            Messages.getI18NString("insertSmiley").getText() + " Ctrl-M");
+        this.smiliesBox.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.INSERT_SMILEY") + " Ctrl-M");
 
         this.add(smiliesBox);
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
index 8941e57..22a053f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/ExtendedMainToolBar.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
@@ -137,51 +136,58 @@ public class ExtendedMainToolBar
 
         this.saveButton.setName("save");
         this.saveButton.setToolTipText(
-            Messages.getI18NString("save").getText() + " Ctrl-S");
+            GuiActivator.getResources().getI18NString("service.gui.SAVE")
+                + " Ctrl-S");
 
         this.printButton.setName("print");
         this.printButton.setToolTipText(
-            Messages.getI18NString("print").getText());
+            GuiActivator.getResources().getI18NString("service.gui.PRINT"));
 
         this.cutButton.setName("cut");
         this.cutButton.setToolTipText(
-            Messages.getI18NString("cut").getText() + " Ctrl-X");
+            GuiActivator.getResources().getI18NString("service.gui.CUT")
+                + " Ctrl-X");
 
         this.copyButton.setName("copy");
         this.copyButton.setToolTipText(
-            Messages.getI18NString("copy").getText() + " Ctrl-C");
+            GuiActivator.getResources().getI18NString("service.gui.COPY")
+                + " Ctrl-C");
 
         this.pasteButton.setName("paste");
         this.pasteButton.setToolTipText(
-            Messages.getI18NString("paste").getText() + " Ctrl-P");
+            GuiActivator.getResources().getI18NString("service.gui.PASTE")
+                + " Ctrl-P");
 
         this.previousButton.setName("previous");
         this.previousButton.setToolTipText(
-            Messages.getI18NString("previousTooltip").getText());
+            GuiActivator.getResources()
+                .getI18NString("service.gui.PREVIOUS_TOOLTIP"));
 
         this.nextButton.setName("next");
         this.nextButton.setToolTipText(
-            Messages.getI18NString("nextTooltip").getText());
+            GuiActivator.getResources()
+                .getI18NString("service.gui.NEXT_TOOLTIP"));
 
         this.sendFileButton.setName("sendFile");
         this.sendFileButton.setToolTipText(
-            Messages.getI18NString("sendFile").getText());
+            GuiActivator.getResources().getI18NString("service.gui.SEND_FILE"));
 
         this.historyButton.setName("history");
         this.historyButton.setToolTipText(
-            Messages.getI18NString("history").getText() + " Ctrl-H");
+            GuiActivator.getResources().getI18NString("service.gui.HISTORY")
+                + " Ctrl-H");
 
         this.addButton.setName("addContact");
         this.addButton.setToolTipText(
-            Messages.getI18NString("addContact").getText());
+            GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"));
 
         this.fontButton.setName("font");
         this.fontButton.setToolTipText(
-            Messages.getI18NString("font").getText());
+            GuiActivator.getResources().getI18NString("service.gui.FONT"));
 
         this.settingsButton.setName("settings");
         this.settingsButton.setToolTipText(
-            Messages.getI18NString("settings").getText());
+            GuiActivator.getResources().getI18NString("service.gui.SETTINGS"));
 
         this.saveButton.setPreferredSize(
             new Dimension(DEFAULT_BUTTON_WIDTH, DEFAULT_BUTTON_HEIGHT));
@@ -470,7 +476,7 @@ public class ExtendedMainToolBar
                                                                 history);
             }
         }
-        else if (buttonText.equalsIgnoreCase("addContact")) 
+        else if (buttonText.equals("addContact")) 
         {
             if(currentChatContact != null)
             {
@@ -525,7 +531,7 @@ public class ExtendedMainToolBar
 
             g2.setColor(new Color(
                 GuiActivator.getResources()
-                .getColor("desktopBackgroundColor")));
+                .getColor("service.gui.DESKTOP_BACKGROUND")));
 
             g2.drawRect(0, this.getHeight() - 2, this.getWidth(), 2);
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
index 76f25ef..614236b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/toolBars/MainToolBar.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
@@ -87,27 +86,28 @@ public class MainToolBar
 
 //        this.previousButton.setName("previous");
 //        this.previousButton.setToolTipText(
-//            Messages.getI18NString("previous").getText());
+//            GuiActivator.getResources().getI18NString("service.gui.PREVIOUS").getText());
 //
 //        this.nextButton.setName("next");
 //        this.nextButton.setToolTipText(
-//            Messages.getI18NString("next").getText());
+//            GuiActivator.getResources().getI18NString("service.gui.NEXT").getText());
 
         this.sendFileButton.setName("sendFile");
         this.sendFileButton.setToolTipText(
-            Messages.getI18NString("sendFile").getText());
+            GuiActivator.getResources().getI18NString("service.gui.SEND_FILE"));
 
         this.historyButton.setName("history");
         this.historyButton.setToolTipText(
-            Messages.getI18NString("history").getText() + " Ctrl-H");
+            GuiActivator.getResources().getI18NString("service.gui.HISTORY")
+            + " Ctrl-H");
 
         this.inviteButton.setName("invite");
         this.inviteButton.setToolTipText(
-            Messages.getI18NString("invite").getText());
+            GuiActivator.getResources().getI18NString("service.gui.INVITE"));
 
         this.optionsButton.setName("options");
         this.optionsButton.setToolTipText(
-            Messages.getI18NString("options").getText());
+            GuiActivator.getResources().getI18NString("service.gui.OPTIONS"));
 
 //        this.previousButton.addActionListener(this);
 //        this.nextButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
index d5a4bad..a7f0a97 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomCommonRightButtonMenu.java
@@ -11,11 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
@@ -25,6 +22,8 @@ import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
 import net.java.sip.communicator.util.*;
 
+import org.osgi.framework.*;
+
 /**
  * The <tt>ChatRoomsListRightButtonMenu</tt> is the menu, opened when user clicks
  * with the right mouse button on the chat rooms list panel. It's the one that
@@ -40,18 +39,12 @@ public class ChatRoomCommonRightButtonMenu
     private Logger logger
         = Logger.getLogger(ChatRoomCommonRightButtonMenu.class);
 
-    private I18NString createChatRoomString
-        = Messages.getI18NString("createChatRoom");
-
-    private I18NString searchForChatRoomsString
-        = Messages.getI18NString("joinChatRoom");
-
     private JMenuItem createChatRoomItem = new JMenuItem(
-        createChatRoomString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.CREATE_CHAT_ROOM"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON)));
 
     private JMenuItem searchForChatRoomsItem = new JMenuItem(
-        searchForChatRoomsString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.JOIN_CHAT_ROOM"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON_16x16)));
 
     private ChatRoomProviderWrapper chatRoomProvider;
@@ -77,14 +70,16 @@ public class ChatRoomCommonRightButtonMenu
         this.add(searchForChatRoomsItem);
         
         this.initPluginComponents();
-
+        
         this.createChatRoomItem.setName("createChatRoom");
         this.searchForChatRoomsItem.setName("searchForChatRooms");
         
-        this.createChatRoomItem
-            .setMnemonic(createChatRoomString.getMnemonic());
-        this.searchForChatRoomsItem
-            .setMnemonic(searchForChatRoomsString.getMnemonic());
+        this.createChatRoomItem.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.CREATE_CHAT_ROOM"));
+        this.searchForChatRoomsItem.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.JOIN_CHAT_ROOM"));
         
         this.createChatRoomItem.addActionListener(this);
         this.searchForChatRoomsItem.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
index 5f4fd40..a8125c8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomListDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
@@ -60,26 +61,21 @@ public class ChatRoomListDialog
     {
         ChatRoomListUI chatRoomsListUI = new ChatRoomListUI(this);
 
-        I18NString createChatRoomString
-            = Messages.getI18NString("createChatRoom");
-
-        I18NString joinChatRoomString
-            = Messages.getI18NString("joinChatRoom");
-
-        I18NString cancelString
-            = Messages.getI18NString("cancel");
-
         JButton createChatRoomButton = new JButton(
-            createChatRoomString.getText());
+            GuiActivator.getResources()
+                .getI18NString("service.gui.CREATE_CHAT_ROOM"));
 
         JButton joinChatRoomButton = new JButton(
-            joinChatRoomString.getText());
+            GuiActivator.getResources()
+                .getI18NString("service.gui.JOIN_CHAT_ROOM"));
 
-        JButton cancelButton = new JButton(cancelString.getText());
+        JButton cancelButton = new JButton(
+            GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
         TransparentPanel buttonPanel = new TransparentPanel();
 
-        this.setTitle(Messages.getI18NString("myChatRooms").getText());
+        this.setTitle(GuiActivator.getResources()
+            .getI18NString("service.gui.MY_CHAT_ROOMS"));
 
         this.getContentPane().add(buttonPanel, BorderLayout.SOUTH);
         this.getContentPane().add(chatRoomsListUI, BorderLayout.CENTER);
@@ -96,12 +92,12 @@ public class ChatRoomListDialog
         joinChatRoomButton.setName(JOIN_CHAT_ROOM);
         cancelButton.setName(CANCEL);
 
-        createChatRoomButton
-            .setMnemonic(createChatRoomString.getMnemonic());
-        joinChatRoomButton
-            .setMnemonic(joinChatRoomString.getMnemonic());
-        cancelButton
-            .setMnemonic(cancelString.getMnemonic());
+        createChatRoomButton.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.CREATE_CHAT_ROOM"));
+        joinChatRoomButton.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.JOIN_CHAT_ROOM"));
+        cancelButton.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.CANCEL"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
index 0849753..2cf0274 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomRightButtonMenu.java
@@ -11,7 +11,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -29,33 +28,21 @@ public class ChatRoomRightButtonMenu
     implements  ActionListener
 {
     private Logger logger = Logger.getLogger(ChatRoomRightButtonMenu.class);
-    
-    private I18NString joinChatRoomString
-        = Messages.getI18NString("join");
-    
-    private I18NString joinAsChatRoomString
-        = Messages.getI18NString("joinAs");
-
-    private I18NString leaveChatRoomString
-        = Messages.getI18NString("leave");
-
-    private I18NString removeChatRoomString
-        = Messages.getI18NString("remove");
 
     private JMenuItem leaveChatRoomItem = new JMenuItem(
-        leaveChatRoomString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.LEAVE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.LEAVE_ICON)));
 
     private JMenuItem joinChatRoomItem = new JMenuItem(
-        joinChatRoomString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.JOIN"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.JOIN_ICON)));
 
     private JMenuItem joinAsChatRoomItem = new JMenuItem(
-        joinAsChatRoomString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.JOIN_AS"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.JOIN_AS_ICON)));
 
     private JMenuItem removeChatRoomItem = new JMenuItem(
-        removeChatRoomString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.REMOVE"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON)));
 
     private ChatRoomWrapper chatRoomWrapper = null;
@@ -92,17 +79,17 @@ public class ChatRoomRightButtonMenu
         this.leaveChatRoomItem.setName("leaveChatRoom");
         this.removeChatRoomItem.setName("removeChatRoom");
 
-        this.joinChatRoomItem
-            .setMnemonic(joinChatRoomString.getMnemonic());
+        this.joinChatRoomItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.JOIN"));
 
-        this.joinAsChatRoomItem
-            .setMnemonic(joinAsChatRoomString.getMnemonic());
+        this.joinAsChatRoomItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.JOIN_AS"));
 
-        this.leaveChatRoomItem
-            .setMnemonic(leaveChatRoomString.getMnemonic());
+        this.leaveChatRoomItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.LEAVE"));
 
-        this.removeChatRoomItem
-            .setMnemonic(removeChatRoomString.getMnemonic());
+        this.removeChatRoomItem.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.REMOVE"));
 
         this.joinChatRoomItem.addActionListener(this);
         this.joinAsChatRoomItem.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
index 6000cea..f6a297c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/ChatRoomServerRightButtonMenu.java
@@ -11,7 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.createforms.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.joinforms.*;
@@ -28,18 +28,12 @@ public class ChatRoomServerRightButtonMenu
     extends JPopupMenu
     implements  ActionListener
 {
-    private I18NString createChatRoomString
-        = Messages.getI18NString("createChatRoom");
-
-    private I18NString joinChannelString
-        = Messages.getI18NString("joinChatRoom");
-
     private JMenuItem createChatRoomItem = new JMenuItem(
-        createChatRoomString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.CREATE_CHAT_ROOM"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON)));
 
     private JMenuItem joinChannelItem = new JMenuItem(
-        joinChannelString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.JOIN_CHAT_ROOM"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.SEARCH_ICON_16x16)));
 
     private ChatRoomProviderWrapper chatRoomProvider;
@@ -74,10 +68,12 @@ public class ChatRoomServerRightButtonMenu
         this.createChatRoomItem.setName("createChatRoom");
         this.joinChannelItem.setName("joinChatRoom");
         
-        this.createChatRoomItem
-            .setMnemonic(createChatRoomString.getMnemonic());
-        this.joinChannelItem
-            .setMnemonic(joinChannelString.getMnemonic());
+        this.createChatRoomItem.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.CREATE_CHAT_ROOM"));
+        this.joinChannelItem.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.JOIN_CHAT_ROOM"));
         
         this.createChatRoomItem.addActionListener(this);
         this.joinChannelItem.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
index 9fd0ac7..1540e94 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/ChatRoomNamePanel.java
@@ -11,8 +11,8 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.event.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.swing.*;
@@ -27,20 +27,19 @@ public class ChatRoomNamePanel
     extends TransparentPanel
     implements DocumentListener
 {
-   
    private JLabel nameLabel = new JLabel(
-        Messages.getI18NString("chatRoomName").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CHAT_ROOM_NAME"));
     
     private JTextField textField = new JTextField();
     
     private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5));
     
-    private SIPCommMsgTextArea infoLabel 
-        = new SIPCommMsgTextArea(
-            Messages.getI18NString("chatRoomNameInfo").getText());
+    private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.CHAT_ROOM_NAME_INFO"));
     
     private JLabel infoTitleLabel = new JLabel(
-        Messages.getI18NString("createChatRoom").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CREATE_CHAT_ROOM"));
     
     private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
             .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON)));
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
index 957d48f..7303ac6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/CreateChatRoomDialog.java
@@ -12,8 +12,8 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
+
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -30,17 +30,15 @@ public class CreateChatRoomDialog
 {
     private ChatRoomNamePanel chatRoomPanel = new ChatRoomNamePanel();
     
-    private I18NString addString = Messages.getI18NString("create");
-    
-    private I18NString cancelString = Messages.getI18NString("cancel");
+    private JButton addButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CREATE"));
     
-    private JButton addButton = new JButton(addString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
-    private JButton cancelButton = new JButton(cancelString.getText());
-
     private JPanel buttonsPanel =
         new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
-
+    
     private JPanel mainPanel = new TransparentPanel(new BorderLayout());
     
     private ChatRoomProviderWrapper chatRoomProvider;
@@ -64,7 +62,8 @@ public class CreateChatRoomDialog
      */
     private void init()
     {
-        this.setTitle(Messages.getI18NString("createChatRoom").getText());
+        this.setTitle(GuiActivator.getResources()
+                .getI18NString("service.gui.CREATE_CHAT_ROOM"));
         
         this.setSize(620, 450);
         this.setPreferredSize(new Dimension(620, 450));
@@ -73,9 +72,11 @@ public class CreateChatRoomDialog
         this.addButton.setName("create");
         this.cancelButton.setName("cancel");
         
-        this.addButton.setMnemonic(addString.getMnemonic());
+        this.addButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CREATE"));
         
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.addButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
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 f9daba3..795ecf7 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
@@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.chatroomslist.createforms;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.wizard.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.util.*;
 
@@ -42,9 +41,11 @@ public class CreateChatRoomWizard
 
         super.addWizardListener(this);
 
-        this.setTitle(Messages.getI18NString("createChatRoomWizard").getText());
+        this.setTitle(GuiActivator.getResources()
+                .getI18NString("service.gui.CREATE_CHAT_ROOM_WIZARD"));
 
-        this.setFinishButtonText(Messages.getI18NString("create").getText());
+        this.setFinishButtonText(
+            GuiActivator.getResources().getI18NString("service.gui.CREATE"));
 
         page1 = new CreateChatRoomWizardPage1(this, newChatRoom,
                     mainFrame.getProtocolProviders());
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
index d03b117..27e7ba6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/createforms/SelectAccountPanel.java
@@ -15,8 +15,8 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
@@ -52,11 +52,12 @@ public class SelectAccountPanel extends TransparentPanel
             .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON)));
     
     private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
-            Messages.getI18NString("selectProvidersForChatRoom").getText());
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM"));
     
     private JLabel infoTitleLabel = new JLabel(
-            Messages.getI18NString("selectAccount").getText(), 
-                JLabel.CENTER);
+        GuiActivator.getResources().getI18NString("service.gui.SELECT_ACCOUNT"), 
+        JLabel.CENTER);
     
     private ButtonGroup radioButtonGroup = new ButtonGroup();
     
@@ -121,8 +122,10 @@ public class SelectAccountPanel extends TransparentPanel
         accountsTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
 
         tableModel.addColumn("");
-        tableModel.addColumn(Messages.getI18NString("account").getText());
-        tableModel.addColumn(Messages.getI18NString("protocol").getText());
+        tableModel.addColumn(
+            GuiActivator.getResources().getI18NString("service.gui.ACCOUNT"));
+        tableModel.addColumn(
+            GuiActivator.getResources().getI18NString("service.gui.PROTOCOL"));
 
         while(protocolProvidersList.hasNext())
         {
@@ -180,7 +183,8 @@ public class SelectAccountPanel extends TransparentPanel
         if (accountsTable.getModel().getRowCount() == 0)
         {
             JTextArea noAccountsTextArea = new JTextArea(
-                Messages.getI18NString("noMultiChatAccountAvailable").getText());
+                GuiActivator.getResources().getI18NString(
+                    "service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE"));
 
             noAccountsTextArea.setLineWrap(true);
             noAccountsTextArea.setPreferredSize(new Dimension(400, 200));
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
index 17e2b9a..980f588 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomAuthenticationWindow.java
@@ -12,9 +12,9 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
+
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -30,22 +30,20 @@ public class ChatRoomAuthenticationWindow
     private JTextArea infoTextArea = new JTextArea();
 
     private JLabel idLabel = new JLabel(
-        Messages.getI18NString("id").getText());
+        GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER"));
 
     private JLabel passwdLabel = new JLabel(
-        Messages.getI18NString("passwd").getText());
+        GuiActivator.getResources().getI18NString("service.gui.PASSWORD"));
 
     private JTextField idValue;
 
     private JPasswordField passwdField = new JPasswordField(15);
 
-    private I18NString okString = Messages.getI18NString("ok");
-
-    private I18NString cancelString = Messages.getI18NString("cancel");
-
-    private JButton loginButton = new JButton(okString.getText());
+    private JButton loginButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.OK"));
 
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
     private JPanel labelsPanel =
         new TransparentPanel(new GridLayout(0, 1, 8, 8));
@@ -96,8 +94,9 @@ public class ChatRoomAuthenticationWindow
 
         this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
-        this.setTitle(
-            Messages.getI18NString("authenticationWindowTitle").getText());
+        this.setTitle(GuiActivator.getResources().getI18NString(
+            "service.gui.AUTHENTICATION_WINDOW_TITLE",
+            new String[]{chatRoom.getParentProvider().getName()}));
 
         this.enableKeyActions();
     }
@@ -117,8 +116,9 @@ public class ChatRoomAuthenticationWindow
         this.infoTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
         this.infoTextArea.setEditable(false);
         this.infoTextArea.setText(
-            Messages.getI18NString("chatRoomRequiresPassword",
-                new String[]{chatRoom.getChatRoomName()}).getText());
+            GuiActivator.getResources().getI18NString(
+                "service.gui.CHAT_ROOM_REQUIRES_PASSWORD",
+                new String[]{chatRoom.getChatRoomName()}));
 
         this.idLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
         this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
@@ -142,8 +142,10 @@ public class ChatRoomAuthenticationWindow
         this.loginButton.setName("ok");
         this.cancelButton.setName("cancel");
 
-        this.loginButton.setMnemonic(okString.getMnemonic());
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.loginButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.OK"));
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
 
         this.loginButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
index fd6e7e4..eb02a9a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/ChatRoomNamePanel.java
@@ -11,8 +11,8 @@ import java.awt.*;
 import javax.swing.*;
 import javax.swing.event.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -26,19 +26,19 @@ public class ChatRoomNamePanel
     extends TransparentPanel
 {    
     private JLabel chatRoomLabel = new JLabel(
-        Messages.getI18NString("chatRoomName").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CHAT_ROOM_NAME"));
     
     private JTextField textField = new JTextField();
     
     private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5));
     
-    private SIPCommMsgTextArea infoLabel 
-        = new SIPCommMsgTextArea(
-            Messages.getI18NString("joinChatRoomName").getText());
+    private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.JOIN_CHAT_ROOM_NAME"));
     
     private JLabel infoTitleLabel = new JLabel(
-        Messages.getI18NString("joinChatRoomTitle").getText());
-    
+        GuiActivator.getResources()
+            .getI18NString("service.gui.JOIN_CHAT_ROOM_TITLE"));
     
     private JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1));
     
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
index 721a054..2052fea 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/JoinChatRoomDialog.java
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
@@ -32,13 +31,11 @@ public class JoinChatRoomDialog
     
     private SearchChatRoomPanel searchPanel;
     
-    private I18NString joinString = Messages.getI18NString("join");
+    private JButton joinButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.JOIN"));
     
-    private I18NString cancelString = Messages.getI18NString("cancel");
-    
-    private JButton joinButton = new JButton(joinString.getText());
-    
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
         .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON)));
@@ -61,15 +58,19 @@ public class JoinChatRoomDialog
 
         this.searchPanel = new SearchChatRoomPanel(chatRoomProvider);
 
-        this.setTitle(Messages.getI18NString("joinChatRoom").getText());
+        this.setTitle(
+            GuiActivator.getResources()
+                .getI18NString("service.gui.JOIN_CHAT_ROOM"));
 
         this.getRootPane().setDefaultButton(joinButton);
         this.joinButton.setName("join");
         this.cancelButton.setName("cancel");
 
-        this.joinButton.setMnemonic(joinString.getMnemonic());
+        this.joinButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.JOIN"));
 
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
 
         this.iconLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 10));
 
@@ -95,7 +96,7 @@ public class JoinChatRoomDialog
         JButton button = (JButton)e.getSource();
         String name = button.getName();
 
-        if (name.equals("join"))
+        if (name.equals("service.gui.JOIN"))
         {
             GuiActivator.getUIService().getConferenceChatManager()
                 .joinChatRoom(searchPanel.getChatRoomName(), chatRoomProvider);
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 0e8624d..2c92676 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
@@ -10,7 +10,6 @@ import java.util.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.wizard.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.util.*;
@@ -49,9 +48,11 @@ public class JoinChatRoomWizard
 
         super.addWizardListener(this);
 
-        this.setTitle(Messages.getI18NString("joinChatRoomWizard").getText());
+        this.setTitle(GuiActivator.getResources()
+                .getI18NString("service.gui.JOIN_CHAT_ROOM_WIZARD"));
 
-        this.setFinishButtonText(Messages.getI18NString("join").getText());
+        this.setFinishButtonText(GuiActivator.getResources()
+            .getI18NString("service.gui.JOIN"));
 
         Iterator<ChatRoomProviderWrapper> chatRoomProviders
             = GuiActivator.getUIService().getConferenceChatManager()
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java
index 1010fbb..691ce21 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SearchChatRoomPanel.java
@@ -15,7 +15,6 @@ import javax.swing.*;
 import javax.swing.event.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.*;
@@ -34,10 +33,11 @@ public class SearchChatRoomPanel
     private JPanel searchPanel = new TransparentPanel(new GridLayout(0, 1));
     
     private JTextArea searchTextArea = new JTextArea(
-        Messages.getI18NString("searchForChatRoomsText").getText());
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SEARCH_FOR_CHAT_ROOMS_MSG"));
     
     private JButton searchButton = new JButton(
-        Messages.getI18NString("search").getText());
+        GuiActivator.getResources().getI18NString("service.gui.SEARCH"));
     
     private JPanel buttonPanel = new TransparentPanel(
         new FlowLayout(FlowLayout.CENTER));
@@ -99,14 +99,16 @@ public class SearchChatRoomPanel
         this.mainPanel.add(searchPanel);
 
         this.searchPanel.setBorder(BorderFactory
-                .createTitledBorder(Messages.getI18NString("search").getText()));
+            .createTitledBorder(GuiActivator.getResources()
+                .getI18NString("service.gui.SEARCH")));
 
         this.searchButton.addActionListener(this);
 
         this.add(mainPanel, BorderLayout.NORTH);
 
         this.chatRoomsScrollPane.setBorder(BorderFactory
-            .createTitledBorder(Messages.getI18NString("chatRooms").getText()));
+            .createTitledBorder(GuiActivator.getResources()
+                .getI18NString("service.gui.CHAT_ROOM_REQUIRES_PASSWORD")));
 
         this.chatRoomsList.addListSelectionListener(
             new ChatRoomListSelectionListener());
@@ -131,7 +133,10 @@ public class SearchChatRoomPanel
         if(list != null)
         {
             if(list.size() == 0)
-                list.add(Messages.getI18NString("noAvailableRooms").getText());
+            {
+                list.add(GuiActivator.getResources()
+                    .getI18NString("service.gui.NO_AVAILABLE_ROOMS"));
+            }
 
             chatRoomsList.setListData(new Vector(list));
             chatRoomsScrollPane.setPreferredSize(new Dimension(500, 120));
diff --git a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
index f612a73..3ba26e7 100644
--- a/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chatroomslist/joinforms/SelectAccountPanel.java
@@ -13,8 +13,8 @@ import javax.swing.*;
 import javax.swing.event.*;
 import javax.swing.table.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.chat.conference.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.*;
@@ -50,11 +50,13 @@ public class SelectAccountPanel extends TransparentPanel
             .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON)));
     
     private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
-            Messages.getI18NString("selectProvidersForChatRoom").getText());
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM"));
     
     private JLabel infoTitleLabel = new JLabel(
-            Messages.getI18NString("selectAccount").getText(), 
-                JLabel.CENTER);
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SELECT_ACCOUNT"), 
+        JLabel.CENTER);
     
     private ButtonGroup radioButtonGroup = new ButtonGroup();
     
@@ -113,8 +115,10 @@ public class SelectAccountPanel extends TransparentPanel
         accountsTable.setPreferredScrollableViewportSize(new Dimension(500, 70));
 
         tableModel.addColumn("");
-        tableModel.addColumn(Messages.getI18NString("account").getText());
-        tableModel.addColumn(Messages.getI18NString("protocol").getText());
+        tableModel.addColumn(
+            GuiActivator.getResources().getI18NString("service.gui.ACCOUNT"));
+        tableModel.addColumn(
+            GuiActivator.getResources().getI18NString("service.gui.PROTOCOL"));
 
         while(chatRoomProvidersList.hasNext())
         {
@@ -158,7 +162,8 @@ public class SelectAccountPanel extends TransparentPanel
         if (accountsTable.getModel().getRowCount() == 0)
         {
             JTextArea noAccountsTextArea = new JTextArea(
-                Messages.getI18NString("noMultiChatAccountAvailable").getText());
+                GuiActivator.getResources()
+                .getI18NString("service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE"));
 
             noAccountsTextArea.setLineWrap(true);
             noAccountsTextArea.setPreferredSize(new Dimension(400, 200));
diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
index 9aff530..96c375f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
@@ -11,7 +11,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
@@ -65,7 +64,8 @@ public class ConfigurationFrame
 
         this.configScrollList.setViewportView(configList);
 
-        this.setTitle(Messages.getI18NString("configuration").getText());
+        this.setTitle(GuiActivator.getResources()
+                .getI18NString("service.gui.SETTINGS"));
 
         this.getContentPane().setLayout(new BorderLayout());
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
index ef892df..596c616 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/CommonRightButtonMenu.java
@@ -10,7 +10,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addgroup.*;
@@ -24,19 +24,15 @@ import net.java.sip.communicator.impl.gui.utils.*;
  * @author Yana Stamcheva
  */
 public class CommonRightButtonMenu extends JPopupMenu
-    implements ActionListener {
-
-    private I18NString addContactString = Messages.getI18NString("addContact");
-    
-    private I18NString createGroupString = Messages.getI18NString("createGroup");
+    implements ActionListener
+{
+    private JMenuItem addContactItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"),
+        new ImageIcon(ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
     
-    private JMenuItem addContactItem
-        = new JMenuItem(addContactString.getText(), new ImageIcon(
-            ImageLoader.getImage(ImageLoader.ADD_CONTACT_16x16_ICON)));
-    
-    private JMenuItem createGroupItem
-    = new JMenuItem(createGroupString.getText(), new ImageIcon(
-            ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
+    private JMenuItem createGroupItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"),
+        new ImageIcon(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
     
     private MainFrame mainFrame;
     
@@ -55,31 +51,36 @@ public class CommonRightButtonMenu extends JPopupMenu
         this.addContactItem.setName("addContact");
         this.createGroupItem.setName("createGroup");
         
-        this.addContactItem.setMnemonic(addContactString.getMnemonic());
-        this.createGroupItem.setMnemonic(createGroupString.getMnemonic());
+        this.addContactItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.ADD_CONTACT"));
+        this.createGroupItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.CREATE_GROUP"));
         
         this.addContactItem.addActionListener(this);
         this.createGroupItem.addActionListener(this);
     }
     
     /**
-     * Handles the <tt>ActionEvent</tt>. The choosen menu item should correspond
+     * Handles the <tt>ActionEvent</tt>. The chosen menu item should correspond
      * to an account, where the new contact will be added. We obtain here the
-     * protocol provider corresponding to the choosen account and show the
+     * protocol provider corresponding to the chosen account and show the
      * dialog, where the user could add the contact.
      */
-    public void actionPerformed(ActionEvent e) {
+    public void actionPerformed(ActionEvent e)
+    {
         JMenuItem item = (JMenuItem)e.getSource();
         String itemName = item.getName();
-        
-        if(itemName.equals("createGroup")) {
+
+        if(itemName.equals("createGroup"))
+        {
             CreateGroupDialog dialog = new CreateGroupDialog(mainFrame);
-            
+
             dialog.setVisible(true);
         }
-        else if(itemName.equals("addContact")) {
+        else if(itemName.equals("addContact"))
+        {
             AddContactWizard wizard = new AddContactWizard(mainFrame);
-            
+
             wizard.setVisible(true);
         }
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
index 8753d77..a9cda79 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
@@ -16,10 +16,9 @@ import javax.swing.event.*;
 import javax.swing.text.*;
 
 import net.java.sip.communicator.impl.gui.*;
+import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
-import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.contactlist.event.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -916,10 +915,10 @@ public class ContactList
                     {
                         new ErrorDialog(
                                 mainFrame,
-                                Messages.getI18NString(
-                                    "moveToGroup").getText(),
-                                Messages.getI18NString(
-                                    "moveContactError").getText(),
+                                GuiActivator.getResources().getI18NString(
+                                    "service.gui.MOVE_TO_GROUP"),
+                                GuiActivator.getResources().getI18NString(
+                                    "service.gui.MOVE_CONTACT_ERROR"),
                                 ex).showDialog();
                     }
                 }
@@ -1441,17 +1440,18 @@ public class ContactList
                 return;
             }
 
-            String message = Messages.getI18NString(
-                "moveSubcontactQuestion",
+            String message = GuiActivator.getResources().getI18NString(
+                "service.gui.MOVE_SUBCONTACT_QUESTION",
                 new String[]{   srcContact.getDisplayName(),
-                                destMetaContact.getDisplayName()})
-                    .getText();
+                                destMetaContact.getDisplayName()});
 
             MessageDialog dialog = new MessageDialog(
                     mainFrame,
-                    Messages.getI18NString("moveContact").getText(),
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.MOVE_CONTACT"),
                     message,
-                    Messages.getI18NString("move").getText());
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.MOVE"));
 
             int returnCode = dialog.showDialog();
 
@@ -1498,17 +1498,18 @@ public class ContactList
                 return;
             }
 
-            String message = Messages.getI18NString(
-                "moveSubcontactQuestion",
+            String message = GuiActivator.getResources().getI18NString(
+                "service.gui.MOVE_SUBCONTACT_QUESTION",
                 new String[]{   srcContact.getDisplayName(),
-                                destGroup.getGroupName()})
-                    .getText();
+                                destGroup.getGroupName()});
 
             MessageDialog dialog = new MessageDialog(
                     mainFrame,
-                    Messages.getI18NString("moveContact").getText(),
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.MOVE_CONTACT"),
                     message,
-                    Messages.getI18NString("move").getText());
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.MOVE"));
 
             int returnCode = dialog.showDialog();
 
@@ -1555,17 +1556,18 @@ public class ContactList
                 return;
             }
 
-            String message = Messages.getI18NString(
-                "moveSubcontactQuestion",
+            String message = GuiActivator.getResources().getI18NString(
+                "service.gui.MOVE_SUBCONTACT_QUESTION",
                 new String[]{   srcContact.getDisplayName(),
-                                destGroup.getGroupName()})
-                    .getText();
+                                destGroup.getGroupName()});
 
             MessageDialog dialog = new MessageDialog(
                     mainFrame,
-                    Messages.getI18NString("moveContact").getText(),
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.MOVE_CONTACT"),
                     message,
-                    Messages.getI18NString("move").getText());
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.MOVE"));
 
             int returnCode = dialog.showDialog();
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
index ce60649..4cc5052 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
@@ -11,7 +11,6 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.*;
@@ -120,7 +119,8 @@ public class ContactListCellRenderer
 
             if (displayName == null || displayName.length() < 1)
             {
-                displayName = Messages.getI18NString("unknown").getText();
+                displayName = GuiActivator.getResources()
+                    .getI18NString("service.gui.UNKNOWN");
             }
 
             this.nameLabel.setText(displayName);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java
index 2243ca2..4ca4932 100755
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPane.java
@@ -16,7 +16,6 @@ import javax.swing.Timer;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.chat.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -361,8 +360,9 @@ public class ContactListPane
             });
 
             // Fire notification
-            String title = Messages.getI18NString("msgReceived",
-                new String[]{evt.getSourceContact().getDisplayName()}).getText();
+            String title = GuiActivator.getResources().getI18NString(
+                "service.gui.MSG_RECEIVED",
+                new String[]{evt.getSourceContact().getDisplayName()});
 
             NotificationManager.fireChatNotification(
                                             protocolContact,
@@ -442,34 +442,33 @@ public class ContactListPane
         if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.OFFLINE_MESSAGES_NOT_SUPPORTED) {
 
-            errorMsg = Messages.getI18NString(
-                    "msgDeliveryOfflineNotSupported").getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_NOT_SUPPORTED");
         }
         else if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.NETWORK_FAILURE) {
 
-            errorMsg = Messages.getI18NString(  "msgNotDelivered",
-                                                new String[]{evt.getReason()})
-                                                .getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_NOT_DELIVERED",
+                    new String[]{evt.getReason()});
         }
         else if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.PROVIDER_NOT_REGISTERED) {
 
-            errorMsg = Messages.getI18NString(
-                    "msgSendConnectionProblem").getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_SEND_CONNECTION_PROBLEM");
         }
         else if (evt.getErrorCode()
                 == MessageDeliveryFailedEvent.INTERNAL_ERROR) {
 
-            errorMsg = Messages.getI18NString(
-                    "msgDeliveryInternalError",
-                    new String[]{evt.getReason()})
-                        .getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_INTERNAL_ERROR",
+                    new String[]{evt.getReason()});
         }
         else {
-            errorMsg = Messages.getI18NString(
-                    "msgDeliveryFailedUnknownError",
-                    new String[]{evt.getReason()}).getText();
+            errorMsg = GuiActivator.getResources().getI18NString(
+                    "service.gui.MSG_DELIVERY_UNKNOWN_ERROR",
+                    new String[]{evt.getReason()});
         }
 
         ChatPanel chatPanel = chatWindowManager
@@ -508,8 +507,10 @@ public class ContactListPane
                 .findMetaContactByContact(evt.getSourceContact());
         String contactName = metaContact.getDisplayName() + " ";
 
-        if (contactName.equals("")) {
-            contactName = Messages.getI18NString("unknown").getText() + " ";
+        if (contactName.equals(""))
+        {
+            contactName = GuiActivator.getResources()
+                .getI18NString("service.gui.UNKNOWN") + " ";
         }
 
         int typingState = evt.getTypingState();
@@ -517,8 +518,9 @@ public class ContactListPane
         if (typingState == OperationSetTypingNotifications.STATE_TYPING)
         {
             notificationMsg
-                = Messages.getI18NString("contactTyping",
-                    new String[]{contactName}).getText();
+                = GuiActivator.getResources().getI18NString(
+                    "service.gui.CONTACT_TYPING",
+                    new String[]{contactName});
 
             typingTimer.setMetaContact(metaContact);
             typingTimer.start();
@@ -532,8 +534,9 @@ public class ContactListPane
         }
         else if (typingState == OperationSetTypingNotifications.STATE_PAUSED)
         {
-            notificationMsg = Messages.getI18NString("contactPausedTyping",
-                new String[]{contactName}).getText();
+            notificationMsg = GuiActivator.getResources().getI18NString(
+                "service.gui.CONTACT_PAUSED_TYPING",
+                new String[]{contactName});
             typingTimer.setMetaContact(metaContact);
             typingTimer.start();
         }
@@ -544,7 +547,8 @@ public class ContactListPane
         else if (typingState == OperationSetTypingNotifications.STATE_STALE)
         {
             notificationMsg
-                = Messages.getI18NString("contactTypingStateStale").getText();
+                = GuiActivator.getResources().getI18NString(
+                    "service.gui.CONTACT_TYPING_STATE_STALE");
         }
         else if (typingState == OperationSetTypingNotifications.STATE_UNKNOWN)
         {
@@ -594,7 +598,8 @@ public class ContactListPane
         NotificationManager.fireNotification(
                 NotificationManager.PROACTIVE_NOTIFICATION,
                 contactName,
-                Messages.getI18NString("proactiveNotification").getText());
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.PROACTIVE_NOTIFICATION"));
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
index 0f9b502..ec47b7c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
@@ -16,7 +16,6 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.call.*;
 import net.java.sip.communicator.impl.gui.main.chat.history.*;
@@ -46,74 +45,76 @@ public class ContactRightButtonMenu
 {
     private Logger logger = Logger.getLogger(ContactRightButtonMenu.class);
     
-    private I18NString allContactsString
-        = Messages.getI18NString("allContacts");
+    private static final String allContactsString
+        = GuiActivator.getResources().getI18NString("service.gui.ALL_CONTACTS");
 
-    private I18NString moveToString
-        = Messages.getI18NString("moveToGroup");
+    private static final String moveToString = GuiActivator.getResources()
+        .getI18NString("service.gui.MOVE_TO_GROUP");
 
-    private I18NString moveSubcontactString
-        = Messages.getI18NString("moveSubcontact");
+    private static final String moveSubcontactString = GuiActivator.getResources()
+        .getI18NString("service.gui.MOVE_SUBCONTACT");
 
-    private I18NString addSubcontactString
-        = Messages.getI18NString("addSubcontact");
+    private static final String addSubcontactString
+        = GuiActivator.getResources()
+            .getI18NString("service.gui.ADD_SUBCONTACT");
 
-    private I18NString removeContactString
-        = Messages.getI18NString("removeContact");
+    private static final String removeContactString
+        = GuiActivator.getResources()
+            .getI18NString("service.gui.REMOVE_CONTACT");
 
-    private I18NString callString
-        = Messages.getI18NString("call");
+    private static final String callString
+        = GuiActivator.getResources().getI18NString("service.gui.CALL");
 
-    private I18NString sendMessageString
-        = Messages.getI18NString("sendMessage");
+    private static final String sendMessageString
+        = GuiActivator.getResources().getI18NString("service.gui.SEND_MESSAGE");
 
-    private I18NString sendFileString
-        = Messages.getI18NString("sendFile");
+    private String sendFileString
+        = GuiActivator.getResources().getI18NString("service.gui.SEND_FILE");
 
-    private I18NString renameContactString
-        = Messages.getI18NString("renameContact");
+    private String renameContactString
+        = GuiActivator.getResources().getI18NString("service.gui.RENAME_CONTACT");
 
-    private I18NString viewHistoryString
-        = Messages.getI18NString("viewHistory");
+    private String viewHistoryString
+        = GuiActivator.getResources().getI18NString("service.gui.VIEW_HISTORY");
 
-    private I18NString sendSmsString
-        = Messages.getI18NString("sendSms");
+    private String sendSmsString
+        = GuiActivator.getResources().getI18NString("service.gui.SEND_SMS");
 
-    private SIPCommMenu moveToMenu = new SIPCommMenu(moveToString.getText());
+    private SIPCommMenu moveToMenu = new SIPCommMenu(moveToString);
 
     private SIPCommMenu moveSubcontactMenu
-        = new SIPCommMenu(moveSubcontactString.getText());
+        = new SIPCommMenu(moveSubcontactString);
 
     private SIPCommMenu addSubcontactMenu
-        = new SIPCommMenu(addSubcontactString.getText());
+        = new SIPCommMenu(addSubcontactString);
 
     private SIPCommMenu removeContactMenu
-        = new SIPCommMenu(removeContactString.getText());
+        = new SIPCommMenu(removeContactString);
 
-    private SIPCommMenu callContactMenu = new SIPCommMenu(callString.getText());
+    private SIPCommMenu callContactMenu = new SIPCommMenu(callString);
 
     private JMenuItem callItem = new JMenuItem(
-        callString.getText(),
+        callString,
         new ImageIcon(ImageLoader.getImage(ImageLoader.CALL_16x16_ICON)));
 
     private JMenuItem sendMessageItem = new JMenuItem(
-        sendMessageString.getText(),
+        sendMessageString,
         new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
 
     private JMenuItem sendFileItem = new JMenuItem(
-        sendFileString.getText(),
+        sendFileString,
         new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_FILE_16x16_ICON)));
 
     private JMenuItem sendSmsItem = new JMenuItem(
-        sendSmsString.getText(),
+        sendSmsString,
         new ImageIcon(ImageLoader.getImage(ImageLoader.SEND_MESSAGE_16x16_ICON)));
 
     private JMenuItem renameContactItem = new JMenuItem(
-        renameContactString.getText(),
+        renameContactString,
         new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON)));
 
     private JMenuItem viewHistoryItem = new JMenuItem(
-        viewHistoryString.getText(),
+        viewHistoryString,
         new ImageIcon(ImageLoader.getImage(ImageLoader.HISTORY_16x16_ICON)));
 
     private MetaContact contactItem;
@@ -188,7 +189,8 @@ public class ContactRightButtonMenu
         if(providers.hasNext()) 
         {
             JLabel infoLabel = new JLabel(
-                Messages.getI18NString("selectAccount").getText());
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.SELECT_ACCOUNT"));
 
             infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
             infoLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
@@ -220,7 +222,8 @@ public class ContactRightButtonMenu
         if(groups.hasNext()) 
         {
             JLabel infoLabel = new JLabel(
-                Messages.getI18NString("selectGroup").getText());
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.SELECT_GROUP"));
 
             infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
             infoLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
@@ -246,16 +249,15 @@ public class ContactRightButtonMenu
 
         if (contactItem.getContactCount() > 1) 
         {
-            
-            JMenuItem allItem = new JMenuItem(allContactsString.getText());
-            JMenuItem allItem1 = new JMenuItem(allContactsString.getText());
-           
+            JMenuItem allItem = new JMenuItem(allContactsString);
+            JMenuItem allItem1 = new JMenuItem(allContactsString);
+
             allItem.addActionListener(this);
             allItem1.addActionListener(this);
-           
+
             allItem.setName(removeContactPrefix + "allContacts");
             allItem1.setName(moveSubcontactPrefix + "allContacts");
-           
+
             this.removeContactMenu.add(allItem);
             this.moveSubcontactMenu.add(allItem1);
             this.removeContactMenu.addSeparator();
@@ -422,23 +424,35 @@ public class ContactRightButtonMenu
      */
     private void initMnemonics()
     {
-        this.sendMessageItem.setMnemonic(sendMessageString.getMnemonic());
+        this.sendMessageItem.setMnemonic(
+            GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.SEND_MESSAGE"));
         if (callContactMenu.getItemCount() > 1) 
         {
-            this.callContactMenu.setMnemonic(callString.getMnemonic());
+            this.callContactMenu.setMnemonic(GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.CALL"));
         }
         else
         {
-            this.callItem.setMnemonic(callString.getMnemonic());
+            this.callItem.setMnemonic(GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.CALL"));
         }
-        this.sendSmsItem.setMnemonic(sendSmsString.getMnemonic());
-        this.sendFileItem.setMnemonic(sendFileString.getMnemonic());
-        this.moveToMenu.setMnemonic(moveToString.getMnemonic());
-        this.addSubcontactMenu.setMnemonic(addSubcontactString.getMnemonic());
-        this.removeContactMenu.setMnemonic(removeContactString.getMnemonic());
-        this.renameContactItem.setMnemonic(renameContactString.getMnemonic());
-        this.viewHistoryItem.setMnemonic(viewHistoryString.getMnemonic());
-        this.moveSubcontactMenu.setMnemonic(moveSubcontactString.getMnemonic());
+        this.sendSmsItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.SEND_SMS"));
+        this.sendFileItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.SEND_FILE"));
+        this.moveToMenu.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.MOVE_TO_GROUP"));
+        this.addSubcontactMenu.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.ADD_SUBCONTACT"));
+        this.removeContactMenu.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.REMOVE_CONTACT"));
+        this.renameContactItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.RENAME_CONTACT"));
+        this.viewHistoryItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.VIEW_HISTORY"));
+        this.moveSubcontactMenu.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.MOVE_SUBCONTACT"));
     }
 
     /**
@@ -561,10 +575,10 @@ public class ContactRightButtonMenu
             {
                 new ErrorDialog(
                         mainFrame,
-                        Messages.getI18NString(
-                            "moveToGroup").getText(),
-                        Messages.getI18NString(
-                            "moveContactError").getText(),
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.MOVE_TO_GROUP"),
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.MOVE_CONTACT_ERROR"),
                         ex).showDialog();
             }
         }
@@ -675,14 +689,17 @@ public class ContactRightButtonMenu
             {
                 if(Constants.REMOVE_CONTACT_ASK)
                 {
-                    String message = Messages.getI18NString("removeContactText",
-                        new String[]{contact.getDisplayName()}).getText();
+                    String message = GuiActivator.getResources().getI18NString(
+                        "service.gui.REMOVE_CONTACT_TEXT",
+                        new String[]{contact.getDisplayName()});
 
                     MessageDialog dialog = new MessageDialog(
-                            mainFrame,
-                            Messages.getI18NString("removeContact").getText(),
-                            message,
-                            Messages.getI18NString("remove").getText());
+                        mainFrame,
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.REMOVE_CONTACT"),
+                        message,
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.REMOVE"));
 
                     int returnCode = dialog.showDialog();
 
@@ -704,11 +721,11 @@ public class ContactRightButtonMenu
             catch (Exception ex)
             {
                 new ErrorDialog(mainFrame,
-                                    Messages.getI18NString(
-                                    "removeContact").getText(),
-                                    ex.getMessage(),
-                                    ex)
-                                .showDialog();
+                                GuiActivator.getResources().getI18NString(
+                                "service.gui.REMOVE_CONTACT"),
+                                ex.getMessage(),
+                                ex)
+                            .showDialog();
             }
         }
     }
@@ -723,16 +740,16 @@ public class ContactRightButtonMenu
             if(Constants.REMOVE_CONTACT_ASK)
             {
                 String message
-                    = Messages.getI18NString("removeContactText",
-                        new String[]{contactItem.getDisplayName()}).getText();
+                    = GuiActivator.getResources().getI18NString(
+                        "service.gui.REMOVE_CONTACT_TEXT",
+                        new String[]{contactItem.getDisplayName()});
 
-                MessageDialog dialog
-                    = new MessageDialog(mainFrame,
-                                        Messages.getI18NString("removeContact")
-                                            .getText(),
-                                        message,
-                                        Messages.getI18NString("remove")
-                                            .getText());
+                MessageDialog dialog = new MessageDialog(mainFrame,
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.REMOVE_CONTACT"),
+                    message,
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.REMOVE"));
 
                 int returnCode = dialog.showDialog();
 
@@ -807,8 +824,10 @@ public class ContactRightButtonMenu
         if(toMetaContact.equals(contactItem)) 
         {
             new ErrorDialog(this.mainFrame,
-                Messages.getI18NString("moveSubcontact").getText(),
-                Messages.getI18NString("moveSubcontactInSameContact").getText(),
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.MOVE_SUBCONTACT"),
+                GuiActivator.getResources()
+                    .getI18NString("service.gui.MOVE_SUBCONTACT_FAILED"),
                 ErrorDialog.WARNING)
                     .showDialog();
         }
@@ -817,7 +836,7 @@ public class ContactRightButtonMenu
             
             guiContactList.setCursor(
                     Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-
+            
             if(moveAllContacts) 
             {
                 new MoveAllSubcontactsThread(toMetaContact).start();
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
index 1dcb1a6..8d7f8e4 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/GroupRightButtonMenu.java
@@ -6,20 +6,16 @@
  */
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
-import java.util.*;
-
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
+import java.util.*;
 
 import javax.swing.*;
 
-import org.osgi.framework.*;
-
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -31,6 +27,8 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
 
+import org.osgi.framework.*;
+
 /**
  * The GroupRightButtonMenu is the menu, opened when user clicks with the
  * right mouse button on a group in the contact list. Through this menu the
@@ -45,21 +43,15 @@ public class GroupRightButtonMenu
     {
     private Logger logger = Logger.getLogger(GroupRightButtonMenu.class);
 
-    private I18NString addContactString = Messages.getI18NString("addContact");
-
-    private I18NString removeGroupString = Messages.getI18NString("removeGroup");
-    
-    private I18NString renameGroupString = Messages.getI18NString("renameGroup");
-    
-    private SIPCommMenu addContactMenu
-        = new SIPCommMenu(addContactString.getText());
+    private SIPCommMenu addContactMenu = new SIPCommMenu(
+        GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"));
     
     private JMenuItem removeGroupItem = new JMenuItem(
-        removeGroupString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.REMOVE_GROUP"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.DELETE_16x16_ICON)));
     
     private JMenuItem renameGroupItem = new JMenuItem(
-        renameGroupString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.RENAME_GROUP"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.RENAME_16x16_ICON)));
     
     private MetaContactGroup group;
@@ -114,12 +106,14 @@ public class GroupRightButtonMenu
         this.renameGroupItem.setName("renameGroup");
         this.removeGroupItem.setName("removeGroup");
         
+        this.addContactMenu.setMnemonic(GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.ADD_CONTACT"));
         
-        this.addContactMenu.setMnemonic(addContactString.getMnemonic());
-        
-        this.renameGroupItem.setMnemonic(renameGroupString.getMnemonic());
+        this.renameGroupItem.setMnemonic(GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.RENAME_GROUP"));
         
-        this.removeGroupItem.setMnemonic(removeGroupString.getMnemonic());
+        this.removeGroupItem.setMnemonic(GuiActivator.getResources()
+                .getI18nMnemonic("service.gui.REMOVE_GROUP"));
         
         this.renameGroupItem.addActionListener(this);
         this.removeGroupItem.addActionListener(this);
@@ -183,7 +177,7 @@ public class GroupRightButtonMenu
             if(group != null) 
                 new RemoveGroupThread(group).start();
         }
-        else if(itemName.equals("renameGroup"))
+        else if(itemName.equals("service.gui.RENAME_GROUP"))
         {
             
             RenameGroupDialog dialog = new RenameGroupDialog(
@@ -234,14 +228,17 @@ public class GroupRightButtonMenu
             try
             {
                 if(Constants.REMOVE_CONTACT_ASK) {
-                    String message = Messages.getI18NString("removeContactText",
-                        new String[]{group.getGroupName()}).getText();
+                    String message = GuiActivator.getResources().getI18NString(
+                        "service.gui.REMOVE_CONTACT_TEXT",
+                        new String[]{group.getGroupName()});
 
                     MessageDialog dialog = new MessageDialog(
-                            mainFrame,
-                            Messages.getI18NString("removeGroup").getText(),
-                            message,
-                            Messages.getI18NString("remove").getText());
+                        mainFrame,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.REMOVE_GROUP"),
+                        message,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.REMOVE"));
 
                     int returnCode = dialog.showDialog();
 
@@ -263,11 +260,11 @@ public class GroupRightButtonMenu
             catch (Exception ex)
             {
                 new ErrorDialog(mainFrame,
-                                    Messages.getI18NString(
-                                    "removeGroup").getText(),
-                                    ex.getMessage(),
-                                    ex)
-                                .showDialog();
+                                GuiActivator.getResources().getI18NString(
+                                "service.gui.REMOVE_GROUP"),
+                                ex.getMessage(),
+                                ex)
+                .showDialog();
             }
         }
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
index e30e473..b90ae16 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/MoveSubcontactMessageDialog.java
@@ -11,8 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
@@ -29,17 +29,18 @@ public class MoveSubcontactMessageDialog
     extends SIPCommDialog
 {
     private SIPCommMsgTextArea infoArea = new SIPCommMsgTextArea(
-        Messages.getI18NString("moveSubcontactMsg").getText());
+        GuiActivator.getResources()
+            .getI18NString("service.gui.MOVE_SUBCONTACT_MSG"));
     
     private JLabel infoTitleLabel = new JLabel(
-        Messages.getI18NString("moveSubcontact").getText());
+        GuiActivator.getResources()
+            .getI18NString("service.gui.MOVE_SUBCONTACT"));
     
     private JLabel iconLabel = new JLabel(
             new ImageIcon(ImageLoader.getImage(ImageLoader.INFO_ICON)));
     
-    private I18NString cancelString = Messages.getI18NString("cancel");
-    
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private TransparentPanel labelsPanel
         = new TransparentPanel(new GridLayout(0, 1));
@@ -70,13 +71,14 @@ public class MoveSubcontactMessageDialog
         this.mainFrame = parentWindow;
         this.clistListener = listener;
         
-        System.out.println("EHOOOOOOOOOOOOOOOOOOOOOOOOO");
-        this.setTitle(Messages.getI18NString("moveSubcontact").getText());
+        this.setTitle(GuiActivator.getResources()
+            .getI18NString("service.gui.MOVE_SUBCONTACT"));
         
         this.mainPanel.setPreferredSize(
                 new Dimension(dialogWidth, dialogHeight));
         
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.cancelButton.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
index 0325b33..38bb94d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.swing.*;
@@ -24,17 +25,15 @@ import net.java.sip.communicator.util.swing.*;
  */
 public class RenameContactDialog
     extends SIPCommDialog
-    implements ActionListener {
-
+    implements ActionListener
+{
     private RenameContactPanel renameContactPanel;
     
-    private I18NString renameString = Messages.getI18NString("rename");
-    
-    private I18NString cancelString = Messages.getI18NString("cancel");
-    
-    private JButton renameButton = new JButton(renameString.getText());
+    private JButton renameButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.RENAME"));
     
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private TransparentPanel buttonsPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
@@ -77,14 +76,17 @@ public class RenameContactDialog
      * fields, etc.
      */
     private void init() {
-        this.setTitle(Messages.getI18NString("renameContact").getText());
+        this.setTitle(GuiActivator.getResources()
+            .getI18NString("service.gui.RENAME_CONTACT"));
         
         this.getRootPane().setDefaultButton(renameButton);
         this.renameButton.setName("rename");
         this.cancelButton.setName("cancel");
         
-        this.renameButton.setMnemonic(renameString.getMnemonic());
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.renameButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.RENAME"));
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.renameButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
index c63670d..0a33f6f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameContactPanel.java
@@ -9,8 +9,8 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -23,20 +23,20 @@ import net.java.sip.communicator.util.swing.*;
 public class RenameContactPanel
     extends TransparentPanel
 {
-    private JLabel uinLabel =
-        new JLabel(Messages.getI18NString("newName").getText());
+    private JLabel uinLabel = new JLabel(
+        GuiActivator.getResources().getI18NString("service.gui.NEW_NAME"));
 
     private JTextField textField = new JTextField();
 
     private TransparentPanel dataPanel
         = new TransparentPanel(new BorderLayout(5, 5));
 
-    private SIPCommMsgTextArea infoLabel
-        = new SIPCommMsgTextArea(
-            Messages.getI18NString("renameContactWizard").getText());
+    private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.RENAME_CONTACT_WIZARD"));
 
-    private JLabel infoTitleLabel
-        = new JLabel(Messages.getI18NString("renameContact").getText());
+    private JLabel infoTitleLabel = new JLabel(
+        GuiActivator.getResources().getI18NString("service.gui.RENAME_CONTACT"));
 
     private JLabel iconLabel
         = new JLabel(new ImageIcon(ImageLoader
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
index 35f8a39..3cd3e33 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.swing.*;
@@ -28,13 +29,11 @@ public class RenameGroupDialog
 
     private RenameGroupPanel renameGroupPanel;
     
-    private I18NString renameString = Messages.getI18NString("rename");
-    
-    private I18NString cancelString = Messages.getI18NString("cancel");
-    
-    private JButton renameButton = new JButton(renameString.getText());
+    private JButton renameButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.RENAME"));
     
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private TransparentPanel buttonsPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
@@ -71,14 +70,17 @@ public class RenameGroupDialog
      * fields, etc.
      */
     private void init() {
-        this.setTitle(Messages.getI18NString("renameGroup").getText());
+        this.setTitle(GuiActivator.getResources()
+            .getI18NString("service.gui.RENAME_GROUP"));
         
         this.getRootPane().setDefaultButton(renameButton);
         this.renameButton.setName("rename");
         this.cancelButton.setName("cancel");
         
-        this.renameButton.setMnemonic(renameString.getMnemonic());
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.renameButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.RENAME"));
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.renameButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
index 3efaf51..3c0f60a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/RenameGroupPanel.java
@@ -6,10 +6,11 @@
 package net.java.sip.communicator.impl.gui.main.contactlist;
 
 import java.awt.*;
+
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -22,20 +23,20 @@ import net.java.sip.communicator.util.swing.*;
 public class RenameGroupPanel
     extends TransparentPanel
 {
-    private JLabel uinLabel
-        = new JLabel(Messages.getI18NString("newName").getText());
+    private JLabel uinLabel = new JLabel(
+        GuiActivator.getResources().getI18NString("service.gui.NEW_NAME"));
 
     private JTextField textField = new JTextField();
 
     private TransparentPanel dataPanel
         = new TransparentPanel(new BorderLayout(5, 5));
 
-    private SIPCommMsgTextArea infoLabel
-        = new SIPCommMsgTextArea(
-            Messages.getI18NString("renameGroupInfo").getText());
+    private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.RENAME_GROUP_INFO"));
 
-    private JLabel infoTitleLabel
-        = new JLabel(Messages.getI18NString("renameGroup").getText());
+    private JLabel infoTitleLabel = new JLabel(
+        GuiActivator.getResources().getI18NString("service.gui.RENAME_GROUP"));
 
     private JLabel iconLabel
         = new JLabel(new ImageIcon(ImageLoader.getImage(
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java
index 3422e17..ab36845 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactDialog.java
@@ -8,10 +8,11 @@ package net.java.sip.communicator.impl.gui.main.contactlist.addcontact;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
@@ -36,13 +37,11 @@ public class AddContactDialog
     
     private AddContactPanel addContactPanel = new AddContactPanel();
     
-    private I18NString addString = Messages.getI18NString("add");
-    
-    private I18NString cancelString = Messages.getI18NString("cancel");
-    
-    private JButton addButton = new JButton(addString.getText());
+    private JButton addButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.ADD"));
     
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private TransparentPanel buttonsPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
@@ -111,7 +110,8 @@ public class AddContactDialog
      */
     private void init()
     {
-        this.setTitle(Messages.getI18NString("addContact").getText());
+        this.setTitle(
+            GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"));
         
         this.setSize(520, 250);
         
@@ -119,9 +119,11 @@ public class AddContactDialog
         this.addButton.setName("add");
         this.cancelButton.setName("cancel");
         
-        this.addButton.setMnemonic(addString.getMnemonic());
+        this.addButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.ADD"));
         
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.addButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
@@ -175,30 +177,17 @@ public class AddContactDialog
                             logger.error(ex);
                             ex.printStackTrace();
                             int errorCode = ex.getErrorCode();
-                            
+
                             if (errorCode
                                     == MetaContactListException
-                                        .CODE_CONTACT_ALREADY_EXISTS_ERROR) {
-                                
-                                new ErrorDialog(mainFrame,
-                                    Messages.getI18NString(
-                                    "addContactErrorTitle").getText(),
-                                    Messages.getI18NString(
-                                            "addContactExistError",
-                                            new String[]{uin}).getText(),
-                                    ex)
-                                .showDialog();
-                            }
-                            else if (errorCode
-                                == MetaContactListException
-                                    .CODE_LOCAL_IO_ERROR)
+                                        .CODE_CONTACT_ALREADY_EXISTS_ERROR)
                             {
                                 new ErrorDialog(mainFrame,
-                                    Messages.getI18NString(
-                                    "addContactErrorTitle").getText(),
-                                    Messages.getI18NString(
-                                            "addContactError",
-                                            new String[]{uin}).getText(),
+                                    GuiActivator.getResources().getI18NString(
+                                    "addContactErrorTitle"),
+                                    GuiActivator.getResources().getI18NString(
+                                            "addContactExistError",
+                                            new String[]{uin}),
                                     ex)
                                 .showDialog();
                             }
@@ -207,22 +196,22 @@ public class AddContactDialog
                                         .CODE_NETWORK_ERROR)
                             {
                                 new ErrorDialog(mainFrame,
-                                    Messages.getI18NString(
-                                    "addContactErrorTitle").getText(),
-                                    Messages.getI18NString(
-                                            "addContactError",
-                                            new String[]{uin}).getText(),
+                                    GuiActivator.getResources().getI18NString(
+                                    "addContactErrorTitle"),
+                                    GuiActivator.getResources().getI18NString(
+                                        "service.gui.ADD_CONTACT_NETWORK_ERROR",
+                                        new String[]{uin}),
                                     ex)
                                 .showDialog();
                             }
                             else
                             {
                                 new ErrorDialog(mainFrame,
-                                    Messages.getI18NString(
-                                    "addContactErrorTitle").getText(),
-                                    Messages.getI18NString(
-                                            "addContactError",
-                                            new String[]{uin}).getText(),
+                                    GuiActivator.getResources().getI18NString(
+                                    "addContactErrorTitle"),
+                                    GuiActivator.getResources().getI18NString(
+                                            "service.gui.ADD_CONTACT_ERROR",
+                                            new String[]{uin}),
                                     ex)
                                 .showDialog();
                             }
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
index c4d9e0e..f13bf44 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/AddContactPanel.java
@@ -7,11 +7,12 @@
 package net.java.sip.communicator.impl.gui.main.contactlist.addcontact;
 
 import java.awt.*;
+
 import javax.swing.*;
 import javax.swing.event.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.util.swing.*;
@@ -28,7 +29,7 @@ public class AddContactPanel
 {
 
     private JLabel uinLabel = new JLabel(
-        Messages.getI18NString("identifier").getText());
+        GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER"));
 
     private JTextField textField = new JTextField();
 
@@ -36,11 +37,11 @@ public class AddContactPanel
         = new TransparentPanel(new BorderLayout(5, 5));
 
     private SIPCommMsgTextArea infoLabel 
-        = new SIPCommMsgTextArea(
-            Messages.getI18NString("addContactIdentifier").getText());
+        = new SIPCommMsgTextArea(GuiActivator.getResources()
+                .getI18NString("service.gui.ADD_CONTACT_IDENTIFIER"));
 
     private JLabel infoTitleLabel = new JLabel(
-        Messages.getI18NString("addContact").getText());
+        GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"));
 
     private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
             .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON)));
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 813b677..3995cb6 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
@@ -8,9 +8,9 @@ package net.java.sip.communicator.impl.gui.main.contactlist.addcontact;
 
 import java.util.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.customcontrols.wizard.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
@@ -47,9 +47,11 @@ public class AddContactWizard
 
         super.addWizardListener(this);
 
-        this.setTitle(Messages.getI18NString("addContactWizard").getText());
+        this.setTitle(GuiActivator.getResources()
+            .getI18NString("service.gui.ADD_CONTACT_WIZARD"));
 
-        this.setFinishButtonText(Messages.getI18NString("addContact").getText());
+        this.setFinishButtonText(GuiActivator.getResources()
+            .getI18NString("service.gui.ADD_CONTACT"));
 
         Vector pps = new Vector();
         Iterator iter = mainFrame.getProtocolProviders();
@@ -122,56 +124,45 @@ public class AddContactWizard
                     .createMetaContact(
                     pps, group, newContact.getUin());
             }
-            catch (MetaContactListException ex) {
+            catch (MetaContactListException ex)
+            {
                 logger.error(ex);
                 ex.printStackTrace();
                 int errorCode = ex.getErrorCode();
-                
+
                 if (errorCode
                         == MetaContactListException
-                            .CODE_CONTACT_ALREADY_EXISTS_ERROR) {
-                        
+                            .CODE_CONTACT_ALREADY_EXISTS_ERROR)
+                {
                         new ErrorDialog(mainFrame,
-                            Messages.getI18NString(
-                            "addContactErrorTitle").getText(),
-                            Messages.getI18NString(
+                            GuiActivator.getResources().getI18NString(
+                            "addContactErrorTitle"),
+                            GuiActivator.getResources().getI18NString(
                                     "addContactExistError",
-                                    new String[]{newContact.getUin()}).getText(),
+                                    new String[]{newContact.getUin()}),
                             ex)
                         .showDialog();
                 }
                 else if (errorCode
-                    == MetaContactListException.CODE_LOCAL_IO_ERROR) {
-                    
-                    new ErrorDialog(mainFrame,
-                        Messages.getI18NString(
-                        "addContactErrorTitle").getText(),
-                        Messages.getI18NString(
-                                "addContactError",
-                                new String[]{newContact.getUin()}).getText(),
-                        ex)
-                    .showDialog();
-                }
-                else if (errorCode
                         == MetaContactListException.CODE_NETWORK_ERROR) {
                     
                     new ErrorDialog(mainFrame,
-                        Messages.getI18NString(
-                        "addContactErrorTitle").getText(),
-                        Messages.getI18NString(
-                                "addContactError",
-                                new String[]{newContact.getUin()}).getText(),
+                        GuiActivator.getResources().getI18NString(
+                        "addContactErrorTitle"),
+                        GuiActivator.getResources().getI18NString(
+                                "service.gui.ADD_CONTACT_NETWORK_ERROR",
+                                new String[]{newContact.getUin()}),
                         ex)
                     .showDialog();
                 }
                 else {
                     
                     new ErrorDialog(mainFrame,
-                        Messages.getI18NString(
-                        "addContactErrorTitle").getText(),
-                        Messages.getI18NString(
-                                "addContactError",
-                                new String[]{newContact.getUin()}).getText(),
+                        GuiActivator.getResources().getI18NString(
+                        "addContactErrorTitle"),
+                        GuiActivator.getResources().getI18NString(
+                                "service.gui.ADD_CONTACT_ERROR",
+                                new String[]{newContact.getUin()}),
                         ex)
                     .showDialog();
                 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
index 9ca207a..18ac457 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectAccountPanel.java
@@ -17,7 +17,6 @@ import javax.swing.table.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
@@ -58,19 +57,21 @@ public class SelectAccountPanel
         new JLabel(new ImageIcon(ImageLoader
             .getImage(ImageLoader.ADD_CONTACT_WIZARD_ICON)));
 
-    private SIPCommMsgTextArea infoLabel =
-        new SIPCommMsgTextArea(Messages.getI18NString("selectProvidersWizard")
-            .getText());
+    private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SELECT_PROVIDERS_WIZARD_MSG"));
 
-    private JLabel infoTitleLabel =
-        new JLabel(Messages.getI18NString("selectProvidersWizardTitle")
-            .getText(), JLabel.CENTER);
+    private JLabel infoTitleLabel = new JLabel(
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SELECT_PROVIDERS_WIZARD"),
+        JLabel.CENTER);
 
     private TransparentPanel buttonPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
     private JButton addAccountButton =
-        new JButton(Messages.getI18NString("addAccount").getText());
+        new JButton(
+            GuiActivator.getResources().getI18NString("service.gui.ADD_ACCOUNT"));
 
     /**
      * Creates and initializes the <tt>SelectAccountPanel</tt>.
@@ -140,8 +141,10 @@ public class SelectAccountPanel
             .setPreferredScrollableViewportSize(new Dimension(500, 70));
 
         tableModel.addColumn("");
-        tableModel.addColumn(Messages.getI18NString("account").getText());
-        tableModel.addColumn(Messages.getI18NString("protocol").getText());
+        tableModel.addColumn(
+            GuiActivator.getResources().getI18NString("service.gui.ACCOUNT"));
+        tableModel.addColumn(
+            GuiActivator.getResources().getI18NString("service.gui.PROTOCOL"));
 
         while (protocolProvidersList.hasNext())
         {
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
index d2cbc62..dea8be9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addcontact/SelectGroupPanel.java
@@ -12,8 +12,8 @@ import java.util.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.swing.*;
@@ -32,14 +32,16 @@ public class SelectGroupPanel
         = new TransparentPanel(new BorderLayout()); 
     
     private JLabel groupLabel = new JLabel(
-            Messages.getI18NString("selectGroup").getText() + ": ");
+        GuiActivator.getResources().getI18NString("service.gui.SELECT_GROUP")
+            + ": ");
     
     private JComboBox groupCombo = new JComboBox();
     
     private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea();
     
     private JLabel infoTitleLabel = new JLabel(
-            Messages.getI18NString("selectGroupWizardTitle").getText());
+        GuiActivator.getResources()
+            .getI18NString("service.gui.SELECT_GROUP_WIZARD"));
     
     private TransparentPanel labelsPanel
         = new TransparentPanel(new GridLayout(0, 1, 10, 10));
@@ -97,7 +99,7 @@ public class SelectGroupPanel
         this.add(rightPanel, BorderLayout.CENTER);
 
 //      groupCombo.addItem(new GroupWrapper(
-//      Messages.getI18NString("rootGroup").getText(),
+//      GuiActivator.getResources().getI18NString("service.gui.ROOT_GROUP").getText(),
 //      wizard.getRootGroup()));
 
         String lastGroupName = ConfigurationManager.getLastContactParent();
@@ -109,7 +111,8 @@ public class SelectGroupPanel
         if (groupsList.hasNext())
         {
             infoLabel.setText(
-                Messages.getI18NString("selectGroupWizard").getText());
+                GuiActivator.getResources().
+                    getI18NString("service.gui.SELECT_GROUP_WIZARD_MSG"));
 
             this.groupPanel.add(groupLabel, BorderLayout.WEST);
             this.groupPanel.add(groupCombo, BorderLayout.CENTER);
@@ -134,8 +137,8 @@ public class SelectGroupPanel
         else
         {
             infoLabel.setForeground(Color.RED);
-            infoLabel.setText(
-                Messages.getI18NString("createFirstGroupWizard").getText());
+            infoLabel.setText(GuiActivator.getResources()
+                .getI18NString("service.gui.CREATE_FIRST_GROUP_WIZARD"));
         }
     }
     
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
index c617d41..42dfd72 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupDialog.java
@@ -11,7 +11,8 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
+
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.util.*;
@@ -30,13 +31,11 @@ public class CreateGroupDialog
     
     private CreateGroupPanel groupPanel = new CreateGroupPanel();
     
-    private I18NString createString = Messages.getI18NString("create");
-    
-    private I18NString cancelString = Messages.getI18NString("cancel");
-    
-    private JButton addButton = new JButton(createString.getText());
+    private JButton addButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CREATE"));
     
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
     
     private TransparentPanel buttonsPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
@@ -70,7 +69,8 @@ public class CreateGroupDialog
      */
     private void init()
     {
-        this.setTitle(Messages.getI18NString("addGroup").getText());
+        this.setTitle(
+            GuiActivator.getResources().getI18NString("service.gui.ADD_GROUP"));
         
         this.getRootPane().setDefaultButton(addButton);
         this.addButton.setName("create");
@@ -79,8 +79,10 @@ public class CreateGroupDialog
         this.addButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
         
-        this.addButton.setMnemonic(createString.getMnemonic());
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.addButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CREATE"));
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
         
         this.buttonsPanel.add(addButton);
         this.buttonsPanel.add(cancelButton);
@@ -144,38 +146,38 @@ public class CreateGroupDialog
                                     .CODE_GROUP_ALREADY_EXISTS_ERROR)
                         {
                             groupPanel.showErrorMessage(
-                                    Messages.getI18NString(
-                                            "addGroupExistError",
-                                            new String[]{groupName}).getText());
-                            
+                                GuiActivator.getResources().getI18NString(
+                                        "service.gui.ADD_GROUP_EXIST_ERROR",
+                                        new String[]{groupName}));
+
                             return;
                         }
                         else if (errorCode
                             == MetaContactListException.CODE_LOCAL_IO_ERROR)
                         {
                             groupPanel.showErrorMessage(
-                                    Messages.getI18NString(
-                                            "addGroupLocalError",
-                                            new String[]{groupName}).getText());
-                            
+                                GuiActivator.getResources().getI18NString(
+                                        "service.gui.ADD_GROUP_LOCAL_ERROR",
+                                        new String[]{groupName}));
+
                             return;
                         }
                         else if (errorCode
                                 == MetaContactListException.CODE_NETWORK_ERROR)
                         {
                             groupPanel.showErrorMessage(
-                                    Messages.getI18NString(
-                                            "addGroupNetError",
-                                            new String[]{groupName}).getText());
-                            
+                                GuiActivator.getResources().getI18NString(
+                                        "service.gui.ADD_GROUP_NET_ERROR",
+                                        new String[]{groupName}));
+
                             return;
                         }
                         else
                         {
                             groupPanel.showErrorMessage(
-                                    Messages.getI18NString(
-                                            "addGroupError",
-                                            new String[]{groupName}).getText());
+                                GuiActivator.getResources().getI18NString(
+                                        "service.gui.ADD_GROUP_ERROR",
+                                        new String[]{groupName}));
 
                             return;
                         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
index ebcc797..882f035 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/addgroup/CreateGroupPanel.java
@@ -10,8 +10,8 @@ import java.awt.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.util.swing.*;
 
@@ -25,7 +25,7 @@ public class CreateGroupPanel
 {
 
     private JLabel uinLabel = new JLabel(
-        Messages.getI18NString("groupName").getText());
+        GuiActivator.getResources().getI18NString("service.gui.GROUP_NAME"));
 
     private JTextField textField = new JTextField();
 
@@ -33,10 +33,11 @@ public class CreateGroupPanel
         = new TransparentPanel(new BorderLayout(5, 5));
 
     private SIPCommMsgTextArea infoLabel = new SIPCommMsgTextArea(
-            Messages.getI18NString("createGroupName").getText());
+            GuiActivator.getResources()
+                .getI18NString("service.gui.CREATE_GROUP_NAME"));
 
     private JLabel infoTitleLabel = new JLabel(
-        Messages.getI18NString("createGroup").getText());
+        GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"));
 
     private JLabel iconLabel = new JLabel(new ImageIcon(ImageLoader
             .getImage(ImageLoader.ADD_GROUP_ICON)));
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
index f354f54..5cdc02a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/AuthenticationWindow.java
@@ -10,8 +10,8 @@ import java.awt.*;
 import java.awt.event.*;
 
 import javax.swing.*;
+import net.java.sip.communicator.impl.gui.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.gui.*;
@@ -33,22 +33,20 @@ public class AuthenticationWindow
     private JTextArea realmTextArea = new JTextArea();
 
     private JLabel uinLabel = new JLabel(
-        Messages.getI18NString("identifier").getText());
+        GuiActivator.getResources().getI18NString("service.gui.IDENTIFIER"));
 
     private JLabel passwdLabel = new JLabel(
-        Messages.getI18NString("passwd").getText());
+        GuiActivator.getResources().getI18NString("service.gui.PASSWORD"));
 
     private JComponent uinValue;
 
     private JPasswordField passwdField = new JPasswordField(15);
 
-    private I18NString okString = Messages.getI18NString("ok");
+    private JButton loginButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.OK"));
 
-    private I18NString cancelString = Messages.getI18NString("cancel");
-
-    private JButton loginButton = new JButton(okString.getText());
-
-    private JButton cancelButton = new JButton(cancelString.getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
     private TransparentPanel labelsPanel
         = new TransparentPanel(new GridLayout(0, 1, 8, 8));
@@ -62,9 +60,9 @@ public class AuthenticationWindow
     private TransparentPanel buttonsPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
 
-    private JCheckBox rememberPassCheckBox =
-        new SIPCommCheckBox(Messages.getI18NString("rememberPassword")
-            .getText());
+    private JCheckBox rememberPassCheckBox
+        = new SIPCommCheckBox(GuiActivator.getResources()
+            .getI18NString("service.gui.REMEMBER_PASSWORD"));
 
     private LoginWindowBackground backgroundPanel;
 
@@ -130,8 +128,9 @@ public class AuthenticationWindow
 
         this.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 
-        this.setTitle(
-            Messages.getI18NString("authenticationWindowTitle").getText());
+        this.setTitle(GuiActivator.getResources().getI18NString(
+            "service.gui.AUTHENTICATION_WINDOW_TITLE",
+            new String[]{protocolProvider.getProtocolName()}));
 
         this.enableKeyActions();
     }
@@ -184,8 +183,9 @@ public class AuthenticationWindow
         this.realmTextArea.setWrapStyleWord(true);
         this.realmTextArea.setFont(Constants.FONT.deriveFont(Font.BOLD, 12f));
         this.realmTextArea.setText(
-            Messages.getI18NString("securityAuthorityRealm",
-                new String[]{realm}).getText());
+            GuiActivator.getResources().getI18NString(
+                "service.gui.SECURITY_AUTHORITY_REALM",
+                new String[]{realm}));
 
         this.uinLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
         this.passwdLabel.setFont(Constants.FONT.deriveFont(Font.BOLD));
@@ -213,8 +213,10 @@ public class AuthenticationWindow
         this.loginButton.setName("ok");
         this.cancelButton.setName("cancel");
 
-        this.loginButton.setMnemonic(okString.getMnemonic());
-        this.cancelButton.setMnemonic(cancelString.getMnemonic());
+        this.loginButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.OK"));
+        this.cancelButton.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
 
         this.loginButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
index bae1cd9..5cac2ed 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/LoginManager.java
@@ -8,7 +8,6 @@ package net.java.sip.communicator.impl.gui.main.login;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.authorization.*;
 import net.java.sip.communicator.impl.gui.utils.Constants;
@@ -163,24 +162,27 @@ public class LoginManager
                     .REASON_RECONNECTION_RATE_LIMIT_EXCEEDED)
             {
 
-                String msgText = Messages.getI18NString(
-                    "reconnectionLimitExceeded", new String[]
-                    { accountID.getUserID(), accountID.getService() })
-                    .getText();
+                String msgText = GuiActivator.getResources().getI18NString(
+                    "service.gui.RECONNECTION_LIMIT_EXCEEDED", new String[]
+                    { accountID.getUserID(), accountID.getService() });
 
-                new ErrorDialog(null,
-                                Messages.getI18NString("error").getText(),
-                                msgText).showDialog();
+                new ErrorDialog(
+                    null,
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.ERROR"),
+                    msgText).showDialog();
             }
             else if (evt.getReasonCode() == RegistrationStateChangeEvent
                                                 .REASON_NON_EXISTING_USER_ID)
             {
-                String msgText = Messages.getI18NString("nonExistingUserId",
+                String msgText = GuiActivator.getResources().getI18NString(
+                    "service.gui.NON_EXISTING_USER_ID",
                     new String[]
-                    { protocolProvider.getProtocolDisplayName() }).getText();
+                    { protocolProvider.getProtocolDisplayName() });
 
-                new ErrorDialog(null,
-                    Messages.getI18NString("error").getText(),
+                new ErrorDialog(
+                    null,
+                    GuiActivator.getResources().getI18NString("service.gui.ERROR"),
                     msgText).showDialog();
             }
 
@@ -188,14 +190,16 @@ public class LoginManager
         }
         else if (evt.getNewState().equals(RegistrationState.CONNECTION_FAILED))
         {
-            String msgText = Messages.getI18NString("connectionFailedMessage",
+            String msgText = GuiActivator.getResources().getI18NString(
+                "service.gui.CONNECTION_FAILED_MSG",
                 new String[]
-                { accountID.getUserID(), accountID.getService() }).getText();
+                { accountID.getUserID(), accountID.getService() });
 
-            int result = new MessageDialog(null,
-                Messages.getI18NString("error").getText(),
+            int result = new MessageDialog(
+                null,
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
                 msgText,
-                Messages.getI18NString("retry").getText(),
+                GuiActivator.getResources().getI18NString("service.gui.RETRY"),
                 false).showDialog();
 
             if (result == MessageDialog.OK_RETURN_CODE)
@@ -207,12 +211,13 @@ public class LoginManager
         }
         else if (evt.getNewState().equals(RegistrationState.EXPIRED))
         {
-            String msgText = Messages.getI18NString("connectionExpiredMessage",
+            String msgText = GuiActivator.getResources().getI18NString(
+                "service.gui.CONNECTION_EXPIRED_MSG",
                 new String[]
-                { protocolProvider.getProtocolDisplayName() }).getText();
+                { protocolProvider.getProtocolDisplayName() });
 
             new ErrorDialog(null,
-                Messages.getI18NString("error").getText(),
+                GuiActivator.getResources().getI18NString("service.gui.ERROR"),
                 msgText).showDialog();
 
             logger.error(evt.getReason());
@@ -224,24 +229,26 @@ public class LoginManager
                 if (evt.getReasonCode() == RegistrationStateChangeEvent
                                             .REASON_MULTIPLE_LOGINS)
                 {
-                    String msgText = Messages.getI18NString("multipleLogins",
+                    String msgText = GuiActivator.getResources().getI18NString(
+                        "service.gui.MULTIPLE_LOGINS",
                         new String[]
-                        { accountID.getUserID(), accountID.getService() })
-                        .getText();
+                        { accountID.getUserID(), accountID.getService() });
 
                     new ErrorDialog(null,
-                        Messages.getI18NString("error").getText(),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.ERROR"),
                         msgText).showDialog();
                 }
                 else if (evt.getReasonCode() == RegistrationStateChangeEvent
                                             .REASON_CLIENT_LIMIT_REACHED_FOR_IP)
                 {
-                    String msgText = Messages.getI18NString(
-                        "limitReachedForIp", new String[]
-                        { protocolProvider.getProtocolDisplayName() }).getText();
+                    String msgText = GuiActivator.getResources().getI18NString(
+                        "service.gui.LIMIT_REACHED_FOR_IP", new String[]
+                        { protocolProvider.getProtocolDisplayName() });
 
                     new ErrorDialog(null,
-                        Messages.getI18NString("error").getText(),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.ERROR"),
                         msgText).showDialog();
                 }
                 else if (evt.getReasonCode() == RegistrationStateChangeEvent
@@ -251,13 +258,13 @@ public class LoginManager
                 }
                 else
                 {
-                    String msgText = Messages.getI18NString(
-                        "unregisteredMessage", new String[]
-                        { accountID.getUserID(), accountID.getService() })
-                        .getText();
+                    String msgText = GuiActivator.getResources().getI18NString(
+                        "service.gui.UNREGISTERED_MESSAGE", new String[]
+                        { accountID.getUserID(), accountID.getService() });
 
                     new ErrorDialog(null,
-                        Messages.getI18NString("error").getText(),
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.ERROR"),
                         msgText).showDialog();
                 }
                 logger.error(evt.getReason());
@@ -403,11 +410,15 @@ public class LoginManager
                 logger.error("Failed to register protocol provider. ", ex);
 
                 AccountID accountID = protocolProvider.getAccountID();
-                new ErrorDialog(mainFrame, Messages.getI18NString("error")
-                    .getText(), Messages.getI18NString("loginGeneralError",
+                new ErrorDialog(
+                    mainFrame,
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.ERROR"),
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.LOGIN_GENERAL_ERROR",
                     new String[]
-                    { accountID.getUserID(), accountID.getService() })
-                    .getText()).showDialog();
+                    { accountID.getUserID(), accountID.getService() }))
+                .showDialog();
             }
         }
 
@@ -424,12 +435,15 @@ public class LoginManager
 
                 AccountID accountID = protocolProvider.getAccountID();
                 errorMessage =
-                    Messages.getI18NString("loginGeneralError", new String[]
-                    { accountID.getUserID(), accountID.getService() })
-                        .getText();
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.LOGIN_GENERAL_ERROR",
+                        new String[]
+                           { accountID.getUserID(), accountID.getService() });
 
-                new ErrorDialog(mainFrame, Messages.getI18NString("error")
-                    .getText(), errorMessage, ex).showDialog();
+                new ErrorDialog(mainFrame,
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.ERROR"), errorMessage, ex)
+                .showDialog();
             }
                 break;
             case OperationFailedException.INTERNAL_ERROR:
@@ -439,12 +453,14 @@ public class LoginManager
 
                 AccountID accountID = protocolProvider.getAccountID();
                 errorMessage =
-                    Messages.getI18NString("loginInternalError", new String[]
-                    { accountID.getUserID(), accountID.getService() })
-                        .getText();
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.LOGIN_INTERNAL_ERROR",
+                        new String[]
+                           { accountID.getUserID(), accountID.getService() });
 
-                new ErrorDialog(mainFrame, Messages.getI18NString("error")
-                    .getText(), errorMessage, ex).showDialog();
+                new ErrorDialog(mainFrame,
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.ERROR"), errorMessage, ex).showDialog();
             }
                 break;
             case OperationFailedException.NETWORK_FAILURE:
@@ -453,15 +469,20 @@ public class LoginManager
                     + " due to a network failure: " + ex);
 
                 AccountID accountID = protocolProvider.getAccountID();
-                errorMessage =
-                    Messages.getI18NString("loginNetworkError", new String[]
-                    { accountID.getUserID(), accountID.getService() })
-                        .getText();
+                errorMessage = GuiActivator.getResources().getI18NString(
+                    "service.gui.LOGIN_NETWORK_ERROR",
+                    new String[]
+                       { accountID.getUserID(), accountID.getService() });
 
                 int result =
-                    new MessageDialog(null, Messages.getI18NString("error")
-                        .getText(), errorMessage, Messages.getI18NString(
-                        "retry").getText(), false).showDialog();
+                    new MessageDialog(
+                        null,
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.ERROR"),
+                        errorMessage,
+                        GuiActivator.getResources()
+                            .getI18NString("service.gui.RETRY"), false)
+                    .showDialog();
 
                 if (result == MessageDialog.OK_RETURN_CODE)
                 {
@@ -476,13 +497,14 @@ public class LoginManager
 
                 AccountID accountID = protocolProvider.getAccountID();
                 errorMessage =
-                    Messages.getI18NString("loginInvalidPropsError",
+                    GuiActivator.getResources().getI18NString(
+                        "service.gui.LOGIN_INVALID_PROPERTIES_ERROR",
                         new String[]
-                        { accountID.getUserID(), accountID.getService() })
-                        .getText();
+                        { accountID.getUserID(), accountID.getService() });
 
-                new ErrorDialog(mainFrame, Messages.getI18NString("error")
-                    .getText(), errorMessage, ex).showDialog();
+                new ErrorDialog(mainFrame,
+                    GuiActivator.getResources().getI18NString("service.gui.ERROR"),
+                    errorMessage, ex).showDialog();
             }
                 break;
             default:
@@ -535,12 +557,13 @@ public class LoginManager
                 }
 
                 new ErrorDialog(mainFrame,
-                    Messages.getI18NString("error").getText(),
-                    Messages.getI18NString("logoffNotSucceeded",
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.ERROR"),
+                    GuiActivator.getResources()
+                        .getI18NString("service.gui.LOGOFF_NOT_SUCCEEDED",
                         new String[]
                         { protocolProvider.getAccountID().getUserID(),
-                            protocolProvider.getAccountID().getService() })
-                        .getText())
+                            protocolProvider.getAccountID().getService() }))
                     .showDialog();
             }
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java b/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java
index f661c77..65f3a85 100644
--- a/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java
+++ b/src/net/java/sip/communicator/impl/gui/main/login/SecurityAuthorityImpl.java
@@ -6,7 +6,7 @@
  */
 package net.java.sip.communicator.impl.gui.main.login;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.protocol.*;
 
@@ -56,19 +56,14 @@ public class SecurityAuthorityImpl implements SecurityAuthority {
     {
         String errorMessage = null;
 
-        if (reasonCode == WRONG_PASSWORD)
+        if (reasonCode == WRONG_PASSWORD
+            || reasonCode == WRONG_USERNAME)
         {
             errorMessage
-                = Messages.getI18NString("authenticationFailed",
+                = GuiActivator.getResources().getI18NString(
+                    "service.gui.AUTHENTICATION_FAILED",
                     new String[]{   userCredentials.getUserName(),
-                                    realm}).getText();
-        }
-        else if (reasonCode == WRONG_USERNAME)
-        {
-            errorMessage
-                = Messages.getI18NString("authenticationFailed",
-                    new String[]{   userCredentials.getUserName(),
-                                    realm}).getText();
+                                    realm});
         }
 
         AuthenticationWindow loginWindow = null;
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
index 71dff24..f815865 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/AboutWindow.java
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import javax.swing.*;

 

 import net.java.sip.communicator.impl.gui.*;

-import net.java.sip.communicator.impl.gui.i18n.*;

 import net.java.sip.communicator.impl.gui.utils.*;

 import net.java.sip.communicator.service.gui.*;

 

@@ -32,9 +31,10 @@ public class AboutWindow
         this.setResizable(false);

 

         this.setTitle(

-            Messages.getI18NString("aboutWindowTitle",

-            new String[]{ GuiActivator.getResources()

-                    .getSettingsString("applicationName")}).getText());

+            GuiActivator.getResources().getI18NString(

+                "plugin.branding.ABOUT_WINDOW_TITLE",

+                new String[]{ GuiActivator.getResources()

+                    .getSettingsString("service.gui.APPLICATION_NAME")}));

 

         this.mainPanel.setLayout(null);

 

diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
index a2e2349..98f6259 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ExtendedQuickMenu.java
@@ -17,7 +17,6 @@ import javax.swing.event.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.addcontact.*;
@@ -135,18 +134,18 @@ public class ExtendedQuickMenu
         this.createGroupButton.setPreferredSize(
             new Dimension(DEFAULT_BUTTON_WIDTH, DEFAULT_BUTTON_HEIGHT));
 
-        this.infoButton.setToolTipText(
-            Messages.getI18NString("contactInfo").getText());
-        this.configureButton.setToolTipText(
-            Messages.getI18NString("settings").getText());
-        this.hideShowButton.setToolTipText(
-            Messages.getI18NString("hideOfflineContacts").getText());
-        this.addButton.setToolTipText(
-            Messages.getI18NString("addContact").getText());
-        this.soundButton.setToolTipText(
-            Messages.getI18NString("soundOnOff").getText());
-        this.createGroupButton.setToolTipText(
-            Messages.getI18NString("createGroup").getText());
+        this.infoButton.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.CONTACT_INFO"));
+        this.configureButton.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.SETTINGS"));
+        this.hideShowButton.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.HIDE_OFFLINE_CONTACTS"));
+        this.addButton.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.ADD_CONTACT"));
+        this.soundButton.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.SOUND_ON_OFF"));
+        this.createGroupButton.setToolTipText(GuiActivator.getResources()
+            .getI18NString("service.gui.CREATE_GROUP"));
 
         this.updateMuteButton(
                 GuiActivator.getAudioNotifier().isMute());
@@ -581,16 +580,16 @@ public class ExtendedQuickMenu
                 button.setIcon(new ImageIcon(ImageLoader.getImage(
                     ImageLoader.QUICK_MENU_SHOW_OFFLINE_ICON)));
 
-                button.setToolTipText(Messages
-                    .getI18NString("showOfflineContacts").getText());
+                button.setToolTipText(GuiActivator.getResources()
+                    .getI18NString("service.gui.SHOW_OFFLINE_CONTACTS"));
             }
             else
             {
                 button.setIcon(new ImageIcon(ImageLoader.getImage(
                     ImageLoader.QUICK_MENU_HIDE_OFFLINE_ICON)));
 
-                button.setToolTipText(Messages
-                    .getI18NString("hideOfflineContacts").getText());
+                button.setToolTipText(GuiActivator.getResources()
+                    .getI18NString("service.gui.HIDE_OFFLINE_CONTACTS"));
             }
 
             contactList.setShowOffline(!ConfigurationManager.isShowOffline());
@@ -662,9 +661,10 @@ public class ExtendedQuickMenu
                 else
                 {
                     new ErrorDialog(mainFrame,
-                        Messages.getI18NString("warning").getText(),
-                        Messages.getI18NString("selectContactSupportingInfo")
-                            .getText(),
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.WARNING"),
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.SELECT_CONTACT_SUPPORTING_INFO"),
                         ErrorDialog.WARNING).showDialog();
                 }
             }
@@ -722,7 +722,7 @@ public class ExtendedQuickMenu
 
             g2.setColor(new Color(
                 GuiActivator.getResources()
-                .getColor("desktopBackgroundColor")));
+                .getColor("service.gui.DESKTOP_BACKGROUND")));
 
             g2.drawRect(0, this.getHeight() - 2, this.getWidth(), 2);
         }
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
index 0371985..b906a13 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.account.*;
 import net.java.sip.communicator.impl.gui.main.chatroomslist.*;
@@ -40,31 +39,22 @@ public class FileMenu
     private static final Logger logger =
         Logger.getLogger(FileMenu.class.getName());
 
-    private I18NString newAccountString = Messages.getI18NString("newAccount");
-
-    private I18NString addContactString = Messages.getI18NString("addContact");
-
-    private I18NString createGroupString = Messages.getI18NString("createGroup");
-
-    private I18NString fileString = Messages.getI18NString("file");
-
-    private I18NString myChatRoomsString
-        = Messages.getI18NString("myChatRooms");
-
-    private JMenuItem newAccountMenuItem
-        = new JMenuItem(newAccountString.getText());
+    private JMenuItem newAccountMenuItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.NEW_ACCOUNT"));
 
     private JMenuItem addContactItem
-        = new JMenuItem(addContactString.getText(), 
+        = new JMenuItem(
+            GuiActivator.getResources().getI18NString("service.gui.ADD_CONTACT"), 
             new ImageIcon(ImageLoader.getImage(
                 ImageLoader.ADD_CONTACT_16x16_ICON)));
 
     private JMenuItem createGroupItem
-        = new JMenuItem(createGroupString.getText(),
+        = new JMenuItem(
+            GuiActivator.getResources().getI18NString("service.gui.CREATE_GROUP"),
             new ImageIcon(ImageLoader.getImage(ImageLoader.GROUPS_16x16_ICON)));
 
     private JMenuItem myChatRoomsItem = new JMenuItem(
-        myChatRoomsString.getText(),
+        GuiActivator.getResources().getI18NString("service.gui.MY_CHAT_ROOMS"),
         new ImageIcon(ImageLoader.getImage(ImageLoader.CHAT_ROOM_16x16_ICON)));
 
     private MainFrame parentWindow;
@@ -75,12 +65,13 @@ public class FileMenu
      */
     public FileMenu(MainFrame parentWindow)
     {
-        super(Messages.getI18NString("file").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.FILE"));
 
         this.setOpaque(false);
 
         this.setForeground(
-            new Color(GuiActivator.getResources().getColor("service.gui.MAIN_MENU_FOREGROUND")));
+            new Color(GuiActivator.getResources()
+                .getColor("service.gui.MAIN_MENU_FOREGROUND")));
 
         this.parentWindow = parentWindow;
 
@@ -110,11 +101,16 @@ public class FileMenu
         this.createGroupItem.addActionListener(this);
         this.myChatRoomsItem.addActionListener(this);
 
-        this.setMnemonic(fileString.getMnemonic());
-        this.newAccountMenuItem.setMnemonic(newAccountString.getMnemonic());
-        this.addContactItem.setMnemonic(addContactString.getMnemonic());
-        this.createGroupItem.setMnemonic(createGroupString.getMnemonic());
-        this.myChatRoomsItem.setMnemonic(myChatRoomsString.getMnemonic());
+        this.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.FILE"));
+        this.newAccountMenuItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.NEW_ACCOUNT"));
+        this.addContactItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.ADD_CONTACT"));
+        this.createGroupItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.CREATE_GROUP"));
+        this.myChatRoomsItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.MY_CHAT_ROOMS"));
     }
 
     /**
@@ -227,12 +223,14 @@ public class FileMenu
 
     private void registerCloseMenuItemNonMacOSX()
     {
-        I18NString closeString = Messages.getI18NString("quit");
-        JMenuItem closeMenuItem = new JMenuItem(closeString.getText());
+        JMenuItem closeMenuItem = new JMenuItem(
+            GuiActivator.getResources().getI18NString("service.gui.QUIT"));
+
         this.addSeparator();
         this.add(closeMenuItem);
         closeMenuItem.setName("close");
         closeMenuItem.addActionListener(this);
-        closeMenuItem.setMnemonic(closeString.getMnemonic());
+        closeMenuItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.QUIT"));
     }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
index 4837409..15deec2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/HelpMenu.java
@@ -12,7 +12,6 @@ import java.awt.event.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
@@ -41,12 +40,14 @@ public class HelpMenu
      */
     public HelpMenu(MainFrame mainFrame)
     {
-        super(Messages.getI18NString("help").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.HELP"));
 
         this.setForeground(
             new Color(GuiActivator.getResources().
                 getColor("service.gui.MAIN_MENU_FOREGROUND")));
-        this.setMnemonic(Messages.getI18NString("help").getMnemonic());
+        this.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.HELP"));
+
         this.setOpaque(false);
 
         this.initPluginComponents();
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
index 90d3fd1..24ae2a8 100755
--- a/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/MainMenu.java
@@ -11,7 +11,6 @@ import java.awt.*;
 import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 
@@ -34,12 +33,15 @@ public class MainMenu
 
     private HelpMenu helpMenu;
 
-    private I18NString fileString = Messages.getI18NString("file");
-    
-    private I18NString toolsString = Messages.getI18NString("tools");
-    
-    private I18NString helpString = Messages.getI18NString("help");
-    
+    private static final String fileString
+        = GuiActivator.getResources().getI18NString("service.gui.FILE");
+
+    private static final String toolsString
+        = GuiActivator.getResources().getI18NString("service.gui.TOOLS");
+
+    private static final String helpString
+        = GuiActivator.getResources().getI18NString("service.gui.HELP");
+
     /**
      * Creates an instance of <tt>Menu</tt>.
      */
@@ -63,14 +65,17 @@ public class MainMenu
      */
     private void init()
     {
-        fileMenu.setText(fileString.getText());
-        fileMenu.setMnemonic(fileString.getMnemonic());
+        fileMenu.setText(fileString);
+        fileMenu.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.FILE"));
 
-        toolsMenu.setText(toolsString.getText());
-        toolsMenu.setMnemonic(toolsString.getMnemonic());
+        toolsMenu.setText(toolsString);
+        toolsMenu.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.TOOLS"));
 
-        helpMenu.setText(helpString.getText());
-        helpMenu.setMnemonic(helpString.getMnemonic());
+        helpMenu.setText(helpString);
+        helpMenu.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.HELP"));
 
         this.fileMenu.setOpaque(false);
         this.toolsMenu.setOpaque(false);
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
index b2802bf..9ef12c8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/MoreButton.java
@@ -12,7 +12,7 @@ import java.util.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.gui.*;
@@ -40,7 +40,8 @@ public class MoreButton
         this.setVerticalTextPosition(SwingConstants.BOTTOM);
         this.setHorizontalTextPosition(SwingConstants.CENTER);
 
-        this.setToolTipText(Messages.getI18NString("more").getText());
+        this.setToolTipText(
+            GuiActivator.getResources().getI18NString("service.gui.MORE"));
 
         this.addMouseListener(this);
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
index 4b58459..6190ecb 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
@@ -14,7 +14,6 @@ import javax.swing.*;
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.event.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.gui.Container;
@@ -36,18 +35,24 @@ public class ToolsMenu
 {
     private final Logger logger = Logger.getLogger(ToolsMenu.class);
 
+    private MainFrame parentWindow;
+
+    private ExportedWindow configDialog;
+
     /**
      * Creates an instance of <tt>FileMenu</tt>.
      * @param parentWindow The parent <tt>ChatWindow</tt>.
      */
     public ToolsMenu(MainFrame parentWindow) {
 
-        super(Messages.getI18NString("tools").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.TOOLS"));
 
         this.setForeground(
             new Color(GuiActivator.getResources().
                 getColor("service.gui.MAIN_MENU_FOREGROUND")));
-        this.setMnemonic(Messages.getI18NString("tools").getMnemonic());
+        this.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.TOOLS"));
+
         this.setOpaque(false);
 
         registerConfigMenuItem();
@@ -156,10 +161,12 @@ public class ToolsMenu
 
     private void registerConfigMenuItemNonMacOSX()
     {
-        I18NString settingsString = Messages.getI18NString("settings");
-        JMenuItem configMenuItem = new JMenuItem(settingsString.getText());
+        JMenuItem configMenuItem = new JMenuItem(
+            GuiActivator.getResources().getI18NString("service.gui.SETTINGS"));
+
         this.add(configMenuItem);
-        configMenuItem.setMnemonic(settingsString.getMnemonic());
+        configMenuItem.setMnemonic(GuiActivator.getResources()
+            .getI18nMnemonic("service.gui.SETTINGS"));
         configMenuItem.setName("config");
         configMenuItem.addActionListener(this);
     }
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java
index 2c0c667..4e635e1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ViewMenu.java
@@ -11,7 +11,6 @@ import java.awt.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.util.*;
 /**
@@ -33,7 +32,7 @@ public class ViewMenu
      */
     public ViewMenu(MainFrame mainFrame) {
 
-        super(Messages.getI18NString("view").getText());
+        super(GuiActivator.getResources().getI18NString("service.gui.VIEW"));
 
         this.setOpaque(false);
 
@@ -43,6 +42,7 @@ public class ViewMenu
 
         this.mainFrame = mainFrame;
 
-        this.setMnemonic(Messages.getI18NString("view").getMnemonic());
+        this.setMnemonic(
+            GuiActivator.getResources().getI18nMnemonic("service.gui.VIEW"));
     }
 }
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java
index 61268d7..4dd4475 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/AccountStatusPanel.java
@@ -43,7 +43,8 @@ public class AccountStatusPanel
                             AVATAR_ICON_HEIGHT);
 
     private JLabel accountNameLabel
-        = new JLabel(GuiActivator.getResources().getI18NString("accountMe"));
+        = new JLabel(GuiActivator.getResources()
+                .getI18NString("service.gui.ACCOUNT_ME"));
 
     public AccountStatusPanel(MainFrame mainFrame)
     {
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
index 7e1361a..068839f 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/GlobalStatusSelectorBox.java
@@ -15,7 +15,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.lookandfeel.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
@@ -68,23 +67,23 @@ public class GlobalStatusSelectorBox
         ImageLoader.getImage(ImageLoader.USER_FFC_ICON));
 
     private JMenuItem onlineItem = new JMenuItem(
-        Messages.getI18NString("online").getText(),
+        GuiActivator.getResources().getI18NString("service.gui.ONLINE"),
         onlineIcon);
 
     private JMenuItem offlineItem = new JMenuItem(
-        Messages.getI18NString("offline").getText(),
+        GuiActivator.getResources().getI18NString("service.gui.OFFLINE"),
         offlineIcon);
 
     private JMenuItem awayItem = new JMenuItem(
-        Messages.getI18NString("awayStatus").getText(),
+        GuiActivator.getResources().getI18NString("service.gui.AWAY_STATUS"),
         awayIcon);
 
 //    private JMenuItem dndItem = new JMenuItem(
-//        Messages.getI18NString("dndStatus").getText(),
+//        GuiActivator.getResources().getI18NString("service.gui.DND_STATUS").getText(),
 //        dndIcon);
 
     private JMenuItem ffcItem = new JMenuItem(
-        Messages.getI18NString("ffcStatus").getText(),
+        GuiActivator.getResources().getI18NString("service.gui.FFC_STATUS"),
         ffcIcon);
 
     private JLabel titleLabel;
@@ -617,33 +616,36 @@ public class GlobalStatusSelectorBox
                     == OperationFailedException.GENERAL_ERROR)
                 {
                     String msgText =
-                        Messages.getI18NString("statusChangeGeneralError")
-                            .getText();
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.STATUS_CHANGE_GENERAL_ERROR");
 
-                    new ErrorDialog(null, Messages.getI18NString(
-                        "generalError").getText(), msgText, e1)
+                    new ErrorDialog(null,
+                        GuiActivator.getResources().getI18NString(
+                        "service.gui.GENERAL_ERROR"), msgText, e1)
                     .showDialog();
                 }
                 else if (e1.getErrorCode()
                     == OperationFailedException.NETWORK_FAILURE)
                 {
                     String msgText =
-                        Messages.getI18NString("statusChangeNetworkFailure")
-                            .getText();
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.STATUS_CHANGE_NETWORK_FAILURE");
 
                     new ErrorDialog(null, msgText,
-                        Messages.getI18NString("networkFailure").getText(), e1)
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.NETWORK_FAILURE"), e1)
                     .showDialog();
                 }
                 else if (e1.getErrorCode()
                         == OperationFailedException.PROVIDER_NOT_REGISTERED)
                 {
                     String msgText =
-                        Messages.getI18NString("statusChangeNetworkFailure")
-                            .getText();
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.STATUS_CHANGE_NETWORK_FAILURE");
 
-                    new ErrorDialog(null, Messages.getI18NString(
-                        "networkFailure").getText(), msgText, e1)
+                    new ErrorDialog(null,
+                        GuiActivator.getResources().getI18NString(
+                        "service.gui.NETWORK_FAILURE"), msgText, e1)
                     .showDialog();
                 }
                 logger.error("Error - changing status", e1);
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
index 19cb061..85d0231 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/PresenceStatusMenu.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.main.login.*;
 import net.java.sip.communicator.impl.gui.main.presence.message.*;
@@ -310,32 +309,36 @@ public class PresenceStatusMenu
                         == OperationFailedException.GENERAL_ERROR)
                 {
                     String msgText =
-                        Messages.getI18NString("statusChangeGeneralError")
-                            .getText();
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.STATUS_CHANGE_GENERAL_ERROR");
 
-                    new ErrorDialog(null, Messages
-                        .getI18NString("generalError").getText(), msgText, e1)
+                    new ErrorDialog(null,
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.GENERAL_ERROR"), msgText, e1)
                         .showDialog();
                 }
                 else if (e1.getErrorCode()
                         == OperationFailedException.NETWORK_FAILURE)
                 {
                     String msgText =
-                        Messages.getI18NString("statusChangeNetworkFailure")
-                            .getText();
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.STATUS_CHANGE_NETWORK_FAILURE");
 
-                    new ErrorDialog(null, Messages.getI18NString(
-                        "networkFailure").getText(), msgText, e1).showDialog();
+                    new ErrorDialog(null,
+                        GuiActivator.getResources().getI18NString(
+                        "service.gui.NETWORK_FAILURE"), msgText, e1)
+                        .showDialog();
                 }
                 else if (e1.getErrorCode()
                         == OperationFailedException.PROVIDER_NOT_REGISTERED)
                 {
                     String msgText =
-                        Messages.getI18NString("statusChangeNetworkFailure")
-                            .getText();
+                        GuiActivator.getResources().getI18NString(
+                            "service.gui.STATUS_CHANGE_NETWORK_FAILURE");
 
-                    new ErrorDialog(null, Messages.getI18NString(
-                        "networkFailure").getText(), msgText, e1).showDialog();
+                    new ErrorDialog(null,
+                        GuiActivator.getResources().getI18NString(
+                        "service.gui.NETWORK_FAILURE"), msgText, e1).showDialog();
                 }
                 logger.error("Error - changing status", e1);
             }
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
index 83f72aa..0555c4d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/SimpleStatusMenu.java
@@ -13,7 +13,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
-import net.java.sip.communicator.impl.gui.i18n.*;
 import net.java.sip.communicator.impl.gui.main.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
@@ -42,11 +41,11 @@ public class SimpleStatusMenu
     private ImageIcon offlineIcon;
 
     private JMenuItem onlineItem = new JMenuItem(
-            Messages.getI18NString("online").getText(),
+            GuiActivator.getResources().getI18NString("service.gui.ONLINE"),
             onlineIcon);
 
     private JMenuItem offlineItem = new JMenuItem(
-            Messages.getI18NString("offline").getText(),
+            GuiActivator.getResources().getI18NString("service.gui.OFFLINE"),
             offlineIcon);
 
     private JLabel titleLabel;
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
index ded60ea..277c1f9 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/NewStatusMessageDialog.java
@@ -11,7 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.utils.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
@@ -30,25 +30,28 @@ public class NewStatusMessageDialog
     private Logger logger = Logger.getLogger(NewStatusMessageDialog.class);
 
     private JLabel messageLabel = new JLabel(
-        Messages.getI18NString("newStatusMessage").getText());
+        GuiActivator.getResources().getI18NString(
+            "service.gui.NEW_STATUS_MESSAGE"));
 
     private JTextField messageTextField = new JTextField();
 
     private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5));
 
     private JTextArea infoArea = new JTextArea(
-        Messages.getI18NString("statusMessageInfo").getText());
+        GuiActivator.getResources().getI18NString(
+            "service.gui.STATUS_MESSAGE_INFO"));
 
     private JLabel infoTitleLabel = new JLabel(
-        Messages.getI18NString("newStatusMessage").getText());
+        GuiActivator.getResources().getI18NString(
+            "service.gui.NEW_STATUS_MESSAGE"));
 
     private JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1));
 
     private JButton okButton
-        = new JButton(Messages.getI18NString("ok").getText());
+        = new JButton(GuiActivator.getResources().getI18NString("service.gui.OK"));
 
-    private JButton cancelButton
-        = new JButton(Messages.getI18NString("cancel").getText());
+    private JButton cancelButton = new JButton(
+        GuiActivator.getResources().getI18NString("service.gui.CANCEL"));
 
     private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
@@ -73,7 +76,8 @@ public class NewStatusMessageDialog
      */
     private void init()
     {
-        this.setTitle(Messages.getI18NString("newStatusMessage").getText());
+        this.setTitle(GuiActivator.getResources()
+                .getI18NString("service.gui.NEW_STATUS_MESSAGE"));
 
         this.getRootPane().setDefaultButton(okButton);
 
@@ -119,9 +123,9 @@ public class NewStatusMessageDialog
         this.cancelButton.setName("cancel");
 
         this.okButton.setMnemonic(
-            Messages.getI18NString("ok").getMnemonic());
+            GuiActivator.getResources().getI18nMnemonic("service.gui.OK"));
         this.cancelButton.setMnemonic(
-            Messages.getI18NString("cancel").getMnemonic());
+            GuiActivator.getResources().getI18nMnemonic("service.gui.CANCEL"));
 
         this.okButton.addActionListener(this);
         this.cancelButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java b/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java
index 28eb9cc..76905c8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/presence/message/StatusMessageMenu.java
@@ -11,7 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.impl.gui.i18n.*;
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
@@ -27,17 +27,21 @@ public class StatusMessageMenu
 {
     private Logger logger = Logger.getLogger(StatusMessageMenu.class);
 
-    private JMenuItem noMessageItem
-        = new JMenuItem(Messages.getI18NString("noMessage").getText());
+    private static final String BRB_MESSAGE
+        = GuiActivator.getResources().getI18NString("service.gui.BRB_MESSAGE");
 
-    private JMenuItem newMessageItem
-        = new JMenuItem(Messages.getI18NString("newMessage").getText());
+    private static final String BUSY_MESSAGE
+        = GuiActivator.getResources().getI18NString("service.gui.BUSY_MESSAGE");
 
-    private JMenuItem busyMessageItem
-        =  new JMenuItem(Messages.getI18NString("busyMessage").getText());
+    private JMenuItem noMessageItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.NO_MESSAGE"));
 
-    private JMenuItem brbMessageItem
-        = new JMenuItem(Messages.getI18NString("brbMessage").getText());
+    private JMenuItem newMessageItem = new JMenuItem(
+        GuiActivator.getResources().getI18NString("service.gui.NEW_MESSAGE"));
+
+    private JMenuItem busyMessageItem =  new JMenuItem(BUSY_MESSAGE);
+
+    private JMenuItem brbMessageItem = new JMenuItem(BRB_MESSAGE);
 
     private ProtocolProviderService protocolProvider;
 
@@ -50,7 +54,8 @@ public class StatusMessageMenu
      */
     public StatusMessageMenu(ProtocolProviderService protocolProvider)
     {
-        super(Messages.getI18NString("setStatusMessage").getText());
+        super(GuiActivator.getResources()
+                .getI18NString("service.gui.SET_STATUS_MESSAGE"));
 
         this.protocolProvider = protocolProvider;
 
@@ -92,11 +97,11 @@ public class StatusMessageMenu
         }
         else if (menuItem.equals(busyMessageItem))
         {
-            statusMessage = Messages.getI18NString("busyMessage").getText();
+            statusMessage = BUSY_MESSAGE;
         }
         else if (menuItem.equals(brbMessageItem))
         {
-            statusMessage = Messages.getI18NString("brbMessage").getText();
+            statusMessage = BRB_MESSAGE;
         }
 
         new PublishStatusMessageThread(statusMessage).start();
diff --git a/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java b/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java
index 028fe6b..f7958a2 100644
--- a/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java
+++ b/src/net/java/sip/communicator/impl/media/DeviceConfigurationComboBoxModel.java
@@ -38,7 +38,7 @@ public class DeviceConfigurationComboBoxModel
         {

             if (info == null)

                 return MediaActivator.getResources().getI18NString(

-                    "DeviceConfigurationComboBoxModel_noDevice");

+                    "impl.media.configform.NO_DEVICE");

             return info.getName();

         }

     }

diff --git a/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java b/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java
index af13ce6..f0f7fd6 100644
--- a/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java
+++ b/src/net/java/sip/communicator/impl/media/MediaConfigurationForm.java
@@ -33,6 +33,6 @@ public class MediaConfigurationForm
     public String getTitle()

     {

         return MediaActivator.getResources().getI18NString(

-            "MediaConfigurationForm_title");

+            "impl.media.configform.TITLE");

     }

 }

diff --git a/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java b/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
index e6fbe0a..3022ee5 100644
--- a/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/media/MediaConfigurationPanel.java
@@ -123,16 +123,16 @@ public class MediaConfigurationPanel
         table.setShowGrid(false);

         table.setTableHeader(null);

 

-        key = "MediaConfigurationPanel_encodings";

+        key = "impl.media.configform.ENCODINGS";

         JLabel label = new JLabel(resources.getI18NString(key));

         label.setDisplayedMnemonic(resources.getI18nMnemonic(key));

         label.setLabelFor(table);

 

-        key = "MediaConfigurationPanel_up";

+        key = "impl.media.configform.UP";

         final JButton upButton = new JButton(resources.getI18NString(key));

         upButton.setMnemonic(resources.getI18nMnemonic(key));

 

-        key = "MediaConfigurationPanel_down";

+        key = "impl.media.configform.DOWN";

         final JButton downButton = new JButton(resources.getI18NString(key));

         downButton.setMnemonic(resources.getI18nMnemonic(key));

 

@@ -294,7 +294,7 @@ public class MediaConfigurationPanel
         {

             JLabel noPreview =

                 new JLabel(MediaActivator.getResources().getI18NString(

-                    "MediaConfigurationPanel_noPreview"));

+                    "impl.media.configform.NO_PREVIEW"));

             noPreview.setHorizontalAlignment(SwingConstants.CENTER);

             noPreview.setVerticalAlignment(SwingConstants.CENTER);

 

@@ -340,10 +340,10 @@ public class MediaConfigurationPanel
         {

         case DeviceConfigurationComboBoxModel.AUDIO:

             return MediaActivator.getResources().getI18nMnemonic(

-                "MediaConfigurationPanel_audio");

+                "impl.media.configform.AUDIO");

         case DeviceConfigurationComboBoxModel.VIDEO:

             return MediaActivator.getResources().getI18nMnemonic(

-                "MediaConfigurationPanel_video");

+                "impl.media.configform.VIDEO");

         default:

             throw new IllegalArgumentException("type");

         }

@@ -355,10 +355,10 @@ public class MediaConfigurationPanel
         {

         case DeviceConfigurationComboBoxModel.AUDIO:

             return MediaActivator.getResources().getI18NString(

-                "MediaConfigurationPanel_audio");

+                "impl.media.configform.AUDIO");

         case DeviceConfigurationComboBoxModel.VIDEO:

             return MediaActivator.getResources().getI18NString(

-                "MediaConfigurationPanel_video");

+                "impl.media.configform.VIDEO");

         default:

             throw new IllegalArgumentException("type");

         }

diff --git a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
index 4eb210f..d4ba69c 100644
--- a/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
+++ b/src/net/java/sip/communicator/impl/media/transform/zrtp/SCCallbackResources.java
@@ -26,80 +26,80 @@ import org.osgi.framework.*;
  */
 public class SCCallbackResources
 {
-	/**
-	 * Contains the secure button icons
-	 */
-	private static Hashtable loadedImages = new Hashtable();
-	
+    /**
+     * Contains the secure button icons
+     */
+    private static Hashtable loadedImages = new Hashtable();
+    
     public static String TOGGLE_OFF_SECURITY
-		= getString("toggleOffSecurity");
+        = getString("impl.media.security.TOGGLE_OFF_SECURITY");
     
     public static String TOGGLE_ON_SECURITY
-		= getString("toggleOnSecurity");
+        = getString("impl.media.security.TOGGLE_ON_SECURITY");
     
     public static String SAS_SECURED_MESSAGE
-    	= getString("sasSecuredMessage");
+        = getString("impl.media.security.SECURED_MESSAGE");
     
     public static String SAS_SECURED_TOOLTIP
-    	= getString("sasSecuredTooltip");
+        = getString("impl.media.security.SECURED_TOOLTIP");
     
     public static String SAS_NOT_SECURED_MESSAGE
-    	= getString("sasNotSecuredMessage");
+        = getString("impl.media.security.NOT_SECURED_MESSAGE");
     
     public static String SAS_NOT_SECURED_TOOLTIP
-    	= getString("sasNotSecuredTooltip");
+        = getString("impl.media.security.NOT_SECURED_TOOLTIP");
     
     public static String DEFAULT_SAS_TOOLTIP
-		= getString("defaultSASTooltip");
-
+        = getString("impl.media.security.DEFAULT_TOOLTIP");
+    
     public static String DEFAULT_SAS_MESSAGE
-		= getString("defaultSASMessage");
+        = getString("impl.media.security.DEFAULT_MESSAGE");
     
     public static String ENGINE_FAIL_SAS_TOOLTIP
-		= getString("sasEngineFailTooltip");
+        = getString("impl.media.security.ENGINE_FAIL_TOOLTIP");
     
     public static String ENGINE_FAIL_SAS_MESSAGE
-		= getString("sasEngineFailMessage");
+        = getString("impl.media.security.ENGINE_FAIL_MESSAGE");
     
     public static String SAS_SECURING_FAIL_TOOLTIP
-    	= getString("sasSecuringFailTooltip");
+        = getString("impl.media.security.SECURING_FAIL_TOOLTIP");
     
     public static String SAS_UNSECURED_AT_REQUEST_TOOLTIP
-    	= getString("sasUnsecuredAtRequestTooltip");
+        = getString("impl.media.security.UNSECURED_AT_REQUEST");
     
     public static String PEER_UNSUPORTED_SECURITY
-    	= getString("peerUnsuportedSecurity");
+        = getString("impl.media.security.PEER_UNSUPPORTED_SECURITY");
     
     public static String SAS_PEER_UNSUPORTED_TOOLTIP
-    	= getString("sasPeerUnsuportedTooltip");
+        = getString("impl.media.security.PEER_UNSUPPORTED_TOOLTIP");
     
     public static String PEER_TOGGLED_SECURITY_OFF_MESSAGE
-    	= getString("peerToggledOffSecurityMessage");
+        = getString("impl.media.security.PEER_TOGGLED_OFF_SECURITY_MESSAGE");
     
     public static String PEER_TOGGLED_SECURITY_OFF_CAPTION
-    	= getString("peerToggledOffSecurityCaption");
+        = getString("impl.media.security.PEER_TOGGLED_OFF_SECURITY_SECTION");
     
     public static String SAS_UNSECURED_AT_PEER_REQUEST_TOOLTIP
-    	= getString("sasUnsecuredAtPeerRequestTooltip");
+        = getString("impl.media.security.UNSECURED_AT_PEER_REQUEST_TOOLTIP");
     
     public static String ZRTP_ENGINE_INIT_FAILURE
-		= getString("engineInitFailure");
-
+        = getString("impl.media.security.ENGINE_INIT_FAILURE");
+    
     public static String GOCLEAR_REQUEST_AC_FLAG_FAILURE
-		= getString("allowClearRequestFailure");
+        = getString("impl.media.security.ALLOW_CLEAR_REQUEST_FAILURE");
     
     /**
      * The icon on the "Secure" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID SECURE_ON_ICON
-    = new ImageID("SECURE_BUTTON_ON");
+        = new ImageID("SECURE_BUTTON_ON");
 
     /**
      * The icon on the "Secure" button in the <tt>QuickMenu</tt>.
      */
     public static final ImageID SECURE_OFF_ICON
-    = new ImageID("SECURE_BUTTON_OFF");
-      
+        = new ImageID("SECURE_BUTTON_OFF");
+
     /**
      * The resource management service used to get the needed
      * resources: button images, text predefined messages, etc
@@ -116,7 +116,7 @@ public class SCCallbackResources
     {
         return getResources().getI18NString(key);
     }
-   
+    
     /**
      * Provides the resource management service
      * 
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java
index aceb18c..33748c0 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/ContactDictImpl.java
@@ -127,12 +127,12 @@ public class ContactDictImpl
             if (this.contactID.equals("*"))
             {
                 this.dictName =  DictActivator.getResources()
-                            .getI18NString("dict.anyDictionary");
+                            .getI18NString("plugin.dictaccregwizz.ANY_DICTIONARY");
             }
             else if (this.contactID.equals("!"))
             {
                 this.dictName = DictActivator.getResources()
-                            .getI18NString("dict.firstMatch");
+                            .getI18NString("plugin.dictaccregwizz.FIRST_MATCH");
             }
             else
             {
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java
index 32a0920..31ee6fc 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/OperationSetBasicInstantMessagingDictImpl.java
@@ -324,7 +324,7 @@ public class OperationSetBasicInstantMessagingDictImpl
         boolean isStart = true;
         
         result.append(DictActivator.getResources()
-            .getI18NString("dict.matchResult", new String[] {word}));
+            .getI18NString("plugin.dictaccregwizz.MATCH_RESULT", new String[] {word}));
         
         for (int i=0; i<data.size(); i++)
         {
@@ -354,17 +354,17 @@ public class OperationSetBasicInstantMessagingDictImpl
         if (errorCode == DictReturnCode.INVALID_DATABASE)
         {
             return DictActivator.getResources()
-                .getI18NString("dict.invalidDatabase", new String[] {database});
+                .getI18NString("plugin.dictaccregwizz.INVALID_DATABASE", new String[] {database});
         }
         else if (errorCode == DictReturnCode.INVALID_STRATEGY)
         {
             return DictActivator.getResources()
-                .getI18NString("dict.invalidStrategy");
+                .getI18NString("plugin.dictaccregwizz.INVALID_STRATEGY");
         }
         else if (errorCode == DictReturnCode.NO_MATCH)
         {
             return DictActivator.getResources()
-                .getI18NString("dict.noMatch");
+                .getI18NString("plugin.dictaccregwizz.NO_MATCH");
         }
 
         return dix.getMessage();
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java b/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java
index 59df916..417ab0f 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/dict/ProtocolProviderFactoryDictImpl.java
@@ -120,7 +120,7 @@ public class ProtocolProviderFactoryDictImpl
         try
         {
             String groupName = DictActivator.getResources()
-                .getI18NString("dict.dictionaries");
+                .getI18NString("service.protocol.DICTIONARIES");
             
             mcl.createMetaContactGroup(mcl.getRoot(), groupName);
         }
@@ -156,11 +156,12 @@ public class ProtocolProviderFactoryDictImpl
         
         // Gets group name
         String groupName = DictActivator.getResources()
-            .getI18NString("dict.dictionaries");
+            .getI18NString("service.protocol.DICTIONARIES");
         
         // Gets contact name
         String contactName = DictActivator.getResources()
-            .getI18NString("dict.anyDictionaryFrom", new String[] {accountID.getUserID()});
+            .getI18NString("dict.plugin.dictaccregwizz.ANY_DICTIONARY_FORM",
+                new String[] {accountID.getUserID()});
         
         // Gets the MetaContactGroup for the "dictionaries" group.
         MetaContactGroup group = mcl.getRoot().getMetaContactSubgroup(groupName);
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
index 87d0942..c5f58c8 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/icq/OperationSetPersistentPresenceIcqImpl.java
@@ -1405,7 +1405,8 @@ public class OperationSetPersistentPresenceIcqImpl
             }
             else
             {
-                if(userInfo.getAwayStatus() != null && userInfo.getAwayStatus().equals(Boolean.TRUE))
+                if(userInfo.getAwayStatus() != null
+                    && userInfo.getAwayStatus().equals(Boolean.TRUE))
                 {
                     currentIcqStatus = presenceStatusToStatusLong(AimStatusEnum.AWAY);
                 }
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
index 49b0e6f..a0b774e 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/msn/OperationSetBasicInstantMessagingMsnImpl.java
@@ -284,7 +284,8 @@ public class OperationSetBasicInstantMessagingMsnImpl
 
             Message newMailMessage = new MessageMsnImpl(
                     MessageFormat.format(
-                        MsnActivator.getResources().getI18NString("newMail"), 
+                        MsnActivator.getResources()
+                            .getI18NString("service.gui.NEW_MAIL"), 
                         new Object[]{message.getFrom(), 
                                      message.getFromAddr(), 
                                      subject}),
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
index 27cc5ad..01fdb1d 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/rss/OperationSetBasicInstantMessagingRssImpl.java
@@ -61,14 +61,14 @@ public class OperationSetBasicInstantMessagingRssImpl
      * a dead RSS contact
      */
     private static final String MSG_CONFIRM_REMOVE_MISSING_CONTACT
-        = "confirmRemoveMissingContactMessage";
+        = "plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL";
 
     /**
      * The title of the confirmation dialog that we show to the user before we
      * remove a dead contact
      */
     private static final String TITLE_CONFIRM_REMOVE_MISSING_CONTACT
-        = "confirmRemoveMissingContactTitle";
+        = "plugin.rssaccregwizz.CONFIRM_ACCOUNT_REMOVAL_TITLE";
 
     /**
      * Creates an instance of this operation set keeping a reference to the
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
index 654201c..c06055c 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ContactSSHImpl.java
@@ -11,7 +11,6 @@
 
 package net.java.sip.communicator.impl.protocol.ssh;
 
-import com.jcraft.jsch.*;
 
 import java.io.*;
 import java.util.*;
@@ -20,6 +19,8 @@ import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.Logger;
 
+import com.jcraft.jsch.*;
+
 /**
  * A Contact of SSH Type
  *
@@ -34,8 +35,8 @@ public class ContactSSHImpl
     /**
      * This acts as a seperator between details stored in persistent data
      */
-    private final String detailsSeperator = 
-        Resources.getString("detailsSeperator");
+    private final String separator = 
+        Resources.getString("impl.protocol.ssh.DETAILS_SEPARATOR");
     
     /**
      * The identifier for SSH Stack
@@ -314,42 +315,42 @@ public class ContactSSHImpl
     
     /**
      * Saves the details of contact in persistentData seperated by
-     * detailsSeperator
+     * "service.gui.JANUARY"
      * Passowrd is saved unsecurely using Base64 encoding
      */
     public void savePersistentDetails()
     {
         persistentData =
                 this.sshConfigurationForm.getHostName() +
-                detailsSeperator +
+                "service.gui.JANUARY" +
                 this.sshConfigurationForm.getUserName() +
-                detailsSeperator +
+                "service.gui.JANUARY" +
                 new String(Base64.encode(this.sshConfigurationForm.getPassword()
                         .getBytes())) +
-                detailsSeperator + sshConfigurationForm.getPort() +
-                detailsSeperator +
+                "service.gui.JANUARY" + sshConfigurationForm.getPort() +
+                "service.gui.JANUARY" +
                 sshConfigurationForm.getTerminalType() +
-                detailsSeperator +
+                "service.gui.JANUARY" +
                 sshConfigurationForm.getUpdateInterval();
     }
     
     /**
      * Stores persistent data in fields of the contact seperated by
-     * detailsSeperator.
+     * "service.gui.JANUARY".
      *
      * @param persistentData of the contact
      */
     public void setPersistentData(String persistentData)
     {
         this.persistentData = persistentData;
-        int firstCommaIndex = this.persistentData.indexOf(detailsSeperator);
-        int secondCommaIndex = this.persistentData.indexOf(detailsSeperator,
+        int firstCommaIndex = this.persistentData.indexOf("service.gui.JANUARY");
+        int secondCommaIndex = this.persistentData.indexOf("service.gui.JANUARY",
                 firstCommaIndex +1);
-        int thirdCommaIndex = this.persistentData.indexOf(detailsSeperator,
+        int thirdCommaIndex = this.persistentData.indexOf("service.gui.JANUARY",
                 secondCommaIndex +1);
-        int fourthCommaIndex = this.persistentData.indexOf(detailsSeperator,
+        int fourthCommaIndex = this.persistentData.indexOf("service.gui.JANUARY",
                 thirdCommaIndex +1);
-        int fifthCommaIndex = this.persistentData.indexOf(detailsSeperator,
+        int fifthCommaIndex = this.persistentData.indexOf("service.gui.JANUARY",
                 fourthCommaIndex +1);
         
         logger.debug("Commas: " + firstCommaIndex + " " + secondCommaIndex + " "
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
index ca145cc..1e9d529 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/OperationSetBasicInstantMessagingYahooImpl.java
@@ -344,11 +344,9 @@ public class OperationSetBasicInstantMessagingYahooImpl
              yahooMailLogon = "&nbsp;&nbsp;&nbsp;&nbsp;<a href=\""
                      + yahooMailLogon + "\">"
                      + yahooMailLogon + "</a>";
-             
-             
 
              String newMail = YahooActivator.getResources().getI18NString(
-                 "newMail",
+                 "service.gui.NEW_MAIL",
                  new String[]{ev.getFrom(), 
                               "&lt;" + ev.getEmailAddress() + "&gt", 
                               ev.getSubject(),
diff --git a/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java b/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java
index bc0ca71..59fda05 100644
--- a/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java
+++ b/src/net/java/sip/communicator/impl/systray/NewStatusMessageDialog.java
@@ -30,17 +30,17 @@ public class NewStatusMessageDialog
     private JPanel messagePanel = new TransparentPanel(new BorderLayout());
 
     private JLabel messageLabel = new JLabel(
-        Resources.getString("newStatusMessage"));
+        Resources.getString("service.gui.NEW_STATUS_MESSAGE"));
 
     private JTextField messageTextField = new JTextField();
 
     private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5));
 
     private JTextArea infoLabel = new JTextArea(
-        Resources.getString("statusMessageInfo"));
+        Resources.getString("service.gui.STATUS_MESSAGE_INFO"));
 
     private JLabel infoTitleLabel = new JLabel(
-        Resources.getString("newStatusMessage"));
+        Resources.getString("service.gui.NEW_STATUS_MESSAGE"));
 
     private JLabel iconLabel = new JLabel(
             Resources.getImage("newStatusMessageIcon"));
@@ -49,9 +49,10 @@ public class NewStatusMessageDialog
 
     private JPanel rightPanel = new TransparentPanel(new BorderLayout());
 
-    private JButton okButton = new JButton(Resources.getString("ok"));
+    private JButton okButton = new JButton(Resources.getString("service.gui.OK"));
 
-    private JButton cancelButton = new JButton(Resources.getString("cancel"));
+    private JButton cancelButton = new JButton(
+        Resources.getString("service.gui.CANCEL"));
 
     private JPanel buttonsPanel =
         new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
@@ -80,7 +81,7 @@ public class NewStatusMessageDialog
      */
     private void init()
     {
-        this.setTitle(Resources.getString("newStatusMessage"));
+        this.setTitle(Resources.getString("service.gui.NEW_STATUS_MESSAGE"));
 
         this.getRootPane().setDefaultButton(okButton);
 
@@ -110,7 +111,7 @@ public class NewStatusMessageDialog
         this.okButton.setName("ok");
         this.cancelButton.setName("cancel");
 
-        this.okButton.setMnemonic(Resources.getMnemonic("ok"));
+        this.okButton.setMnemonic(Resources.getMnemonic("service.gui.OK"));
         this.cancelButton.setMnemonic(Resources.getMnemonic("cancel"));
 
         this.okButton.addActionListener(this);
diff --git a/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java b/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java
index b1745ce..cfa9531 100644
--- a/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java
+++ b/src/net/java/sip/communicator/impl/systray/StatusMessageMenu.java
@@ -11,6 +11,7 @@ import java.awt.event.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 
@@ -20,23 +21,27 @@ public class StatusMessageMenu
 {
     private Logger logger = Logger.getLogger(StatusMessageMenu.class);
 
+    private static final String BRB_MESSAGE
+        = Resources.getString("service.gui.BRB_MESSAGE");
+
+    private static final String BUSY_MESSAGE
+        = Resources.getString("service.gui.BUSY_MESSAGE");
+
     private JMenuItem noMessageItem
-        = new JMenuItem(Resources.getString("noMessage"));
+        = new JMenuItem(Resources.getString("service.gui.NO_MESSAGE"));
 
     private JMenuItem newMessageItem
-        = new JMenuItem(Resources.getString("newMessage"));
+        = new JMenuItem(Resources.getString("service.gui.NEW_MESSAGE"));
 
-    private JMenuItem busyMessageItem
-        =  new JMenuItem(Resources.getString("busyMessage"));
+    private JMenuItem busyMessageItem =  new JMenuItem(BUSY_MESSAGE);
 
-    private JMenuItem brbMessageItem
-        = new JMenuItem(Resources.getString("brbMessage"));
+    private JMenuItem brbMessageItem = new JMenuItem(BRB_MESSAGE);
 
     private ProtocolProviderService protocolProvider;
 
     public StatusMessageMenu(  ProtocolProviderService protocolProvider)
     {
-        super(Resources.getString("setStatusMessage"));
+        super(Resources.getString("service.gui.SET_STATUS_MESSAGE"));
 
         this.protocolProvider = protocolProvider;
 
@@ -78,11 +83,11 @@ public class StatusMessageMenu
         }
         else if (menuItem.equals(busyMessageItem))
         {
-            statusMessage = Resources.getString("busyMessage");
+            statusMessage = BUSY_MESSAGE;
         }
         else if (menuItem.equals(brbMessageItem))
         {
-            statusMessage = Resources.getString("brbMessage");
+            statusMessage = BRB_MESSAGE;
         }
 
         new PublishStatusMessageThread(statusMessage).start();
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java
index b9e3f39..0ad5226 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSimpleSelector.java
@@ -48,12 +48,12 @@ public class StatusSimpleSelector
      * The menu item for the online status
      */
     private JMenuItem onlineItem = new JMenuItem(
-            Resources.getString("onlineStatus"));
+            Resources.getString("impl.systray.ONLINE_STATUS"));
     /**
      * The menu item for the offline status
      */
     private JMenuItem offlineItem = new JMenuItem(
-            Resources.getString("offlineStatus"));
+            Resources.getString("impl.systray.OFFLINE_STATUS"));
     
     /**
      * Creates an instance of <tt>StatusSimpleSelector</tt>
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
index 1c0ffed..ac5ae5b 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/StatusSubMenu.java
@@ -52,7 +52,7 @@ public class StatusSubMenu
         
         parentSystray = tray;
 
-        this.setText(Resources.getString("setStatus"));
+        this.setText(Resources.getString("impl.systray.SET_STATUS"));
         this.setIcon(Resources.getImage("service.systray.STATUS_MENU_ICON"));
 
         /* makes the menu look better */
diff --git a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java
index 22746e9..5bc48b2 100644
--- a/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java
+++ b/src/net/java/sip/communicator/impl/systray/jdic/TrayMenu.java
@@ -38,15 +38,15 @@ public class TrayMenu
     private SystrayServiceJdicImpl parentSystray;
         
     private JMenuItem settingsItem = new JMenuItem(
-            Resources.getString("settings"),
+            Resources.getString("service.gui.SETTINGS"),
             Resources.getImage("service.gui.icons.QUICK_MENU_CONFIGURE_ICON"));
     
     private JMenuItem closeItem = new JMenuItem(
-            Resources.getString("close"),
+            Resources.getString("service.gui.CLOSE"),
             Resources.getImage("service.systray.CLOSE_MENU_ICON"));
     
     private JMenuItem addContactMenuItem = new JMenuItem(
-            Resources.getString("addContact"),
+            Resources.getString("service.gui.ADD_CONTACT"),
             Resources.getImage("service.gui.icons.ADD_CONTACT_16x16_ICON"));
     
     private StatusSubMenu statusMenu;
@@ -69,7 +69,7 @@ public class TrayMenu
         this.add(closeItem);
 
         this.settingsItem.setName("settings");
-        this.closeItem.setName("close");
+        this.closeItem.setName("service.gui.CLOSE");
         this.addContactMenuItem.setName("addContact");
 
         this.settingsItem.addActionListener(this);
@@ -95,7 +95,7 @@ public class TrayMenu
             
             configWindow.setVisible(true);
         }
-        else if(itemName.equals("close"))
+        else if(itemName.equals("service.gui.CLOSE"))
         {   
             try
             {
@@ -117,8 +117,8 @@ public class TrayMenu
                 dialog.setVisible(true);
             else
                 SystrayActivator.getUIService().getPopupDialog()
-                    .showMessagePopupDialog(
-                        Resources.getString("failedToLoadAddContactDialog"));
+                    .showMessagePopupDialog(Resources.getString(
+                        "impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG"));
         }
     }
 }
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/impl/version/VersionImpl.java b/src/net/java/sip/communicator/impl/version/VersionImpl.java
index cb0d19c..6a87dfc 100644
--- a/src/net/java/sip/communicator/impl/version/VersionImpl.java
+++ b/src/net/java/sip/communicator/impl/version/VersionImpl.java
@@ -313,9 +313,10 @@ public class VersionImpl
                 }
                     
                 applicationName = 
-                    resourcesService.getSettingsString("applicationName");
-                
-            } catch (Exception e) 
+                    resourcesService.getSettingsString(
+                        "service.gui.APPLICATION_NAME");
+            }
+            catch (Exception e) 
             {
                 // if resource bundle is not found or the key is missing
                 // return the defautl name
diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
index 21e2bf4..8d50a16 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountDetailsPanel.java
@@ -61,7 +61,8 @@ public class AccountDetailsPanel
 

     private JLabel avatarLabel = new JLabel();

 

-    private JButton applyButton = new JButton(Resources.getString("apply"));

+    private JButton applyButton

+        = new JButton(Resources.getString("service.gui.APPLY"));

 

     private JPanel buttonPanel =

         new TransparentPanel(new FlowLayout(FlowLayout.CENTER));

@@ -139,7 +140,7 @@ public class AccountDetailsPanel
         // Create the avatar panel.

         JPanel leftPanel = new TransparentPanel(new BorderLayout());

         JPanel avatarPanel = new TransparentPanel(new BorderLayout());

-        JButton changeAvatarButton = new JButton(Resources.getString("change"));

+        JButton changeAvatarButton = new JButton(Resources.getString("plugin.accountinfo.CHANGE"));

         JPanel changeButtonPanel

             = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));

 

@@ -165,14 +166,21 @@ public class AccountDetailsPanel
         // Labels panel.

         JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 5, 5));

 

-        labelsPanel.add(new JLabel(Resources.getString("firstNameNS")));

-//        labelsPanel.add(new JLabel(Resources.getString("middleNameNS")));

-        labelsPanel.add(new JLabel(Resources.getString("lastNameNS")));

-        labelsPanel.add(new JLabel(Resources.getString("genderNS")));

-        labelsPanel.add(new JLabel(Resources.getString("ageNS")));

-        labelsPanel.add(new JLabel(Resources.getString("bdayNS")));

-        labelsPanel.add(new JLabel(Resources.getString("emailNS")));

-        labelsPanel.add(new JLabel(Resources.getString("phoneNS")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.FIRST_NAME")));

+//        labelsPanel.add(new JLabel(Resources.getString("plugin.accountinfo.MIDDLE_NAME")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.LAST_NAME")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.GENDER")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.AGE")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.BDAY")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.EMAIL")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.PHONE")));

 

         detailsPanel.add(labelsPanel, BorderLayout.WEST);

 

@@ -221,7 +229,7 @@ public class AccountDetailsPanel
     private void initUnsupportedPanel()

     {

         JTextArea unsupportedTextArea =

-            new JTextArea(Resources.getString("notSupported"));

+            new JTextArea(Resources.getString("plugin.accountinfo.NOT_SUPPORTED"));

 

         unsupportedTextArea.setEditable(false);

         unsupportedTextArea.setLineWrap(true);

@@ -402,7 +410,7 @@ public class AccountDetailsPanel
         // the bottom so we don't disrupt the standard look of the other details

         imagePanel.setLayout(new BoxLayout(imagePanel, BoxLayout.LINE_AXIS));

         imagePanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory

-            .createTitledBorder(Resources.getString("userPictures")),

+            .createTitledBorder(Resources.getString("plugin.accountinfo.USER_PICTURES")),

             BorderFactory.createEmptyBorder(0, 5, 5, 5)));

 

         // Obtain all the details for a contact.

@@ -741,7 +749,7 @@ public class AccountDetailsPanel
          */

         public String getDescription()

         {

-            return Resources.getString("onlyMessages");

+            return Resources.getString("plugin.accountinfo.ONLY_MESSAGE");

         }

     }

 

diff --git a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
index a0e5241..3ef44b4 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
+++ b/src/net/java/sip/communicator/plugin/accountinfo/AccountInfoForm.java
@@ -105,7 +105,7 @@ public class AccountInfoForm
      */

     public String getTitle()

     {

-        return Resources.getString("title");

+        return Resources.getString("plugin.accountinfo.TITLE");

     }

 

     /**

diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
index b14d7ca..d37b95e 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/AimAccountRegistrationWizard.java
@@ -42,7 +42,7 @@ public class AimAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -71,7 +71,7 @@ public class AimAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameAim");
+        return Resources.getString("plugin.aimaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -81,7 +81,7 @@ public class AimAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionAim");
+        return Resources.getString("plugin.aimaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -104,28 +104,28 @@ public class AimAccountRegistrationWizard
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put(Resources.getString("id"), registration.getUin());
-        summaryTable.put(Resources.getString("rememberPassword"),
+        summaryTable.put(Resources.getString("plugin.aimaccregwizz.USERNAME"), registration.getUin());
+        summaryTable.put(Resources.getString("service.gui.REMEMBER_PASSWORD"),
                 new Boolean(registration.isRememberPassword()));
 
         if (registration.getProxy() != null)
-            summaryTable.put(Resources.getString("proxy"),
+            summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY"),
                 registration.getProxy());
 
         if (registration.getProxyPort() != null)
-            summaryTable.put(Resources.getString("proxyPort"),
+            summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY"),
                 registration.getProxyPort());
 
         if (registration.getProxyType() != null)
-            summaryTable.put(Resources.getString("proxyType"),
+            summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY_TYPE"),
                 registration.getProxyType());
 
         if (registration.getProxyPort() != null)
-            summaryTable.put(Resources.getString("proxyUsername"),
+            summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY_USERNAME"),
                 registration.getProxyPort());
 
         if (registration.getProxyType() != null)
-            summaryTable.put(Resources.getString("proxyPassword"),
+            summaryTable.put(Resources.getString("plugin.aimaccregwizz.PROXY_PASSWORD"),
                 registration.getProxyType());
 
         return summaryTable.entrySet().iterator();
@@ -145,7 +145,7 @@ public class AimAccountRegistrationWizard
 
     /**
      * Defines the operations that will be executed when the user clicks on
-     * the wizard "Signin" button.
+     * the wizard "service.gui.SIGN_IN" button.
      * 
      * @param userName the user name to sign in with
      * @param password the password to sign in with
@@ -227,14 +227,14 @@ public class AimAccountRegistrationWizard
         {
             AimAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException e)
         {
             AimAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
index bb56dfb..8df2f43 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/FirstWizardPage.java
@@ -49,25 +49,29 @@ public class FirstWizardPage
         new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
     private JCheckBox enableAdvOpButton =
-        new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false);
+        new SIPCommCheckBox(Resources.getString(
+            "plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"), false);
 
-    private JLabel uinLabel = new JLabel(Resources.getString("id"));
+    private JLabel uinLabel = new JLabel(
+        Resources.getString("plugin.aimaccregwizz.USERNAME"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
     private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE);
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel = new JLabel(
+        Resources.getString("service.gui.PASSWORD"));
 
     private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("existingAccount"));
+        new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JTextField uinField = new JTextField();
 
     private JPasswordField passField = new JPasswordField();
 
     private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+        new SIPCommCheckBox(Resources.getString(
+            "service.gui.REMEMBER_PASSWORD"));
 
     private JPanel registerPanel = new TransparentPanel(new GridLayout(0, 1));
 
@@ -75,24 +79,24 @@ public class FirstWizardPage
         new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
 
     private JTextArea registerArea =
-        new JTextArea(Resources.getString("aimRegisterNewAccountText"));
+        new JTextArea(Resources.getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT"));
 
     private JButton registerButton =
-        new JButton(Resources.getString("registerNewAccount"));
+        new JButton(Resources.getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT"));
 
-    private JLabel proxyLabel = new JLabel(Resources.getString("proxy"));
+    private JLabel proxyLabel = new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY"));
 
     private JLabel proxyPortLabel =
-        new JLabel(Resources.getString("proxyPort"));
+        new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY"));
 
     private JLabel proxyUsernameLabel =
-        new JLabel(Resources.getString("proxyUsername"));
+        new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY_USERNAME"));
 
     private JLabel proxyPasswordLabel =
-        new JLabel(Resources.getString("proxyPassword"));
+        new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY_PASSWORD"));
 
     private JLabel proxyTypeLabel =
-        new JLabel(Resources.getString("proxyType"));
+        new JLabel(Resources.getString("plugin.aimaccregwizz.PROXY_TYPE"));
 
     private JTextField proxyField = new JTextField();
 
@@ -176,7 +180,7 @@ public class FirstWizardPage
         uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
 
         uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("aimUinAndPassword")));
+            .getString("plugin.aimaccregwizz.USERNAME_AND_PASSWORD")));
 
         mainPanel.add(uinPassPanel);
 
@@ -216,7 +220,7 @@ public class FirstWizardPage
         advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
 
         advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("advancedOptions")));
+            .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS")));
 
         mainPanel.add(advancedOpPanel);
 
@@ -230,7 +234,7 @@ public class FirstWizardPage
         this.registerPanel.add(buttonPanel);
 
         this.registerPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("registerNewAccount")));
+            .getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT")));
 
         mainPanel.add(registerPanel);
 
diff --git a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
index 43eddd8..ff0ce14 100644
--- a/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/autoaway/AutoAwayConfigForm.java
@@ -53,7 +53,7 @@ public class AutoAwayConfigForm
         // Title : automatic status
         JLabel autoStatusLabel 
             = new JLabel(AutoAwayActivator.getResources()
-                    .getI18NString("automaticStatus"));
+                    .getI18NString("plugin.autoaway.AUTO_STATUS"));
 
 
         Font bold = autoStatusLabel.getFont().deriveFont(Font.BOLD);
@@ -62,9 +62,9 @@ public class AutoAwayConfigForm
         JPanel fieldsPanel = new TransparentPanel(new BorderLayout(5, 5));
         fieldsPanel.setBorder(BorderFactory.createEmptyBorder(10, 30, 0, 0));
 
-        enable =
-            new SIPCommCheckBox(AutoAwayActivator.getResources().getI18NString(
-                "enableChangeStatus"));
+        enable = new SIPCommCheckBox(AutoAwayActivator.getResources()
+                .getI18NString("plugin.autoaway.ENABLE_CHANGE_STATUS"));
+
         fieldsPanel.add(enable, BorderLayout.NORTH);
         enable.addActionListener(new ActionListener()
         {
@@ -81,7 +81,8 @@ public class AutoAwayConfigForm
             new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
         // Texte
         timerPanel.add(new JLabel(
-                AutoAwayActivator.getResources().getI18NString("awayMinutes")));
+                AutoAwayActivator.getResources()
+                    .getI18NString("plugin.autoaway.AWAY_MINUTES")));
         // Spinner
         timer = new JSpinner(new SpinnerNumberModel(15, 1, 180, 1));
         timerPanel.add(timer);
@@ -189,7 +190,7 @@ public class AutoAwayConfigForm
     public String getTitle()
     {
         return AutoAwayActivator.getResources()
-            .getI18NString("automaticStatus");
+            .getI18NString("plugin.autoaway.AUTO_STATUS");
     }
 
 }
diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
index 83485be..74ae4d1 100644
--- a/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
+++ b/src/net/java/sip/communicator/plugin/branding/AboutWindow.java
@@ -2,9 +2,9 @@ package net.java.sip.communicator.plugin.branding;
 

 import java.awt.*;

 import java.awt.event.*;

-import java.io.IOException;

+import java.io.*;

 

-import javax.imageio.ImageIO;

+import javax.imageio.*;

 import javax.swing.*;

 import javax.swing.event.*;

 

@@ -13,7 +13,7 @@ import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.resources.*;

 import net.java.sip.communicator.util.*;

 

-import org.osgi.framework.ServiceReference;

+import org.osgi.framework.*;

 

 public class AboutWindow extends JDialog implements HyperlinkListener,

         ActionListener, ExportedWindow

@@ -32,7 +32,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
             = resources.getSettingsString("service.gui.APPLICATION_NAME");

 

         this.setTitle(

-            resources.getI18NString("aboutWindowTitle",

+            resources.getI18NString("plugin.branding.ABOUT_WINDOW_TITLE",

                 new String[]{applicationName}));

 

         setModal(false);

@@ -63,7 +63,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
             = resources.getSettingsInt("plugin.branding.ABOUT_LOGO_FONT_SIZE");

 

         JTextArea logoArea =

-            new JTextArea(resources.getI18NString("logoMessage"));

+            new JTextArea(resources.getI18NString("plugin.branding.LOGO_MESSAGE"));

         logoArea.setFont(

             logoArea.getFont().deriveFont(Font.BOLD, logoAreaFontSize));

         logoArea.setForeground(Constants.TITLE_COLOR);

@@ -79,7 +79,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
         StyledHTMLEditorPane rightsArea = new StyledHTMLEditorPane();

         rightsArea.setContentType("text/html");

 

-        rightsArea.appendToEnd(resources.getI18NString("copyright",

+        rightsArea.appendToEnd(resources.getI18NString("plugin.branding.COPYRIGHT",

             new String[]

             { Constants.TEXT_COLOR }));

 

@@ -95,7 +95,7 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
         StyledHTMLEditorPane licenseArea = new StyledHTMLEditorPane();

         licenseArea.setContentType("text/html");

         licenseArea.appendToEnd(resources.

-            getI18NString("license",

+            getI18NString("plugin.branding.LICENSE",

             new String[]{Constants.TEXT_COLOR}));

 

         licenseArea.setPreferredSize(new Dimension(50, 20));

@@ -115,11 +115,11 @@ public class AboutWindow extends JDialog implements HyperlinkListener,
         textPanel.add(rightsArea);

         textPanel.add(licenseArea);

 

-        JButton okButton = new JButton(resources.getI18NString("ok"));

+        JButton okButton = new JButton(resources.getI18NString("service.gui.OK"));

 

         this.getRootPane().setDefaultButton(okButton);

 

-        okButton.setMnemonic(resources.getI18nMnemonic("ok"));

+        okButton.setMnemonic(resources.getI18nMnemonic("service.gui.OK"));

         okButton.addActionListener(this);

 

         JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));

diff --git a/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java b/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java
index 366e360..ee71feb 100644
--- a/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java
+++ b/src/net/java/sip/communicator/plugin/branding/AboutWindowPluginComponent.java
@@ -23,7 +23,7 @@ public class AboutWindowPluginComponent
 
     private final JMenuItem aboutMenuItem
         = new JMenuItem(BrandingActivator.getResources().
-            getI18NString("aboutMenuEntry"));
+            getI18NString("plugin.branding.ABOUT_MENU_ENTRY"));
 
     private final Container container;
 
@@ -57,7 +57,7 @@ public class AboutWindowPluginComponent
 
     public String getName()
     {
-        return BrandingActivator.getResources().getI18NString("aboutMenuEntry");
+        return BrandingActivator.getResources().getI18NString("plugin.branding.ABOUT_MENU_ENTRY");
     }
 
     public void setCurrentContact(MetaContact metaContact)
diff --git a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
index 5524859..93e9d8d 100644
--- a/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
+++ b/src/net/java/sip/communicator/plugin/branding/WelcomeWindow.java
@@ -32,7 +32,7 @@ public class WelcomeWindow extends JDialog
             + System.getProperty("sip-communicator.version"));
 
     private JTextArea logoArea = new JTextArea(
-        BrandingActivator.getResources().getI18NString("logoMessage"));
+        BrandingActivator.getResources().getI18NString("plugin.branding.LOGO_MESSAGE"));
 
     private StyledHTMLEditorPane rightsArea = new StyledHTMLEditorPane();
 
@@ -43,7 +43,7 @@ public class WelcomeWindow extends JDialog
     private JPanel loadingPanel = new JPanel(new BorderLayout());
 
     private JLabel loadingLabel = new JLabel(
-        BrandingActivator.getResources().getI18NString("loading") + ": ");
+        BrandingActivator.getResources().getI18NString("plugin.branding.LOADING") + ": ");
 
     private JLabel bundleLabel = new JLabel();
 
@@ -89,7 +89,7 @@ public class WelcomeWindow extends JDialog
 
         this.rightsArea.setContentType("text/html");
         this.rightsArea.appendToEnd(BrandingActivator.getResources().getI18NString(
-            "welcomeMessage",
+            "plugin.branding.WELCOME_MESSAGE",
             new String[]{
                 Constants.TEXT_COLOR,
                 APPLICATION_NAME,
@@ -107,7 +107,7 @@ public class WelcomeWindow extends JDialog
 
         this.licenseArea.setContentType("text/html");
         this.licenseArea.appendToEnd(BrandingActivator.getResources().getI18NString(
-            "license",
+            "plugin.branding.LICENSE",
             new String[]
                        {
                             Constants.TEXT_COLOR
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/AntialiasingManager.java b/src/net/java/sip/communicator/plugin/callhistoryform/AntialiasingManager.java
index 3763b9a..d9117d9 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/AntialiasingManager.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/AntialiasingManager.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallHistoryButton.java
index 79b7579..c5df7a6 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallHistoryButton.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallHistoryButton.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 
@@ -47,6 +47,6 @@ public class CallHistoryButton
     public String getText()
     {
         return ExtendedCallHistorySearchActivator.getResources()
-            .getI18NString("history");
+            .getI18NString("service.gui.HISTORY");
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallList.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallList.java
index 4311ea8..4e5c82f 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallList.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallList.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 import java.awt.event.*;
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallListCellRenderer.java
index 39977a5..771d4b1 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListCellRenderer.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallListCellRenderer.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 
@@ -112,12 +112,12 @@ public class CallListCellRenderer
  
             this.timeLabel.setText(
                 ExtendedCallHistorySearchActivator.getResources()
-                    .getI18NString("at") + " "
+                    .getI18NString("service.gui.AT") + " "
                 + GuiUtils.formatTime(participant.getStartTime()));
 
             this.durationLabel.setText(
                 ExtendedCallHistorySearchActivator.getResources()
-                    .getI18NString("duration") + " "
+                    .getI18NString("service.gui.DURATION") + " "
                 + GuiUtils.formatTime(participant.getCallTime()));
 
             // this.nameLabel.setIcon(listModel
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListModel.java b/src/net/java/sip/communicator/plugin/callhistoryform/CallListModel.java
index 4a7d5d9..36cc176 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/CallListModel.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/CallListModel.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.util.*;
 
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java b/src/net/java/sip/communicator/plugin/callhistoryform/Constants.java
index 1b3f782..d2d247f 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/Constants.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/Constants.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchActivator.java
index a7ce2f5..95c65b0 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchActivator.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchActivator.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.util.*;
 
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java
index 3f9f60b..44290da 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchDialog.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchDialog.java
@@ -4,7 +4,8 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -14,7 +15,6 @@ import javax.swing.*;
 
 import net.java.sip.communicator.service.callhistory.*;
 import net.java.sip.communicator.util.*;
-import net.java.sip.communicator.util.swing.*;
 
 import com.toedter.calendar.*;
 
@@ -26,26 +26,25 @@ import com.toedter.calendar.*;
  * @author Maxime Bourdon & Thomas Meyer
  */
 public class ExtendedCallHistorySearchDialog
-    extends SIPCommDialog
+    extends JDialog
     implements  ActionListener,
                 ItemListener
 {
     /* PANEL */
-    private JPanel mainSearchPanel = new TransparentPanel(new BorderLayout());
+    private JPanel mainSearchPanel = new JPanel(new BorderLayout());
 
-    private JPanel mainPanel = new TransparentPanel(new BorderLayout(3, 1));
+    private JPanel mainPanel = new JPanel(new BorderLayout(3, 1));
 
-    private JPanel searchPanel = new TransparentPanel(new GridBagLayout());
+    private JPanel searchPanel = new JPanel(new GridBagLayout());
 
-    private JPanel callTypePanel = new TransparentPanel(new GridBagLayout());
+    private JPanel callTypePanel = new JPanel(new GridBagLayout());
 
-    private JPanel callListResultPanel =
-        new TransparentPanel(new BorderLayout());
+    private JPanel callListResultPanel = new JPanel(new BorderLayout());
 
     /* BUTTON */
     private JButton searchButton = new JButton(
         ExtendedCallHistorySearchActivator.getResources()
-            .getI18NString("search"),
+            .getI18NString("service.gui.SEARCH"),
         ExtendedCallHistorySearchActivator.getResources()
             .getImage("plugin.callhistorysearch.SEARCH_ICON"));
 
@@ -55,28 +54,28 @@ public class ExtendedCallHistorySearchDialog
     /* LABEL */
     private JLabel contactNameLabel = new JLabel(
         ExtendedCallHistorySearchActivator.getResources()
-            .getI18NString("contactName") + ": ");
+            .getI18NString("plugin.callhistoryform.CONTACT_NAME") + ": ");
 
     private JLabel sinceDateLabel
         = new JLabel(ExtendedCallHistorySearchActivator.getResources()
-                .getI18NString("since") + ": ");
+                .getI18NString("plugin.callhistoryform.SINCE") + ": ");
 
     private JLabel untilDateLabel
         = new JLabel(ExtendedCallHistorySearchActivator.getResources()
-                .getI18NString("until") + ": ");
+                .getI18NString("plugin.callhistoryform.UNTIL") + ": ");
 
     private JLabel callTypeLabel
         = new JLabel(ExtendedCallHistorySearchActivator.getResources()
-                .getI18NString("callType") + ": ");
+                .getI18NString("plugin.callhistoryform.CALLTYPE") + ": ");
 
     /* CHECKBOX */
-    private JCheckBox inCheckBox =
-        new SIPCommCheckBox(ExtendedCallHistorySearchActivator.getResources()
-            .getI18NString("incoming"), true);
+    private JCheckBox inCheckBox = new JCheckBox(
+        ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("plugin.callhistoryform.INCOMING"), true);
 
-    private JCheckBox outCheckBox =
-        new SIPCommCheckBox(ExtendedCallHistorySearchActivator.getResources()
-            .getI18NString("outgoing"), true);
+    private JCheckBox outCheckBox = new JCheckBox(
+        ExtendedCallHistorySearchActivator.getResources()
+            .getI18NString("plugin.callhistoryform.OUTGOING"), true);
 
     /* SCROLL PANE */
     private JScrollPane scrollPane = new JScrollPane();
@@ -111,7 +110,7 @@ public class ExtendedCallHistorySearchDialog
         this.mainPanel.setPreferredSize(new Dimension(650, 550));
 
         this.setTitle(ExtendedCallHistorySearchActivator.getResources()
-                .getI18NString("advancedCallHistorySearch"));
+                .getI18NString("plugin.callhistoryform.TITLE"));
 
         this.initPanels();
 
@@ -340,7 +339,7 @@ public class ExtendedCallHistorySearchDialog
         {
 
             resultString = ExtendedCallHistorySearchActivator.getResources()
-                .getI18NString("today");
+                .getI18NString("service.gui.TODAY");
         }
         else
         {
@@ -486,10 +485,6 @@ public class ExtendedCallHistorySearchDialog
 
         if (callList.getModel().getSize() > 0)
             callList.addItem(ExtendedCallHistorySearchActivator.getResources()
-                    .getI18NString("olderCalls") + "...");
-    }
-
-    protected void close(boolean isEscaped)
-    {
+                    .getI18NString("service.gui.OLDER_CALLS") + "...");
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchItem.java
index 7377d4a..eca4c58 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/ExtendedCallHistorySearchItem.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/ExtendedCallHistorySearchItem.java
@@ -5,7 +5,7 @@
  * See terms of license at gnu.org.
  */
 
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -29,7 +29,7 @@ public class ExtendedCallHistorySearchItem
 {
     private JMenuItem historyMenuItem
         = new JMenuItem(ExtendedCallHistorySearchActivator.getResources()
-                .getI18NString("advancedCallHistorySearch"),
+                .getI18NString("plugin.callhistoryform.TITLE"),
             ExtendedCallHistorySearchActivator.getResources()
                 .getImage("plugin.callhistorysearch.HISTORY_MENU_ICON"));
 
@@ -42,7 +42,7 @@ public class ExtendedCallHistorySearchItem
     {
         this.historyMenuItem.setMnemonic(
             ExtendedCallHistorySearchActivator.getResources()
-                .getI18nMnemonic("advancedCallHistorySearch"));
+                .getI18nMnemonic("plugin.callhistoryform.TITLE"));
         this.historyMenuItem.addActionListener(this);
     }
  
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java b/src/net/java/sip/communicator/plugin/callhistoryform/GuiCallParticipantRecord.java
index 8f60b4c..e5a11c9 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/GuiCallParticipantRecord.java
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/GuiCallParticipantRecord.java
@@ -4,7 +4,7 @@
  * Distributable under LGPL license.
  * See terms of license at gnu.org.
  */
-package net.java.sip.communicator.plugin.extendedcallhistorysearch;
+package net.java.sip.communicator.plugin.callhistoryform;
 
 import java.util.*;
 
@@ -30,7 +30,7 @@ public class GuiCallParticipantRecord
     
     private Date startTime;
     
-    private Date callTime;    
+    private Date callTime;
     
     /**
      * Creates an instance of <tt>GuiCallParticipantRecord</tt> by specifying
diff --git a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
index 9335d32..62ffc58 100644
--- a/src/net/java/sip/communicator/plugin/extendedcallhistorysearch/extendedcallhistorysearch.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/callhistoryform/callhistoryform.manifest.mf
@@ -1,18 +1,17 @@
-Bundle-Activator: net.java.sip.communicator.plugin.extendedcallhistorysearch.ExtendedCallHistorySearchActivator
+Bundle-Activator: net.java.sip.communicator.plugin.callhistoryform.ExtendedCallHistorySearchActivator
 Bundle-Name: Extended Call History Search
 Bundle-Description: An Extended Call History Search
 Bundle-Vendor: sip-communicator.org
 Bundle-Version: 0.0.1
 Import-Package: org.osgi.framework,
- net.java.sip.communicator.service.callhistory,
- net.java.sip.communicator.service.configuration,
+ net.java.sip.communicator.util,
+ net.java.sip.communicator.service.resources, 
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.gui.event,
- net.java.sip.communicator.service.resources,
- net.java.sip.communicator.util,
- net.java.sip.communicator.util.swing,
+ net.java.sip.communicator.service.callhistory,
+ net.java.sip.communicator.service.configuration,
  javax.swing,
  javax.swing.event,
  javax.swing.table,
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java
index 7a1c5ae..af93761 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoContactPanel.java
@@ -66,7 +66,7 @@ public class ContactInfoContactPanel
         this.contactInfoDialog = dialog;

 

         this.setBorder(BorderFactory.createCompoundBorder(BorderFactory

-            .createTitledBorder(Resources.getString("contacts")),

+            .createTitledBorder(Resources.getString("service.gui.CONTACTS")),

             BorderFactory.createEmptyBorder(5, 5, 5, 5)));

 

         this.contactList.setOpaque(false);

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
index ae23f64..02f3dcf 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDetailsPanel.java
@@ -107,14 +107,20 @@ public class ContactInfoDetailsPanel
 

         JScrollPane extendedScrollPane = new JScrollPane(extendedPanel);

 

-        this.tabbedPane.addTab(Resources.getString("summary"), icon,

-            summaryPanel, Resources.getString("contactSummaryDesc")

+        this.tabbedPane.addTab(

+            Resources.getString("service.gui.SUMMARY"), icon,

+            summaryPanel,

+            Resources.getString(

+                "plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION")

                 + contact.getDisplayName());

 

         this.tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);

 

-        this.tabbedPane.addTab(Resources.getString("extended"), icon,

-            extendedScrollPane, Resources.getString("contactExtendedDesc")

+        this.tabbedPane.addTab(

+            Resources.getString("plugin.accountinfo.EXTENDED"), icon,

+            extendedScrollPane,

+            Resources.getString(

+                "plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION")

                 + contact.getDisplayName());

 

         this.tabbedPane.setMnemonicAt(1, KeyEvent.VK_2);

@@ -135,8 +141,8 @@ public class ContactInfoDetailsPanel
      */

     private JPanel createUnsupportedPanel()

     {

-        JTextArea unsupportedTextArea =

-            new JTextArea(Resources.getString("contactInfoNotSupported"));

+        JTextArea unsupportedTextArea = new JTextArea(

+            Resources.getString("service.gui.CONTACT_INFO_NOT_SUPPORTED"));

 

         unsupportedTextArea.setEditable(false);

         unsupportedTextArea.setLineWrap(true);

@@ -210,14 +216,22 @@ public class ContactInfoDetailsPanel
 

         // Labels panel.

         JPanel labelsPanel = new TransparentPanel(new GridLayout(0, 1, 5, 5));

-        labelsPanel.add(new JLabel(Resources.getString("firstNameNS")));

-        labelsPanel.add(new JLabel(Resources.getString("middleNameNS")));

-        labelsPanel.add(new JLabel(Resources.getString("lastNameNS")));

-        labelsPanel.add(new JLabel(Resources.getString("genderNS")));

-        labelsPanel.add(new JLabel(Resources.getString("bdayNS")));

-        labelsPanel.add(new JLabel(Resources.getString("ageNS")));

-        labelsPanel.add(new JLabel(Resources.getString("emailNS")));

-        labelsPanel.add(new JLabel(Resources.getString("phoneNS")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.FIRST_NAME")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.MIDDLE_NAME")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.LAST_NAME")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.GENDER")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.BDAY")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.AGE")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.EMAIL")));

+        labelsPanel.add(new JLabel(

+            Resources.getString("plugin.accountinfo.PHONE")));

 

         detailsPanel.add(labelsPanel, BorderLayout.WEST);

 

@@ -243,7 +257,8 @@ public class ContactInfoDetailsPanel
         }

 

         if (firstNameDetail.equals(""))

-            firstNameDetail = Resources.getString("notSpecified");

+            firstNameDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(firstNameDetail));

 

@@ -260,7 +275,8 @@ public class ContactInfoDetailsPanel
         }

 

         if (middleNameDetail.trim().equals(""))

-            middleNameDetail = Resources.getString("notSpecified");

+            middleNameDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(middleNameDetail));

 

@@ -278,7 +294,8 @@ public class ContactInfoDetailsPanel
         }

 

         if (lastNameDetail.trim().equals(""))

-            lastNameDetail = Resources.getString("notSpecified");

+            lastNameDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(lastNameDetail));

 

@@ -294,7 +311,8 @@ public class ContactInfoDetailsPanel
         }

 

         if (genderDetail.trim().equals(""))

-            genderDetail = Resources.getString("notSpecified");

+            genderDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(genderDetail));

 

@@ -326,10 +344,11 @@ public class ContactInfoDetailsPanel
         }

 

         if (birthDateDetail.equals(""))

-            birthDateDetail = Resources.getString("notSpecified");

+            birthDateDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         if (ageDetail.equals(""))

-            ageDetail = Resources.getString("notSpecified");

+            ageDetail = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(birthDateDetail));

         valuesPanel.add(new JLabel(ageDetail));

@@ -346,7 +365,8 @@ public class ContactInfoDetailsPanel
         }

 

         if (emailDetail.trim().equals(""))

-            emailDetail = Resources.getString("notSpecified");

+            emailDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(emailDetail));

 

@@ -363,7 +383,8 @@ public class ContactInfoDetailsPanel
         }

 

         if (phoneNumberDetail.trim().equals(""))

-            phoneNumberDetail = Resources.getString("notSpecified");

+            phoneNumberDetail

+                = Resources.getString("plugin.contactinfo.NOT_SPECIFIED");

 

         valuesPanel.add(new JLabel(phoneNumberDetail));

 

@@ -388,7 +409,9 @@ public class ContactInfoDetailsPanel
         // the bottom so we don't disrupt the standard look of the other details

         imagePanel.setLayout(new BoxLayout(imagePanel, BoxLayout.LINE_AXIS));

         imagePanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory

-            .createTitledBorder(Resources.getString("userPictures")),

+            .createTitledBorder(

+                Resources.getString("plugin.contactinfo.USER_PICTURES")),

+

             BorderFactory.createEmptyBorder(0, 5, 5, 5)));

 

         // Obtain all the details for a contact.

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java
index b96f65a..3a73333 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoDialog.java
@@ -53,7 +53,7 @@ public class ContactInfoDialog
     {

         this.metaContact = metaContact;

 

-        this.setTitle(Resources.getString("contactDetails")

+        this.setTitle(Resources.getString("plugin.contactinfo.TITLE")

                     + ": "

                     + metaContact.getDisplayName());

 

diff --git a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
index d2f3629..0a1b12c 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
+++ b/src/net/java/sip/communicator/plugin/contactinfo/ContactInfoMenuItem.java
@@ -24,7 +24,7 @@ public class ContactInfoMenuItem
                 ActionListener

 {

     private JMenuItem menuItem

-        = new JMenuItem(Resources.getString("contactInfo"),

+        = new JMenuItem(Resources.getString("service.gui.CONTACT_INFO"),

             new ImageIcon(Resources.getImage(

                 "plugin.contactinfo.CONTACT_INFO_ICON")));

 

diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
index 54053bb..701e6ce 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/DictAccountRegistrationWizard.java
@@ -86,7 +86,7 @@ public class DictAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("dict.protocolName");
+        return Resources.getString("plugin.dictaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -96,7 +96,7 @@ public class DictAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("dict.protocolDescription");
+        return Resources.getString("plugin.dictaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -226,14 +226,14 @@ public class DictAccountRegistrationWizard
         {
             DictAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException e)
         {
             DictAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java
index 83d1f1d..4c65b41 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/FirstWizardPage.java
@@ -37,38 +37,45 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel hostLabel = new JLabel(Resources.getString("dict.host"));
+    private JLabel hostLabel = new JLabel(Resources.getString("plugin.dictaccregwizz.HOST"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
     private JLabel hostExampleLabel = new JLabel("Ex: dict.org");
 
-    private JLabel portLabel = new JLabel(Resources.getString("dict.port"));
+    private JLabel portLabel = new JLabel(Resources.getString("plugin.dictaccregwizz.PORT"));
 
     private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("existingAccount"));
+        new JLabel(Resources.getString(
+            "service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JTextField hostField = new JTextField();
 
     private JTextField portField = new JTextField("2628");
     
-    
     private JPanel strategyPanel = new TransparentPanel(new BorderLayout(10, 10));
     
     private JPanel strategyTitleBloc = new TransparentPanel(new BorderLayout());
     
-    private JLabel strategyTitle = new JLabel(Resources.getString("dict.strategyList"));
+    private JLabel strategyTitle = new JLabel(Resources.getString(
+            "plugin.dictaccregwizz.STRATEGY_LIST"));
     
-    private JButton strategyLoader = new JButton(Resources.getString("dict.strategyActu"));
+    private JButton strategyLoader
+        = new JButton(Resources.getString(
+            "plugin.dictaccregwizz.SEARCH_STRATEGIES"));
     
     private StrategiesList strategiesList;
-    private JTextArea strategyDescription = new JTextArea(Resources.getString("dict.strategyDesc"));    
+    
+    private JTextArea strategyDescription
+        = new JTextArea(Resources.getString(
+            "plugin.dictaccregwizz.STRATEGY_DESCRIPTION"));
+    
     private ProgressPanel searchProgressPanel;
-
+    
     private JPanel mainPanel = new TransparentPanel(new BorderLayout());
-
+    
     private Object nextPageIdentifier = WizardPage.SUMMARY_PAGE_IDENTIFIER;
-
+    
     private DictAccountRegistrationWizard wizard;
     
     private String initstrategy = "";
@@ -150,7 +157,7 @@ public class FirstWizardPage
         hostPortPanel.add(valuesPanel, BorderLayout.CENTER);
 
         hostPortPanel.setBorder(BorderFactory.createTitledBorder(
-                Resources.getString("dict.serverInformations")));
+                Resources.getString("plugin.dictaccregwizz.SERVER_INFO")));
         
         this.labelsPanel.setLayout(new BoxLayout(labelsPanel, BoxLayout.Y_AXIS));
         this.valuesPanel.setLayout(new BoxLayout(valuesPanel, BoxLayout.Y_AXIS));
@@ -205,7 +212,7 @@ public class FirstWizardPage
         
         this.strategyPanel.add(this.strategyTitleBloc, BorderLayout.NORTH);
         this.strategyPanel.setBorder(BorderFactory.createTitledBorder(
-                Resources.getString("dict.strategySelection")));
+                Resources.getString("plugin.dictaccregwizz.STRATEGY_SELECTION")));
         mainPanel.add(this.strategyPanel);
 
         this.add(mainPanel, BorderLayout.NORTH);
@@ -226,8 +233,8 @@ public class FirstWizardPage
         this.mainPanel = new TransparentPanel(new BorderLayout());
 
         JPanel infoTitlePanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
-        JTextArea firstDescription = new JTextArea(Resources.getString("dict.firstAccount"));
-        JLabel title = new JLabel(Resources.getString("dict.accountInfoTitle"));
+        JTextArea firstDescription = new JTextArea(Resources.getString("plugin.dictaccregwizz.FIRST_ACCOUNT"));
+        JLabel title = new JLabel(Resources.getString("plugin.dictaccregwizz.ACCOUNT_INFO_TITLE"));
 
         // Title
         title.setFont(title.getFont().deriveFont(Font.BOLD, 14.0f));
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java
index 6a788cb..e69b406 100755
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/ProgressPanel.java
@@ -45,7 +45,8 @@ public class ProgressPanel
         // Element creation
         this.messageLabel = new JLabel(" ");
         this.progressLabel = new JLabel(" ");
-        this.cancelButton = new JButton(Resources.getString("cancel"));
+        this.cancelButton
+            = new JButton(Resources.getString("service.gui.CANCEL"));
         this.cancelButton.addActionListener(this);
         
         // Right panel init
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java b/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java
index ccaa2c1..3b867a2 100755
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/ThreadManager.java
@@ -104,12 +104,18 @@ public class ThreadManager
          * Informations messages
          */
         private String[] messages = new String[] {
-                Resources.getString("dict.threadConnect"),
-                Resources.getString("dict.threadConnectFailed"),
-                Resources.getString("dict.retrievingStrategies"),
-                Resources.getString("dict.noStrategiesFound"),
-                Resources.getString("dict.populateList"),
-                Resources.getString("dict.closingConnexion")
+                Resources.getString(
+                    "plugin.dictaccregwizz.THREAD_CONNECT"),
+                Resources.getString(
+                    "plugin.dictaccregwizz.THREAD_CONNECT_FAILED"),
+                Resources.getString(
+                    "plugin.dictaccregwizz.RETRIEVING_STRATEGIES"),
+                Resources.getString(
+                    "plugin.dictaccregwizz.NO_STRATEGIES_FOUND"),
+                Resources.getString(
+                    "plugin.dictaccregwizz.POPULATE_LIST"),
+                Resources.getString(
+                    "dict.plugin.dictaccregwizz.CLOSING_CONNECTION")
         };
         
         /**
diff --git a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
index ed57a2e..0519d78 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/generalconfig/GeneralConfigurationForm.java
@@ -73,9 +73,12 @@ public class GeneralConfigurationForm
                 autoStartCheckBox = new SIPCommCheckBox();
                 mainPanel.add(autoStartCheckBox);
                 mainPanel.add(Box.createVerticalStrut(10));
-                autoStartCheckBox.setText(Resources.getString(
-                    "autoStartOption", new String[]
-                    { getApplicationName() }));
+
+                autoStartCheckBox.setText(
+                    Resources.getString(
+                        "plugin.generalconfig.AUTO_START",
+                        new String[]{getApplicationName()}));
+
                 initAutoStartCheckBox();
                 autoStartCheckBox.addActionListener(this);
             }
@@ -84,7 +87,8 @@ public class GeneralConfigurationForm
                 mainPanel.add(groupMessagesCheckBox);
                 mainPanel.add(Box.createVerticalStrut(10));
                 groupMessagesCheckBox.setText(
-                    Resources.getString("groupChatMessages"));
+                    Resources.getString(
+                        "plugin.generalconfig.GROUP_CHAT_MESSAGES"));
                 groupMessagesCheckBox.addActionListener(this);
             }
             {
@@ -101,7 +105,7 @@ public class GeneralConfigurationForm
                     logHistoryCheckBox = new SIPCommCheckBox();
                     logHistoryPanel.add(logHistoryCheckBox);
                     logHistoryCheckBox.setText(
-                        Resources.getString("logHistory"));
+                        Resources.getString("plugin.generalconfig.LOG_HISTORY"));
                     logHistoryCheckBox.setBounds(0, 0, 200, 19);
                     logHistoryCheckBox.addActionListener(this);
                     logHistoryCheckBox.addChangeListener(new ChangeListener()
@@ -119,7 +123,7 @@ public class GeneralConfigurationForm
                     showHistoryCheckBox = new SIPCommCheckBox();
                     logHistoryPanel.add(showHistoryCheckBox);
                     showHistoryCheckBox.setText(
-                        Resources.getString("showHistory"));
+                        Resources.getString("plugin.generalconfig.SHOW_HISTORY"));
                     showHistoryCheckBox.setBounds(17, 25, 140, 19);
                     showHistoryCheckBox.addActionListener(this);
                     showHistoryCheckBox.addChangeListener(new ChangeListener()
@@ -153,7 +157,7 @@ public class GeneralConfigurationForm
                     historySizeLabel = new JLabel();
                     logHistoryPanel.add(historySizeLabel);
                     historySizeLabel.setText(
-                        Resources.getString("historySize"));
+                        Resources.getString("plugin.generalconfig.HISTORY_SIZE"));
                     historySizeLabel.setBounds(205, 27, 220, 15);
                 }
             }
@@ -174,7 +178,7 @@ public class GeneralConfigurationForm
                     sendMessagePanel.add(
                         sendMessageLabel, BorderLayout.WEST);
                     sendMessageLabel.setText(
-                        Resources.getString("sendMessagesWith"));
+                        Resources.getString("plugin.generalconfig.SEND_MESSAGES_WITH"));
                 }
                 {
                     ComboBoxModel sendMessageComboBoxModel = 
@@ -202,7 +206,7 @@ public class GeneralConfigurationForm
                 mainPanel.add(enableTypingNotifiCheckBox);
                 mainPanel.add(Box.createVerticalStrut(10));
                 enableTypingNotifiCheckBox.setText(
-                    Resources.getString("enableTypingNotifications"));
+                    Resources.getString("service.gui.ENABLE_TYPING_NOTIFICATIONS"));
                 enableTypingNotifiCheckBox.setPreferredSize(
                     new java.awt.Dimension(253, 20));
                 enableTypingNotifiCheckBox.setAlignmentY(0.0f);
@@ -213,7 +217,7 @@ public class GeneralConfigurationForm
                 mainPanel.add(bringToFrontCheckBox);
                 mainPanel.add(Box.createVerticalStrut(10));
                 bringToFrontCheckBox.setText(
-                    Resources.getString("bringWindowToFront"));
+                    Resources.getString("plugin.generalconfig.BRING_WINDOW_TO_FRONT"));
                 bringToFrontCheckBox.addActionListener(this);
             }
 //            {
@@ -229,7 +233,7 @@ public class GeneralConfigurationForm
 //                {
 //                    final JCheckBox enableTransparencyCheckBox
 //                        = new JCheckBox(
-//                            Resources.getString("enableTransparency"),
+//                            Resources.getString("plugin.generalconfig.ENABLE_TRANSPARENCY"),
 //                            ConfigurationManager.isTransparentWindowEnabled());
 //                    transparencyPanel.add(
 //                        enableTransparencyCheckBox, BorderLayout.NORTH);
@@ -247,7 +251,7 @@ public class GeneralConfigurationForm
 //                }
 //                {
 //                    JLabel transparencyLabel = new JLabel(
-//                        Resources.getString("transparency"));
+//                        Resources.getString("plugin.generalconfig.TRANSPARENCY"));
 //
 //                    transparencyPanel.add(  transparencyLabel,
 //                                            BorderLayout.WEST);
@@ -325,7 +329,7 @@ public class GeneralConfigurationForm
 
     public String getTitle()
     {
-        return Resources.getString("general");
+        return Resources.getString("service.gui.GENERAL");
     }
 
     public int getIndex()
@@ -383,7 +387,8 @@ public class GeneralConfigurationForm
                             GeneralConfigPluginActivator.getUIService().
                                 getPopupDialog().showMessagePopupDialog(
                                     e.getMessage(),
-                                    Resources.getString("errorPermission"),
+                                    Resources.getString(
+                                        "plugin.generalconfig.ERROR_PERMISSION"),
                                     PopupDialog.ERROR_MESSAGE);
                         // cannot delete no permissions
                     }
@@ -425,15 +430,16 @@ public class GeneralConfigurationForm
         try 
         {
             String appName = getApplicationName();
+
             ShellLink shortcut = 
                 new ShellLink(
                     ShellLink.STARTUP, 
                     appName);
             shortcut.setUserType(ShellLink.CURRENT_USER);
-            
+
             String f1 = shortcut.getcurrentUserLinkPath() + 
                         File.separator + appName + ".lnk";
-            
+
             String f2 = f1.replaceAll(
                     System.getProperty("user.name"), 
                     "All Users");
@@ -442,8 +448,8 @@ public class GeneralConfigurationForm
                 autoStartCheckBox.setSelected(true);
             else
                 autoStartCheckBox.setSelected(false);
-            
-        } catch (Exception e) 
+        }
+        catch (Exception e) 
         {
             logger.error(e);
         }
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
index 945574b..51c249e 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/FirstWizardPage.java
@@ -37,12 +37,14 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel userID = new JLabel(Resources.getString("userID"));
+    private JLabel userID = new JLabel(
+        Resources.getString("plugin.gibberishaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel = new JLabel(
+        Resources.getString("service.gui.PASSWORD"));
 
     private JLabel existingAccountLabel
-        = new JLabel(Resources.getString("existingAccount"));
+        = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
@@ -52,8 +54,8 @@ public class FirstWizardPage
 
     private JPasswordField passField = new JPasswordField();
 
-    private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+    private JCheckBox rememberPassBox = new SIPCommCheckBox(
+        Resources.getString("service.gui.REMEMBER_PASSWORD"));
 
     private JPanel mainPanel = new TransparentPanel();
 
@@ -123,7 +125,7 @@ public class FirstWizardPage
 
         userPassPanel.setBorder(BorderFactory
                                 .createTitledBorder(Resources.getString(
-                                    "userAndPassword")));
+                                    "plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD")));
 
         this.add(userPassPanel, BorderLayout.NORTH);
     }
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
index 54d0424..d737d7b 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/GibberishAccountRegistrationWizard.java
@@ -55,7 +55,7 @@ public class GibberishAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -86,7 +86,7 @@ public class GibberishAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameGibberish");
+        return Resources.getString("plugin.gibberishaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -96,7 +96,7 @@ public class GibberishAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionGibberish");
+        return Resources.getString("plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -195,14 +195,14 @@ public class GibberishAccountRegistrationWizard
         {
             GibberishAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException exc)
         {
             GibberishAccRegWizzActivator.getUIService().getPopupDialog()
             .showMessagePopupDialog(exc.getMessage(),
-                                    Resources.getString("error"),
+                                    Resources.getString("service.gui.ERROR"),
                                     PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java
index 83d73be..58b8a5b 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/FirstWizardPage.java
@@ -42,12 +42,14 @@ public class FirstWizardPage
 

     private JPanel valuesPanel = new TransparentPanel();

 

-    private JLabel userIDLabel = new JLabel(Resources.getString("gtalkUsername"));

+    private JLabel userIDLabel = new JLabel(

+        Resources.getString("plugin.googletalkaccregwizz.USERNAME"));

 

-    private JLabel passLabel = new JLabel(Resources.getString("password"));

+    private JLabel passLabel

+        = new JLabel(Resources.getString("service.gui.PASSWORD"));

 

     private JLabel existingAccountLabel = new JLabel(Resources

-        .getString("existingAccount"));

+        .getString("service.gui.EXISTING_ACCOUNT_ERROR"));

 

     private JPanel emptyPanel = new TransparentPanel();

 

@@ -57,36 +59,47 @@ public class FirstWizardPage
 

     private JPasswordField passField = new JPasswordField();

 

-    private JCheckBox rememberPassBox =

-        new SIPCommCheckBox(Resources.getString("rememberPassword"));

+    private JCheckBox rememberPassBox

+        = new SIPCommCheckBox(Resources

+            .getString("service.gui.REMEMBER_PASSWORD"));

 

-    private JPanel advancedOpPanel = new TransparentPanel(new BorderLayout(10, 10));

+    private JPanel advancedOpPanel

+        = new TransparentPanel(new BorderLayout(10, 10));

 

-    private JPanel labelsAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));

+    private JPanel labelsAdvOpPanel

+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));

 

-    private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));

+    private JPanel valuesAdvOpPanel

+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));

 

-    private JCheckBox sendKeepAliveBox =

-        new SIPCommCheckBox(Resources.getString("enableKeepAlive"));

+    private JCheckBox sendKeepAliveBox

+        = new SIPCommCheckBox(Resources

+            .getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"));

 

-    private JCheckBox enableAdvOpButton =

-        new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false);

+    private JCheckBox enableAdvOpButton = new SIPCommCheckBox(

+        Resources.getString(

+            "plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"),

+        false);

 

-    private JLabel resourceLabel = new JLabel(Resources.getString("resource"));

+    private JLabel resourceLabel

+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.RESOURCE"));

 

     private JTextField resourceField

         = new JTextField(GoogleTalkAccountRegistration.DEFAULT_RESOURCE);

 

-    private JLabel priorityLabel = new JLabel(Resources.getString("priority"));

+    private JLabel priorityLabel

+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.PRIORITY"));

 

     private JTextField priorityField

         = new JTextField(GoogleTalkAccountRegistration.DEFAULT_PRIORITY);

 

-    private JLabel serverLabel = new JLabel(Resources.getString("server"));

+    private JLabel serverLabel

+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.SERVER"));

 

     private JTextField serverField = new JTextField();

 

-    private JLabel portLabel = new JLabel(Resources.getString("port"));

+    private JLabel portLabel

+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.PORT"));

 

     private JTextField portField

         = new JTextField(GoogleTalkAccountRegistration.DEFAULT_PORT);

@@ -96,10 +109,10 @@ public class FirstWizardPage
     private JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));

 

     private JTextArea registerArea = new JTextArea(Resources

-        .getString("gtalkRegisterNewAccountText"));

+        .getString("plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT"));

 

     private JButton registerButton = new JButton(Resources

-        .getString("registerNewAccount"));

+        .getString("plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE"));

 

     private JPanel mainPanel = new TransparentPanel();

 

@@ -170,7 +183,7 @@ public class FirstWizardPage
         userIDPassPanel.add(rememberPassBox, BorderLayout.SOUTH);

 

         userIDPassPanel.setBorder(BorderFactory.createTitledBorder(Resources

-            .getString("userIDAndPassword")));

+            .getString("plugin.jabberaccregwizz.USERNAME_AND_PASSWORD")));

 

         mainPanel.add(userIDPassPanel);

 

@@ -260,7 +273,7 @@ public class FirstWizardPage
         advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);

 

         advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources

-            .getString("advancedOptions")));

+            .getString("plugin.jabberaccregwizz.ADVANCED_OPTIONS")));

 

         mainPanel.add(advancedOpPanel);

 

@@ -291,7 +304,7 @@ public class FirstWizardPage
         registerPanel.add(buttonPanel);

 

         registerPanel.setBorder(BorderFactory.createTitledBorder(Resources

-            .getString("registerNewAccount")));

+            .getString("plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE")));

 

         mainPanel.add(registerPanel);

 

diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
index ca1610e..ef656a7 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/GoogleTalkAccountRegistrationWizard.java
@@ -50,7 +50,8 @@ public class GoogleTalkAccountRegistrationWizard
     {

         this.wizardContainer = wizardContainer;

 

-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));

+        this.wizardContainer

+            .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));

     }

 

     /**

@@ -81,7 +82,8 @@ public class GoogleTalkAccountRegistrationWizard
      */

     public String getProtocolName()

     {

-        return Resources.getString("protocolName");

+        return Resources

+            .getString("plugin.googletalkaccregwizz.PROTOCOL_NAME");

     }

 

     /**

@@ -91,7 +93,8 @@ public class GoogleTalkAccountRegistrationWizard
      */

     public String getProtocolDescription()

     {

-        return Resources.getString("protocolDescription");

+        return Resources

+            .getString("plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION");

     }

 

     /**

@@ -116,26 +119,33 @@ public class GoogleTalkAccountRegistrationWizard
     {

         Hashtable summaryTable = new Hashtable();

 

-        summaryTable.put(   Resources.getString("gtalkUsername"),

-                            registration.getUserID());

+        summaryTable.put(

+            Resources.getString("plugin.googletalkaccregwizz.USERNAME"),

+            registration.getUserID());

 

-        summaryTable.put(   Resources.getString("rememberPassword"),

-                            new Boolean(registration.isRememberPassword()));

+        summaryTable.put(

+            Resources.getString("service.gui.REMEMBER_PASSWORD"),

+            new Boolean(registration.isRememberPassword()));

 

-        summaryTable.put(   Resources.getString("server"),

-                            registration.getServerAddress());

+        summaryTable.put(

+            Resources.getString("plugin.jabberaccregwizz.SERVER"),

+            registration.getServerAddress());

 

-        summaryTable.put(   Resources.getString("port"),

-                            String.valueOf(registration.getPort()));

+        summaryTable.put(

+            Resources.getString("plugin.jabberaccregwizz.PORT"),

+            String.valueOf(registration.getPort()));

 

-        summaryTable.put(   Resources.getString("enableKeepAlive"),

+        summaryTable.put(

+            Resources.getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"),

             String.valueOf(registration.isSendKeepAlive()));

 

-        summaryTable.put(   Resources.getString("resource"),

-                            registration.getResource());

+        summaryTable.put(

+            Resources.getString("plugin.jabberaccregwizz.RESOURCE"),

+            registration.getResource());

 

-        summaryTable.put(   Resources.getString("priority"),

-                            String.valueOf(registration.getPriority()));

+        summaryTable.put(

+            Resources.getString("plugin.jabberaccregwizz.PRIORITY"),

+            String.valueOf(registration.getPriority()));

 

         return summaryTable.entrySet().iterator();

     }

@@ -242,14 +252,14 @@ public class GoogleTalkAccountRegistrationWizard
         {

             GoogleTalkAccRegWizzActivator.getUIService().getPopupDialog()

                 .showMessagePopupDialog(exc.getMessage(),

-                    Resources.getString("error"),

+                    Resources.getString("service.gui.ERROR"),

                     PopupDialog.ERROR_MESSAGE);

         }

         catch (IllegalStateException exc)

         {

             GoogleTalkAccRegWizzActivator.getUIService().getPopupDialog()

                 .showMessagePopupDialog(exc.getMessage(),

-                    Resources.getString("error"),

+                    Resources.getString("service.gui.ERROR"),

                     PopupDialog.ERROR_MESSAGE);

         }

 

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
index 7f56c2f..9cb54de 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/FirstWizardPage.java
@@ -44,49 +44,55 @@ public class FirstWizardPage
     private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
     private JCheckBox enableAdvOpButton =
-        new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false);
+        new SIPCommCheckBox(Resources.getString(
+            "plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"),
+            false);
 
-    private JLabel uinLabel = new JLabel(Resources.getString("uin"));
+    private JLabel uinLabel
+        = new JLabel(Resources.getString("plugin.icqaccregwizz.USERNAME"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
     private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE);
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
     private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("existingAccount"));
+        new JLabel(Resources.getString(
+            "service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JTextField uinField = new JTextField();
 
     private JPasswordField passField = new JPasswordField();
 
     private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+        new SIPCommCheckBox(Resources.getString("service.gui.REMEMBER_PASSWORD"));
 
     private JPanel registerPanel = new TransparentPanel(new GridLayout(0, 1));
 
     private JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
 
-    private JTextArea registerArea =
-        new JTextArea(Resources.getString("icqRegisterNewAccountText"));
+    private JTextArea registerArea = new JTextArea(
+        Resources.getString("plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT"));
 
-    private JButton registerButton =
-        new JButton(Resources.getString("registerNewAccount"));
+    private JButton registerButton = new JButton(
+        Resources.getString("plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT"));
 
-    private JLabel proxyLabel = new JLabel(Resources.getString("proxy"));
+    private JLabel proxyLabel = new JLabel(
+        Resources.getString("plugin.icqaccregwizz.PROXY"));
 
     private JLabel proxyPortLabel =
-        new JLabel(Resources.getString("proxyPort"));
+        new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_PORT"));
 
     private JLabel proxyUsernameLabel =
-        new JLabel(Resources.getString("proxyUsername"));
+        new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_USERNAME"));
 
     private JLabel proxyPasswordLabel =
-        new JLabel(Resources.getString("proxyPassword"));
+        new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_PASSWORD"));
 
     private JLabel proxyTypeLabel =
-        new JLabel(Resources.getString("proxyType"));
+        new JLabel(Resources.getString("plugin.icqaccregwizz.PROXY_TYPE"));
 
     private JTextField proxyField = new JTextField();
 
@@ -169,7 +175,7 @@ public class FirstWizardPage
         uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
 
         uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("aimUinAndPassword")));
+            .getString("plugin.aimaccregwizz.USERNAME_AND_PASSWORD")));
 
         mainPanel.add(uinPassPanel);
 
@@ -213,7 +219,7 @@ public class FirstWizardPage
         advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
 
         advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("advancedOptions")));
+            .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS")));
 
         mainPanel.add(advancedOpPanel);
 
@@ -227,7 +233,7 @@ public class FirstWizardPage
         this.registerPanel.add(buttonPanel);
 
         this.registerPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("registerNewAccount")));
+            .getString("plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT")));
 
         mainPanel.add(registerPanel);
 
diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
index 102aaf3..134aed0 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/IcqAccountRegistrationWizard.java
@@ -42,7 +42,7 @@ public class IcqAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -71,7 +71,7 @@ public class IcqAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameIcq");
+        return Resources.getString("plugin.icqaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -81,7 +81,7 @@ public class IcqAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionIcq");
+        return Resources.getString("plugin.icqaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -104,14 +104,14 @@ public class IcqAccountRegistrationWizard
     {
         LinkedHashMap summaryTable = new LinkedHashMap();
 
-        summaryTable.put(Resources.getString("uin"), registration.getUin());
-        summaryTable.put(Resources.getString("rememberPassword"),
+        summaryTable.put(Resources.getString("service.gui.USER_IDENTIFIER"), registration.getUin());
+        summaryTable.put(Resources.getString("service.gui.REMEMBER_PASSWORD"),
                 new Boolean(registration.isRememberPassword()));
 
         if(registration.isAdvancedSettingsEnabled())
         {
             if (registration.getProxy() != null)
-                summaryTable.put(Resources.getString("proxy"),
+                summaryTable.put(Resources.getString("plugin.icqaccregwizz.PROXY"),
                     registration.getProxy());
 
             if (registration.getProxyPort() != null)
@@ -228,14 +228,14 @@ public class IcqAccountRegistrationWizard
         {
             IcqAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException e)
         {
             IcqAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                                        Resources.getString("error"),
+                                        Resources.getString("service.gui.ERROR"),
                                         PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
index 1054057..5374020 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java
@@ -59,18 +59,22 @@ public class FirstWizardPage
     private JPanel valuesOptionsPanel = new TransparentPanel();
 
     private JLabel infoPassword
-        = new JLabel(Resources.getString("infoPassword"));
+        = new JLabel(Resources.getString("plugin.ircaccregwizz.INFO_PASSWORD"));
 
-    private JLabel nick = new JLabel(Resources.getString("nick"));
+    private JLabel nick
+        = new JLabel(Resources.getString("plugin.ircaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
-    private JLabel server = new JLabel(Resources.getString("server"));
+    private JLabel server
+        = new JLabel(Resources.getString("plugin.ircaccregwizz.HOST"));
 
-    private JLabel port = new JLabel(Resources.getString("port"));
+    private JLabel port
+        = new JLabel(Resources.getString("plugin.ircaccregwizz.PORT"));
 
     private JLabel existingAccountLabel
-        = new JLabel(Resources.getString("existingAccount"));
+        = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
@@ -88,17 +92,18 @@ public class FirstWizardPage
 
     private JTextField portField = new JTextField();
 
-    private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+    private JCheckBox rememberPassBox
+        = new SIPCommCheckBox(Resources.getString("service.gui.REMEMBER_PASSWORD"));
 
-    private JCheckBox autoNickChange =
-        new SIPCommCheckBox(Resources.getString("autoNickChange"));
+    private JCheckBox autoNickChange
+        = new SIPCommCheckBox(
+            Resources.getString("plugin.ircaccregwizz.AUTO_NICK_CHANGE"));
 
-    private JCheckBox defaultPort =
-        new SIPCommCheckBox(Resources.getString("defaultPort"));
+    private JCheckBox defaultPort = new SIPCommCheckBox(
+            Resources.getString("plugin.ircaccregwizz.USE_DEFAULT_PORT"));
 
-    private JCheckBox passwordNotRequired =
-        new SIPCommCheckBox(Resources.getString("passwordNotRequired"));
+    private JCheckBox passwordNotRequired = new SIPCommCheckBox(
+            Resources.getString("plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED"));
 
     private JPanel mainPanel = new TransparentPanel();
 
@@ -201,7 +206,7 @@ public class FirstWizardPage
         
         userPassPanel.setBorder(BorderFactory
                                 .createTitledBorder(Resources.getString(
-                                    "userAndPassword")));
+                                "plugin.ircaccregwizz.USERNAME_AND_PASSWORD")));
         
         labelsServerPanel.add(server);
         labelsServerPanel.add(emptyPanel2);
@@ -216,13 +221,13 @@ public class FirstWizardPage
         serverPanel.add(defaultPort, BorderLayout.SOUTH);
         
         serverPanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("serverIRC")));
+            Resources.getString("plugin.ircaccregwizz.IRC_SERVER")));
         
         optionsPanel.add(rememberPassBox, BorderLayout.CENTER);
         optionsPanel.add(autoNickChange, BorderLayout.SOUTH);
         
         optionsPanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("options")));
+            Resources.getString("service.gui.OPTIONS")));
         
         mainPanel.add(userPassPanel);
         mainPanel.add(serverPanel);
diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
index 17bdd67..0c4f364 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/IrcAccountRegistrationWizard.java
@@ -52,7 +52,7 @@ public class IrcAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer.setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -83,7 +83,7 @@ public class IrcAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameIrc");
+        return Resources.getString("plugin.ircaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -93,7 +93,7 @@ public class IrcAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionIrc");
+        return Resources.getString("plugin.ircaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -229,14 +229,14 @@ public class IrcAccountRegistrationWizard
         {
             IrcAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException exc)
         {
             IrcAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
index c38e410..6980853 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/FirstWizardPage.java
@@ -45,12 +45,14 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel userIDLabel = new JLabel(Resources.getString("jabberUsername"));
+    private JLabel userIDLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
     private JLabel existingAccountLabel = new JLabel(Resources
-        .getString("existingAccount"));
+        .getString("plugin.jabberaccregwizz.USER_EXISTS_ERROR"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
@@ -60,36 +62,45 @@ public class FirstWizardPage
 
     private JPasswordField passField = new JPasswordField();
 
-    private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+    private JCheckBox rememberPassBox = new SIPCommCheckBox(Resources
+        .getString("service.gui.REMEMBER_PASSWORD"));
 
-    private JPanel advancedOpPanel = new TransparentPanel(new BorderLayout(10, 10));
+    private JPanel advancedOpPanel
+        = new TransparentPanel(new BorderLayout(10, 10));
 
-    private JPanel labelsAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+    private JPanel labelsAdvOpPanel
+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
-    private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+    private JPanel valuesAdvOpPanel
+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
-    private JCheckBox sendKeepAliveBox =
-        new SIPCommCheckBox(Resources.getString("enableKeepAlive"));
+    private JCheckBox sendKeepAliveBox = new SIPCommCheckBox(Resources
+        .getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"));
 
-    private JCheckBox enableAdvOpButton =
-        new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false);
+    private JCheckBox enableAdvOpButton = new SIPCommCheckBox(
+        Resources.getString(
+            "plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"),
+        false);
 
-    private JLabel resourceLabel = new JLabel(Resources.getString("resource"));
+    private JLabel resourceLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.RESOURCE"));
 
     private JTextField resourceField
         = new JTextField(JabberAccountRegistration.DEFAULT_RESOURCE);
 
-    private JLabel priorityLabel = new JLabel(Resources.getString("priority"));
+    private JLabel priorityLabel = new JLabel(
+        Resources.getString("plugin.jabberaccregwizz.PRIORITY"));
 
     private JTextField priorityField
         = new JTextField(JabberAccountRegistration.DEFAULT_PRIORITY);
 
-    private JLabel serverLabel = new JLabel(Resources.getString("server"));
+    private JLabel serverLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.SERVER"));
 
     private JTextField serverField = new JTextField();
 
-    private JLabel portLabel = new JLabel(Resources.getString("port"));
+    private JLabel portLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.PORT"));
 
     private JTextField portField
         = new JTextField(JabberAccountRegistration.DEFAULT_PORT);
@@ -99,10 +110,10 @@ public class FirstWizardPage
     private JPanel buttonPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
 
     private JTextArea registerArea = new JTextArea(Resources
-        .getString("registerNewAccountText"));
+        .getString("plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT"));
 
     private JButton registerButton = new JButton(Resources
-        .getString("registerNewAccount"));
+        .getString("plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE"));
 
     private JPanel mainPanel = new TransparentPanel();
 
@@ -172,7 +183,7 @@ public class FirstWizardPage
         userIDPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
 
         userIDPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("userIDAndPassword")));
+            .getString("plugin.jabberaccregwizz.USERNAME_AND_PASSWORD")));
 
         mainPanel.add(userIDPassPanel);
 
@@ -262,7 +273,7 @@ public class FirstWizardPage
         advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
 
         advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("advancedOptions")));
+            .getString("plugin.jabberaccregwizz.ADVANCED_OPTIONS")));
 
         mainPanel.add(advancedOpPanel);
 
@@ -302,7 +313,7 @@ public class FirstWizardPage
         registerPanel.add(buttonPanel);
 
         registerPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("registerNewAccount")));
+            .getString("plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE")));
 
         mainPanel.add(registerPanel);
 
@@ -369,8 +380,6 @@ public class FirstWizardPage
     {
         String userID = userIDField.getText();
 
-System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!userID" + userID);
-
         if (!wizard.isModification() && isExistingAccount(userID))
         {
             nextPageIdentifier = FIRST_PAGE_IDENTIFIER;
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
index d84bd3f..fbcf0c4 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberAccountRegistrationWizard.java
@@ -55,7 +55,8 @@ public class JabberAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer
+            .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -86,7 +87,7 @@ public class JabberAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameJabber");
+        return Resources.getString("plugin.jabberaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -96,7 +97,8 @@ public class JabberAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionJabber");
+        return Resources
+            .getString("plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -121,26 +123,33 @@ public class JabberAccountRegistrationWizard
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put(   Resources.getString("jabberUsername"),
-                            registration.getUserID());
+        summaryTable.put(
+            Resources.getString("plugin.jabberaccregwizz.USERNAME"),
+            registration.getUserID());
 
-        summaryTable.put(   Resources.getString("rememberPassword"),
-                            new Boolean(registration.isRememberPassword()));
+        summaryTable.put(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"),
+            new Boolean(registration.isRememberPassword()));
 
-        summaryTable.put(   Resources.getString("server"),
-                            registration.getServerAddress());
+        summaryTable.put(
+            Resources.getString("plugin.jabberaccregwizz.SERVER"),
+            registration.getServerAddress());
 
-        summaryTable.put(   Resources.getString("port"),
-                            String.valueOf(registration.getPort()));
+        summaryTable.put(
+            Resources.getString("plugin.jabberaccregwizz.PORT"),
+            String.valueOf(registration.getPort()));
 
-        summaryTable.put(   Resources.getString("enableKeepAlive"),
+        summaryTable.put(
+            Resources.getString("plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE"),
             String.valueOf(registration.isSendKeepAlive()));
 
-        summaryTable.put(   Resources.getString("resource"),
-                            registration.getResource());
+        summaryTable.put(
+            Resources.getString("plugin.jabberaccregwizz.RESOURCE"),
+            registration.getResource());
 
-        summaryTable.put(   Resources.getString("priority"),
-                            String.valueOf(registration.getPriority()));
+        summaryTable.put(
+            Resources.getString("plugin.jabberaccregwizz.PRIORITY"),
+            String.valueOf(registration.getPriority()));
 
         return summaryTable.entrySet().iterator();
     }
@@ -253,7 +262,7 @@ public class JabberAccountRegistrationWizard
             logger.warn("Failed to create a jabber account.", exc);
             JabberAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException exc)
@@ -261,7 +270,7 @@ public class JabberAccountRegistrationWizard
             logger.warn("Failed to create a jabber account.", exc);
             JabberAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java
index 0c5217e..3ed3a70 100644
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/JabberNewAccountDialog.java
@@ -52,15 +52,21 @@ public class JabberNewAccountDialog
     private JPanel westPanel = new TransparentPanel(new BorderLayout(10, 10));
 
     // Labels
-    private JLabel serverLabel = new JLabel(Resources.getString("cserver"));
+    private JLabel serverLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.CSERVER"));
 
-    private JLabel userIDLabel = new JLabel(Resources.getString("userID"));
+    private JLabel userIDLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
-    private JLabel pass2Label = new JLabel(Resources.getString("password2"));
+    private JLabel pass2Label
+        = new JLabel(Resources.getString(
+            "plugin.jabberaccregwizz.PASSWORD_CONFIRM"));
 
-    private JLabel portLabel = new JLabel(Resources.getString("port"));
+    private JLabel portLabel
+        = new JLabel(Resources.getString("plugin.jabberaccregwizz.PORT"));
 
     private JLabel westIconLabel = new JLabel();
 
@@ -108,7 +114,8 @@ public class JabberNewAccountDialog
     {
         this.setSize(new Dimension(450, 250));
         this.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        this.setTitle(Resources.getString("newAccountTitle"));
+        this.setTitle(
+            Resources.getString("plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE"));
         this.setModal(true);
         this.setGlassPane(loadingAccountGlassPane);
 
@@ -147,18 +154,27 @@ public class JabberNewAccountDialog
         {
             if (exc.getXMPPError().getCode() == 409)
             {
-                JOptionPane.showMessageDialog(null, Resources
-                    .getString("userExist"), Resources.getString("xmppError"),
+                JOptionPane.showMessageDialog(
+                    null,
+                    Resources.getString(
+                        "plugin.jabberaccregwizz.USER_EXISTS_ERROR"),
+                    Resources.getString(
+                        "plugin.jabberaccregwizz.XMPP_ERROR"),
                     JOptionPane.ERROR_MESSAGE);
-                
+
                 logger.error(
-                    "Error when created a new Jabber account : user already exist");
+                    "Error when created a new Jabber account :" +
+                    " user already exist");
             }
             else
             {
-                JOptionPane.showMessageDialog(null, Resources
-                    .getString("unknownXmppError"), Resources
-                    .getString("xmppError"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(
+                    null,
+                    Resources.getString(
+                        "plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR"),
+                    Resources.getString(
+                        "plugin.jabberaccregwizz.XMPP_ERROR"),
+                    JOptionPane.ERROR_MESSAGE);
             }
             return false;
         }
@@ -195,8 +211,10 @@ public class JabberNewAccountDialog
         userIDPassPanel.add(labelsPanel, BorderLayout.WEST);
         userIDPassPanel.add(valuesPanel, BorderLayout.CENTER);
 
-        chooseButton.setText(Resources.getString("chooseLabel"));
-        chooseButton.setMnemonic(Resources.getMnemonic("chooseLabel"));
+        chooseButton.setText(
+            Resources.getString("plugin.jabberaccregwizz.CHOOSE"));
+        chooseButton.setMnemonic(
+            Resources.getMnemonic("plugin.jabberaccregwizz.CHOOSE"));
 
         westIconLabel.setBorder(BorderFactory.createCompoundBorder(
             BorderFactory.createEmptyBorder(20, 20, 20, 20), BorderFactory
@@ -264,9 +282,13 @@ public class JabberNewAccountDialog
                 }
                 else
                 {
-                    JOptionPane.showMessageDialog(null, Resources
-                        .getString("notSamePassword"), Resources
-                        .getString("xmppError"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(
+                        null,
+                        Resources.getString(
+                            "plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION"),
+                        Resources.getString(
+                            "plugin.jabberaccregwizz.XMPP_ERROR"),
+                        JOptionPane.ERROR_MESSAGE);
                 }
             }
         });
@@ -280,12 +302,12 @@ public class JabberNewAccountDialog
             }
         });
 
-        okButton.setText(Resources.getString("okLabel"));
-        okButton.setMnemonic(Resources.getMnemonic("okLabel"));
+        okButton.setText(Resources.getString("service.gui.OK"));
+        okButton.setMnemonic(Resources.getMnemonic("service.gui.OK"));
         okButton.setEnabled(false);
 
-        cancelButton.setText(Resources.getString("cancelLabel"));
-        cancelButton.setMnemonic(Resources.getMnemonic("cancelLabel"));
+        cancelButton.setText(Resources.getString("service.gui.CANCEL"));
+        cancelButton.setMnemonic(Resources.getMnemonic("service.gui.CANCEL"));
 
         buttonBox.setBorder(new EmptyBorder(new Insets(5, 10, 5, 10)));
         buttonBox.add(okButton);
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java
index 155bbef..e67e7ad 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigForm.java
@@ -33,7 +33,7 @@ public class KeybindingsConfigForm
     public String getTitle()
     {
         return KeybindingChooserActivator.getResources()
-            .getI18NString("keybindings");
+            .getI18NString("plugin.keybindings.PLUGIN_NAME");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
index 6ecd153..5a8e35e 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/KeybindingsConfigPanel.java
@@ -12,9 +12,9 @@ import java.util.*;
 
 import javax.swing.*;
 
+import net.java.sip.communicator.service.keybindings.*;
 import chooser.*;
 
-import net.java.sip.communicator.service.keybindings.*;
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -74,7 +74,10 @@ public class KeybindingsConfigPanel
 
         add(chooserPanes);
 
-        JButton apply = new JButton("Apply");
+        JButton apply = new JButton(
+            KeybindingChooserActivator.getResources()
+                .getI18NString("service.gui.APPLY"));
+
         apply.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent event)
diff --git a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
index cac2b95..bfdd83c 100644
--- a/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/mailbox/MailboxConfigurationForm.java
@@ -12,8 +12,9 @@ import java.io.*;
 
 import javax.swing.*;
 
-import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.configuration.*;
+import net.java.sip.communicator.service.gui.*;
+
 import net.java.sip.communicator.util.swing.*;
 
 /**
@@ -26,23 +27,35 @@ public class MailboxConfigurationForm
     extends TransparentPanel
     implements ConfigurationForm, ActionListener
 {
-    private JLabel jlblOutgoingMessage = new JLabel(
-                                Resources.getString("outgoing"));
+    private JLabel jlblOutgoingMessage
+        = new JLabel(Resources.getString("plugin.mailbox.OUTGOING"));
+
     private JFileChooser  jfcOutgoingMessage = new JFileChooser();
-    private JButton jbtnOutgoingMessage = new JButton(
-                                    Resources.getString("browse"));
+
+    private JButton jbtnOutgoingMessage
+        = new JButton(Resources.getString("plugin.mailbox.BROWSE"));
+
     private JTextField jtfOutgoingMessage = new JTextField();
-    private JPanel jpOutgoingMessage = new TransparentPanel
-                                (new FlowLayout(FlowLayout.LEFT));
-    private JLabel jlblIncomingMessage = new JLabel(
-                                    Resources.getString("incoming"));
+
+    private JPanel jpOutgoingMessage
+        = new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
+
+    private JLabel jlblIncomingMessage
+        = new JLabel(Resources.getString("plugin.mailbox.INCOMING"));
+
     private JFileChooser  jfcIncomingMessage = new JFileChooser();
-    private JButton jbtnIncomingMessage = new JButton(
-                                    Resources.getString("browse"));
+
+    private JButton jbtnIncomingMessage
+        = new JButton(Resources.getString("plugin.mailbox.BROWSE"));
+
     private JTextField jtfIncomingMessage = new JTextField();
-    private JPanel jpIncomingMessage = new TransparentPanel(
-                                new FlowLayout(FlowLayout.LEFT));
-    private JLabel jlblWaitTime = new JLabel(Resources.getString("waitTime"));
+
+    private JPanel jpIncomingMessage
+        = new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
+
+    private JLabel jlblWaitTime
+        = new JLabel(Resources.getString("plugin.mailbox.WAIT_TIME"));
+
     private JSpinner jsWaitTime = new JSpinner(new SpinnerNumberModel(
                                                 new Integer(10000),
                                                 new Integer(0),
@@ -52,20 +65,26 @@ public class MailboxConfigurationForm
     private JPanel jpWaitTime =
         new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
 
-    private JLabel jlblMaxMessageTime = new JLabel(
-                            Resources.getString("maxMessageTime"));
+    private JLabel jlblMaxMessageTime
+        = new JLabel(Resources.getString("plugin.mailbox.MAX_MESSAGE_TIME"));
+
     private JSpinner jsMaxMessageTime = new JSpinner(new SpinnerNumberModel(
                                                 new Integer(10000),
                                                 new Integer(0),
                                                 null,
                                                 new Integer(1000)));
+
     private JPanel jpMaxMessageTime = new TransparentPanel(
                                     new FlowLayout(FlowLayout.LEFT));
 
-    private JButton jbtnConfirm = new JButton(Resources.getString("confirm"));
-    private JButton jbtnDefault = new JButton(Resources.getString("default"));
+    private JButton jbtnConfirm
+        = new JButton(Resources.getString("plugin.mailbox.CONFIRM"));
+    private JButton jbtnDefault
+        = new JButton(Resources.getString("plugin.mailbox.DEFAULTS"));
+
     private JPanel jpConfirmDefault = new TransparentPanel();
     ConfigurationService config;
+
     public MailboxConfigurationForm()
     {
 
@@ -208,7 +227,7 @@ public class MailboxConfigurationForm
      */
     public String getTitle()
     {
-        return Resources.getString("mailbox");
+        return Resources.getString("plugin.mailbox.MAILBOX");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java
index 7b33402..b53e50c 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/FirstWizardPage.java
@@ -37,12 +37,14 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel uinLabel = new JLabel(Resources.getString("id"));
+    private JLabel uinLabel
+        = new JLabel(Resources.getString("plugin.msnaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
     private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("existingAccount"));
+        new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
@@ -53,7 +55,8 @@ public class FirstWizardPage
     private JPasswordField passField = new JPasswordField();
 
     private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+        new SIPCommCheckBox(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"));
 
     private JPanel mainPanel = new TransparentPanel();
 
@@ -123,7 +126,7 @@ public class FirstWizardPage
         uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
 
         uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("msnUinAndPassword")));
+            .getString("plugin.msnaccregwizz.USERNAME_AND_PASSWORD")));
 
         mainPanel.add(uinPassPanel);
         this.add(mainPanel, BorderLayout.NORTH);
@@ -259,7 +262,7 @@ public class FirstWizardPage
     }
 
     /**
-     * Fills the UIN and Password fields in this panel with the data comming
+     * Fills the UIN and Password fields in this panel with the data coming
      * from the given protocolProvider.
      *
      * @param protocolProvider The <tt>ProtocolProviderService</tt> to load
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
index 27f977d..8009f14 100644
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/MsnAccountRegistrationWizard.java
@@ -46,7 +46,8 @@ public class MsnAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer
+            .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -79,7 +80,7 @@ public class MsnAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameMsn");
+        return Resources.getString("plugin.msnaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -91,7 +92,7 @@ public class MsnAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionMsn");
+        return Resources.getString("plugin.msnaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -118,9 +119,10 @@ public class MsnAccountRegistrationWizard
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put(Resources.getString("id"), registration.getId());
-        summaryTable.put(Resources.getString("rememberPassword"),
-            new Boolean(registration.isRememberPassword()));
+        summaryTable.put(   Resources.getString("plugin.msnaccregwizz.USERNAME"),
+                            registration.getId());
+        summaryTable.put(   Resources.getString("service.gui.REMEMBER_PASSWORD"),
+                            new Boolean(registration.isRememberPassword()));
 
         return summaryTable.entrySet().iterator();
     }
@@ -203,14 +205,14 @@ public class MsnAccountRegistrationWizard
         {
             MsnAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException e)
         {
             MsnAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java
index a8732de..fae6a07 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationForm.java
@@ -52,6 +52,6 @@ public class NotificationConfigurationForm
      */
     public String getTitle()
     {
-        return Resources.getString("notifications");
+        return Resources.getString("service.gui.NOTIFICATIONS");
     }
 }
\ No newline at end of file
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
index 2dc6194..72d93a4 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/NotificationConfigurationPanel.java
@@ -125,7 +125,7 @@ public class NotificationConfigurationPanel
 
         // Initializing variable part of the "actions"
         TitledBorder title1 = BorderFactory.createTitledBorder(
-                Resources.getString("actions"));
+                Resources.getString("plugin.notificationconfig.ACTIONS"));
         actions.setBorder(title1);
 
         JPanel activateDescactivatePanel = new TransparentPanel();
@@ -133,16 +133,19 @@ public class NotificationConfigurationPanel
         layoutADP.setHgap(75);
         activateDescactivatePanel.setLayout(layoutADP);
 
-        activate = new JButton(Resources.getString("activate"));
+        activate = new JButton(Resources.getString("service.gui.ACTIVATE"));
         activate.setMinimumSize(new Dimension(150,30));
         activate.setPreferredSize(new Dimension(150,30));
         activate.addActionListener(this);
-        desactivate = new JButton(Resources.getString("deactivate"));
+        desactivate = new JButton(
+            Resources.getString("service.gui.DEACTIVATE"));
         desactivate.setMinimumSize(new Dimension(150,30));
         desactivate.setPreferredSize(new Dimension(150,30));
         desactivate.addActionListener(this);
-        playSoundCheckBox =
-            new SIPCommCheckBox(Resources.getString("playsound"));
+
+        playSoundCheckBox = new SIPCommCheckBox(
+            Resources.getString("plugin.notificationconfig.PLAY_SOUND"));
+
         playSoundCheckBox.addItemListener(this);
         playSoundButton = new JButton(
                 new ImageIcon(Resources.getImageInBytes(
@@ -160,7 +163,10 @@ public class NotificationConfigurationPanel
         soundFileChooser.setMinimumSize(new Dimension(30,30));
         soundFileChooser.setPreferredSize(new Dimension(30,30));
         soundFileChooser.addActionListener(this);
-        programCheckBox = new SIPCommCheckBox(Resources.getString("execprog"));
+
+        programCheckBox = new SIPCommCheckBox(
+            Resources.getString("plugin.notificationconfig.EXEC_PROG"));
+
         programCheckBox.addItemListener(this);
         programFileTextField = new JTextField();
         programFileTextField.setMinimumSize(new Dimension(250,30));
@@ -172,8 +178,10 @@ public class NotificationConfigurationPanel
         programFileChooser.setMinimumSize(new Dimension(30,30));
         programFileChooser.setPreferredSize(new Dimension(30,30));
         programFileChooser.addActionListener(this);
-        popupCheckBox =
-            new SIPCommCheckBox(Resources.getString("displaypopup"));
+
+        popupCheckBox = new SIPCommCheckBox(
+            Resources.getString("plugin.notificationconfig.DISPLAY_POPUP"));
+
         popupCheckBox.addItemListener(this);
 
 
@@ -293,14 +301,16 @@ public class NotificationConfigurationPanel
         comboBoxTurnOn.addActionListener(this);
         comboBoxTurnOff = new JComboBox(textComboBox);
         comboBoxTurnOff.addActionListener(this);
-        turnOnAll = new JButton(Resources.getString("turnonall"));
+        turnOnAll = new JButton(
+            Resources.getString("plugin.notificationconfig.TURN_ON_ALL"));
         turnOnAll.addActionListener(this);
-        turnOffAll = new JButton(Resources.getString("turnoffall"));
+        turnOffAll = new JButton(
+            Resources.getString("plugin.notificationconfig.TURN_OFF_ALL"));
         turnOffAll.addActionListener(this);
 
 
         TitledBorder title2 = BorderFactory.createTitledBorder(
-                Resources.getString("quickcontrols"));
+                Resources.getString("plugin.notificationconfig.QUICK_CONTROLS"));
         quickControl.setLayout(new FlowLayout(FlowLayout.CENTER,2,2));
         quickControl.setBorder(title2);
         quickControl.add(turnOnAll);
@@ -330,9 +340,11 @@ public class NotificationConfigurationPanel
         constraints.weightx = 1.0;
         constraints.fill = GridBagConstraints.BOTH;
 
-        restore = new JButton(Resources.getString("restore"));
+        restore = new JButton(
+            Resources.getString("plugin.notificationconfig.RESTORE"));
         restore.addActionListener(this);
-        apply = new JButton(Resources.getString("apply"));
+        apply = new JButton(
+            Resources.getString("service.gui.APPLY"));
         apply.addActionListener(this);
         applyPanel.setLayout(new BorderLayout(5,2));
         applyPanel.add(apply, BorderLayout.EAST);
@@ -340,7 +352,6 @@ public class NotificationConfigurationPanel
         gridLayoutGlobal.setConstraints(applyPanel, constraints);
         this.add(applyPanel);
 
-
         notificationService
                 = NotificationConfigurationActivator.getNotificationService();
         notificationService.addNotificationChangeListener(this);
@@ -407,16 +418,19 @@ public class NotificationConfigurationPanel
             {
                 try
                 {
-                    NotificationsTableEntry tmpNTE = (NotificationsTableEntry) dataVector.elementAt(index);
+                    NotificationsTableEntry tmpNTE
+                        = (NotificationsTableEntry) dataVector.elementAt(index);
                     File file = fileChooserSound.getSelectedFile();
                     //This is where a real application would open the file.
-                    logger.debug("Opening: " + file.toURI().toURL().toExternalForm());
+                    logger.debug("Opening: "
+                            + file.toURI().toURL().toExternalForm());
                     tmpNTE.setSoundFile(file.toURI().toURL().toExternalForm());
                     tmpNTE.setSound(true);
                     tmpNTE.setModify(true);
                     this.updateTableRow(tmpNTE, index);
                     notificationList.setLine(tmpNTE, index);
-                    soundFileTextField.setText(file.toURI().toURL().toExternalForm());
+                    soundFileTextField.setText(
+                        file.toURI().toURL().toExternalForm());
                 }
                 catch (MalformedURLException ex)
                 {
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java b/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
index 30ecb87..20af79a 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/ManageButtonsPanel.java
@@ -30,21 +30,22 @@ public class ManageButtonsPanel
     private Logger logger = Logger.getLogger(ManageButtonsPanel.class);
 
     private JButton deactivateButton = new JButton(
-            Resources.getString("deactivate"));
+            Resources.getString("service.gui.DEACTIVATE"));
 
     private JButton activateButton = new JButton(
-            Resources.getString("activate"));
+            Resources.getString("service.gui.ACTIVATE"));
 
     private JButton uninstallButton = new JButton(
-            Resources.getString("uninstall"));
+            Resources.getString("plugin.pluginmanager.UNINSTALL"));
 
     private JButton updateButton = new JButton(
-            Resources.getString("update"));
+            Resources.getString("plugin.pluginmanager.UPDATE"));
 
-    private JButton newButton = new JButton(Resources.getString("new"));
+    private JButton newButton
+        = new JButton(Resources.getString("plugin.pluginmanager.NEW"));
 
-    private JCheckBox showSysBundlesCheckBox =
-        new SIPCommCheckBox(Resources.getString("showSystemBundles"));
+    private JCheckBox showSysBundlesCheckBox = new SIPCommCheckBox(
+            Resources.getString("plugin.pluginmanager.SHOW_SYSTEM_BUNDLES"));
 
     private JPanel buttonsPanel =
         new TransparentPanel(new GridLayout(0, 1, 8, 8));
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java b/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
index 0b30e6d..d79823c 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/NewBundleDialog.java
@@ -22,23 +22,27 @@ public class NewBundleDialog
     extends SIPCommDialog
     implements ActionListener
 {
-    private JButton installButton = new JButton(Resources.getString("install"));
+    private JButton installButton
+        = new JButton(Resources.getString("plugin.pluginmanager.INSTALL"));
     
-    private JButton cancelButton = new JButton(Resources.getString("cancel"));
+    private JButton cancelButton
+        = new JButton(Resources.getString("service.gui.CANCEL"));
     
     private JTextField bundlePathField = new JTextField();
     
-    private JLabel bundlePathLabel = new JLabel(Resources.getString("url") + ": ");
+    private JLabel bundlePathLabel
+        = new JLabel(Resources.getString("plugin.pluginmanager.URL") + ": ");
     
-    private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
+    private JPanel buttonsPanel
+        = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
     
     private JPanel dataPanel = new TransparentPanel(new BorderLayout(5, 5));
     
     private JPanel mainPanel = new TransparentPanel(new BorderLayout());
-
-    private JButton fileChooserButton =
-        new JButton(Resources.getString("chooseFile"));
-
+    
+    private JButton fileChooserButton = new JButton(
+        Resources.getString("plugin.pluginmanager.CHOOSE_FILE"));
+    
     public NewBundleDialog ()
     {
         this.mainPanel.setPreferredSize(new Dimension(450, 150));
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
index 19b4544..33360cb 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginListCellRenderer.java
@@ -52,7 +52,7 @@ public class PluginListCellRenderer extends JPanel
     private JLabel iconLabel = new JLabel();
     
     private JLabel systemLabel
-        = new JLabel("( " + Resources.getString("system") + " )");
+        = new JLabel("( " + Resources.getString("plugin.pluginmanager.SYSTEM") + " )");
     
     private boolean isSelected = false;
     
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java
index 7265400..e13880e 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerConfigForm.java
@@ -26,7 +26,7 @@ public class PluginManagerConfigForm
      */
     public String getTitle()
     {
-        return Resources.getString("plugins");
+        return Resources.getString("plugin.pluginmanager.PLUGINS");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java b/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java
index f02b6ac..2895297 100644
--- a/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java
+++ b/src/net/java/sip/communicator/plugin/profiler4j/SettingsWindowMenuEntry.java
@@ -19,7 +19,7 @@ import net.sf.profiler4j.console.*;
 

 public class SettingsWindowMenuEntry implements PluginComponent

 {

-    private static final String PROFILER_NAME = "profiler";

+    private static final String PROFILER_NAME = "plugin.profiler.PLUGIN_NAME";

     private JMenuItem settingsMenuEntry;

     private Container container;

 

@@ -33,7 +33,7 @@ public class SettingsWindowMenuEntry implements PluginComponent
                 Prefs prefs = new Prefs();

 

                 System.setProperty("swing.aatext", 

-                		String.valueOf(prefs.isAntialiasing()));          

+                		String.valueOf(prefs.isAntialiasing()));

                 

                 final Console app = new Console(prefs);

                 app.connect();

diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
index b5a6288..6814fc5 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/FirstWizardPage.java
@@ -33,22 +33,22 @@ public class FirstWizardPage
     private JPanel labelsPanel = new TransparentPanel();
 
     private JLabel infoTitle= new JLabel(
-        Resources.getString("rssAccountInfoTitle"));
+        Resources.getString("plugin.rssaccregwizz.ACCOUNT_INFO_TITLE"));
 
     private JPanel infoTitlePanel
         = new TransparentPanel(new FlowLayout(FlowLayout.CENTER));
 
-    private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("rssAccountExist"));
+    private JLabel existingAccountLabel = new JLabel(
+        Resources.getString("plugin.rssaccregwizz.ERROR_ACCOUNT_EXISTS"));
 
     private JPanel existingAccountPanel =
         new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
 
     private JTextArea accountInfoArea = new JTextArea(
-        Resources.getString("rssAccountInfo"));
+        Resources.getString("plugin.rssaccregwizz.ACCOUNT_INFO"));
 
-    private JLabel accountInfoAttentionArea
-        = new JLabel(Resources.getString("rssAccountAttention"));
+    private JLabel accountInfoAttentionArea = new JLabel(
+        Resources.getString("plugin.rssaccregwizz.ACCOUNT_ATTENTION"));
 
     private JPanel accountInfoAttentionPanel
         = new TransparentPanel(new FlowLayout(FlowLayout.LEFT));
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
index 36511eb..7861842 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/RssAccountRegistrationWizard.java
@@ -55,7 +55,7 @@ public class RssAccountRegistrationWizard
         this.wizardContainer = wizardContainer;
 
         this.wizardContainer
-            .setFinishButtonText(Resources.getString("activate"));
+            .setFinishButtonText(Resources.getString("service.gui.ACTIVATE"));
     }
 
     /**
@@ -86,7 +86,7 @@ public class RssAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameRss");
+        return Resources.getString("plugin.rssaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -96,7 +96,7 @@ public class RssAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionRss");
+        return Resources.getString("plugin.rssaccregwizz.PROTICOL_DESCRIPTION");
     }
 
     /**
@@ -186,14 +186,14 @@ public class RssAccountRegistrationWizard
         {
             RssAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                        Resources.getString("error"),
+                        Resources.getString("service.gui.ERROR"),
                         PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException e)
         {
             RssAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                        Resources.getString("error"),
+                        Resources.getString("service.gui.ERROR"),
                         PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
index 3084289..921a0c5 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/InitialAccountRegistrationFrame.java
@@ -42,7 +42,7 @@ public class InitialAccountRegistrationFrame
 
     private JPanel accountsPanel = new JPanel(new GridLayout(0, 2, 10, 10));
 
-    private JButton signinButton = new JButton(Resources.getString("signin"));
+    private JButton signinButton = new JButton(Resources.getString("service.gui.SIGN_IN"));
 
     private Collection registrationForms = new Vector();
 
@@ -56,11 +56,12 @@ public class InitialAccountRegistrationFrame
         MainPanel mainPanel = new MainPanel(new BorderLayout(5, 5));
         JPanel messageAreaPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
         JTextArea messageArea =
-            new JTextArea(Resources.getString("initialAccountRegistration"));
+            new JTextArea(Resources.getString("plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION"));
         JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
-        JButton cancelButton = new JButton(Resources.getString("cancel"));
+        JButton cancelButton
+            = new JButton(Resources.getString("service.gui.CANCEL"));
 
-        this.setTitle(Resources.getString("signin"));
+        this.setTitle(Resources.getString("service.gui.SIGN_IN"));
 
         mainPanel.setBorder(BorderFactory.createEmptyBorder(20, 20, 20, 20));
 
@@ -172,7 +173,8 @@ public class InitialAccountRegistrationFrame
     {
         private JLabel protocolLabel = new JLabel();
 
-        private JLabel usernameLabel = new JLabel("Login");
+        private JLabel usernameLabel
+            = new JLabel(Resources.getString("service.gui.LOGIN"));
 
         private JLabel passwordLabel = new JLabel("Password");
 
@@ -198,12 +200,12 @@ public class InitialAccountRegistrationFrame
 
         private JLabel signupLabel
             = new JLabel("<html><a href=''>"
-                + Resources.getString("signup")
+                + Resources.getString("plugin.simpleaccregwizz.SIGNUP")
                 + "</a></html>", JLabel.RIGHT);
 
         private JLabel specialSignupLabel
             = new JLabel("<html><a href=''>"
-                + Resources.getString("specialSignup")
+                + Resources.getString("plugin.simpleaccregwizz.SPECIAL_SIGNUP")
                 + "</a></html>", JLabel.RIGHT);
 
         private AccountRegistrationWizard wizard;
@@ -362,7 +364,7 @@ public class InitialAccountRegistrationFrame
             super.paintComponent(g2d);
 
             g2d.setColor(new Color(
-                Resources.getColor("desktopBackgroundColor")));
+                Resources.getColor("service.gui.DESKTOP_BACKGROUND")));
 
             // paint the background with the chosen color
             g2d.fillRoundRect(0, 0, getWidth(), getHeight(), 15, 15);
@@ -449,7 +451,7 @@ public class InitialAccountRegistrationFrame
     }
 
     /**
-     * Handles the event triggered by the "Signin" button.
+     * Handles the event triggered by the "service.gui.SIGN_IN" button.
      */
     private class SigninActionListener implements ActionListener
     {
@@ -501,7 +503,7 @@ public class InitialAccountRegistrationFrame
             super.paintComponent(g2d);
 
             g2d.setColor(new Color(
-                Resources.getColor("accountRegistrationBackground")));
+                Resources.getColor("plugin.simpleaccreg.ACCOUNT_REGISTRATION_BACKGROUND")));
 
             // paint the background with the chosen color
             g2d.fillRoundRect(10, 10, getWidth() - 20, getHeight() - 20, 15, 15);
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
index 8e24b5f..679d1da 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/FirstWizardPage.java
@@ -29,7 +29,8 @@ public class FirstWizardPage
 {
     public static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier";
 
-    public static final String USER_NAME_EXAMPLE = "Ex: john@voiphone.net or simply \"john\" for no server";
+    public static final String USER_NAME_EXAMPLE
+        = "Ex: john@voiphone.net or simply \"john\" for no server";
 
     private JPanel firstTabPanel = new TransparentPanel(new BorderLayout());
 
@@ -39,48 +40,58 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel uinLabel = new JLabel(Resources.getString("id"));
+    private JLabel uinLabel
+        = new JLabel(Resources.getString("plugin.sipaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
     private JLabel uinExampleLabel = new JLabel(USER_NAME_EXAMPLE);
 
     private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("existingAccount"));
+        new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JTextField uinField = new JTextField();
 
     private JPasswordField passField = new JPasswordField();
 
     private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+        new SIPCommCheckBox(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"));
 
-    private JPanel advancedOpPanel = new TransparentPanel(new BorderLayout(10, 10));
+    private JPanel advancedOpPanel
+        = new TransparentPanel(new BorderLayout(10, 10));
 
-    private JPanel labelsAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+    private JPanel labelsAdvOpPanel
+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
-    private JPanel valuesAdvOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
+    private JPanel valuesAdvOpPanel
+        = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
     private JCheckBox enableAdvOpButton =
-        new SIPCommCheckBox(Resources.getString("ovverideServerOps"), false);
+        new SIPCommCheckBox(Resources.getString(
+            "plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS"), false);
 
-    private JCheckBox enableDefaultEncryption = 
-        new JCheckBox(Resources.getString("enableDefaultEncryption"), false); 
+    private JLabel serverLabel
+        = new JLabel(Resources.getString("plugin.sipaccregwizz.REGISTRAR"));
 
-    private JLabel serverLabel = new JLabel(Resources.getString("registrar"));
+    private JCheckBox enableDefaultEncryption = 
+        new JCheckBox(Resources.getString("plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), false); 
 
-    private JLabel proxyLabel = new JLabel(Resources.getString("proxy"));
+    private JLabel proxyLabel
+        = new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY"));
 
     private JLabel serverPortLabel =
-        new JLabel(Resources.getString("serverPort"));
+        new JLabel(Resources.getString("plugin.sipaccregwizz.SERVER_PORT"));
 
     private JLabel proxyPortLabel =
-        new JLabel(Resources.getString("proxyPort"));
+        new JLabel(Resources.getString("plugin.sipaccregwizz.PROXY_PORT"));
 
     private JLabel transportLabel =
-        new JLabel(Resources.getString("preferredTransport"));
+        new JLabel(Resources.getString(
+            "plugin.sipaccregwizz.PREFERRED_TRANSPORT"));
 
     private JTextField serverField = new JTextField();
 
@@ -104,17 +115,18 @@ public class FirstWizardPage
 
     private JPanel valuesPresOpPanel = new TransparentPanel(new GridLayout(0, 1, 10, 10));
 
-    private JCheckBox enablePresOpButton =
-        new SIPCommCheckBox(Resources.getString("enablePresence"), true);
+    private JCheckBox enablePresOpButton = new JCheckBox(
+        Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"),
+        true);
 
-    private JCheckBox forceP2PPresOpButton =
-        new SIPCommCheckBox(Resources.getString("forceP2PPresence"), true);
+    private JCheckBox forceP2PPresOpButton = new JCheckBox(
+        Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"), true);
 
-    private JLabel pollPeriodLabel =
-        new JLabel(Resources.getString("offlineContactPollingPeriod"));
+    private JLabel pollPeriodLabel = new JLabel(
+        Resources.getString("plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"));
 
-    private JLabel subscribeExpiresLabel =
-        new JLabel(Resources.getString("subscriptionExpiration"));
+    private JLabel subscribeExpiresLabel = new JLabel(
+        Resources.getString("plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"));
 
     private JTextField pollPeriodField
         = new JTextField(SIPAccountRegistration.DEFAULT_POLL_PERIOD);
@@ -128,14 +140,14 @@ public class FirstWizardPage
 
     private JPanel keepAliveValues = new TransparentPanel(new GridLayout(0, 1, 5, 5));
 
-    private JLabel keepAliveMethodLabel
-        = new JLabel(Resources.getString("keepAliveMethod"));
+    private JLabel keepAliveMethodLabel = new JLabel(
+        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"));
 
-    private JLabel keepAliveIntervalLabel
-        = new JLabel(Resources.getString("keepAliveInterval"));
+    private JLabel keepAliveIntervalLabel = new JLabel(
+        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"));
 
-    private JLabel keepAliveIntervalExampleLabel
-        = new JLabel(Resources.getString("keepAliveIntervalEx"));
+    private JLabel keepAliveIntervalExampleLabel = new JLabel(
+        Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO"));
 
     private JComboBox keepAliveMethodBox
         = new JComboBox(new Object []
@@ -215,11 +227,11 @@ public class FirstWizardPage
         uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
 
         uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("sipUinAndPassword")));
+            .getString("plugin.sipaccregwizz.USERNAME_AND_PASSWORD")));
 
         firstTabPanel.add(uinPassPanel, BorderLayout.NORTH);
 
-        tabbedPane.addTab(  Resources.getString("summary"),
+        tabbedPane.addTab(  Resources.getString("service.gui.SUMMARY"),
                             firstTabPanel);
 
         serverField.setEnabled(false);
@@ -278,7 +290,7 @@ public class FirstWizardPage
         advancedOpPanel.add(valuesAdvOpPanel, BorderLayout.CENTER);
 
         advancedOpPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("advancedOptions")));
+            .getString("plugin.aimaccregwizz.ADVANCED_OPTIONS")));
 
         advancedPanel.add(advancedOpPanel);
 
@@ -310,7 +322,7 @@ public class FirstWizardPage
         presenceOpPanel.add(valuesPresOpPanel, BorderLayout.CENTER);
 
         presenceOpPanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("presenceOptions")));
+            Resources.getString("plugin.sipaccregwizz.PRESENCE_OPTIONS")));
 
         advancedPanel.add(presenceOpPanel);
 
@@ -343,11 +355,13 @@ public class FirstWizardPage
         keepAlivePanel.add(keepAliveValues, BorderLayout.CENTER);
 
         keepAlivePanel.setBorder(BorderFactory.createTitledBorder(
-            Resources.getString("keepAlive")));
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE")));
 
         advancedPanel.add(keepAlivePanel);
 
-        tabbedPane.addTab("Advanced", advancedPanel);
+        tabbedPane.addTab(
+            Resources.getString("service.gui.ADVANCED"),
+            advancedPanel);
 
         this.add(tabbedPane, BorderLayout.NORTH);
     }
diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
index e306350..53ec4cc 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationWizard.java
@@ -51,7 +51,8 @@ public class SIPAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer.setFinishButtonText(
+            Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -81,7 +82,7 @@ public class SIPAccountRegistrationWizard
      * @return String
      */
     public String getProtocolName() {
-        return Resources.getString("protocolNameSip");
+        return Resources.getString("plugin.sipaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -90,7 +91,7 @@ public class SIPAccountRegistrationWizard
      * @return String
      */
     public String getProtocolDescription() {
-        return Resources.getString("protocolDescriptionSip");
+        return Resources.getString("plugin.sipaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -118,55 +119,84 @@ public class SIPAccountRegistrationWizard
 
         String rememberPswdString;
         if(rememberPswd)
-            rememberPswdString = Resources.getString("yes");
+            rememberPswdString = Resources.getString("service.gui.YES");
         else
-            rememberPswdString = Resources.getString("no");
-
-        summaryTable.put(Resources.getString("id"),
-                registration.getId());
-        summaryTable.put(Resources.getString("rememberPassword"),
-                rememberPswdString);
-        summaryTable.put(Resources.getString("registrar"),
-                registration.getServerAddress());
-        summaryTable.put(Resources.getString("serverPort"),
-                registration.getServerPort());
-        summaryTable.put(Resources.getString("proxy"),
-                registration.getProxy());
-        summaryTable.put(Resources.getString("proxyPort"),
-                registration.getProxyPort());
-        summaryTable.put(Resources.getString("preferredTransport"),
-                registration.getPreferredTransport());
-        
-        if (registration.isEnablePresence()) {
-            summaryTable.put(Resources.getString("enablePresence"),
-                Resources.getString("yes"));
-        } else {
-            summaryTable.put(Resources.getString("enablePresence"),
-                    Resources.getString("no"));
+            rememberPswdString = Resources.getString("service.gui.NO");
+
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.USERNAME"),
+            registration.getId());
+        summaryTable.put(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"),
+            rememberPswdString);
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.REGISTRAR"),
+            registration.getServerAddress());
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.SERVER_PORT"),
+            registration.getServerPort());
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.PROXY"),
+            registration.getProxy());
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.PROXY_PORT"),
+            registration.getProxyPort());
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.PREFERRED_TRANSPORT"),
+            registration.getPreferredTransport());
+
+        if (registration.isEnablePresence())
+        {
+            summaryTable.put(
+                Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"),
+                Resources.getString("service.gui.YES"));
+        }
+        else
+        {
+            summaryTable.put(
+                Resources.getString("plugin.sipaccregwizz.ENABLE_PRESENCE"),
+                Resources.getString("service.gui.NO"));
         }
-        if (registration.isForceP2PMode()) {
-            summaryTable.put(Resources.getString("forceP2PPresence"),
-                    Resources.getString("yes"));
-        } else {
-            summaryTable.put(Resources.getString("forceP2PPresence"),
-                    Resources.getString("no"));
+
+        if (registration.isForceP2PMode())
+        {
+            summaryTable.put(
+                Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"),
+                Resources.getString("service.gui.YES"));
         }
-        if (registration.isDefaultEncryption()) {
-        	summaryTable.put(Resources.getString("enableDefaultEncryption"),
-        			Resources.getString("yes"));
-        } else {
-        	summaryTable.put(Resources.getString("enableDefaultEncryption"), 
-        			Resources.getString("no"));
+        else
+        {
+            summaryTable.put(
+                Resources.getString("plugin.sipaccregwizz.FORCE_P2P_PRESENCE"),
+                Resources.getString("service.gui.NO"));
+        }
+
+        if (registration.isDefaultEncryption()) 
+        {
+            summaryTable.put(Resources.getString(
+                "plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"),
+                Resources.getString("yes"));
+        }
+        else
+        {
+            summaryTable.put(Resources.getString(
+                "plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION"), 
+                Resources.getString("no"));
         } 
-        summaryTable.put(Resources.getString("offlineContactPollingPeriod"),
+
+        summaryTable.put(Resources.getString(
+                "plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD"),
                 registration.getPollingPeriod());
-        summaryTable.put(Resources.getString("subscriptionExpiration"),
+        summaryTable.put(Resources.getString(
+                "plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION"),
                 registration.getSubscriptionExpiration());
 
-        summaryTable.put(Resources.getString("keepAliveMethod"),
-                registration.getKeepAliveMethod());
-        summaryTable.put(Resources.getString("keepAliveInterval"),
-                registration.getKeepAliveInterval());
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_METHOD"),
+            registration.getKeepAliveMethod());
+        summaryTable.put(
+            Resources.getString("plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL"),
+            registration.getKeepAliveInterval());
 
         return summaryTable.entrySet().iterator();
     }
@@ -254,9 +284,9 @@ public class SIPAccountRegistrationWizard
 
         accountProperties.put(ProtocolProviderFactory.FORCE_P2P_MODE,
                 Boolean.toString(registration.isForceP2PMode()));
-        
+
         accountProperties.put(ProtocolProviderFactory.DEFAULT_ENCRYPTION, 
-        		Boolean.toString(registration.isDefaultEncryption())); 
+                Boolean.toString(registration.isDefaultEncryption())); 
 
         accountProperties.put(ProtocolProviderFactory.POLLING_PERIOD,
                 registration.getPollingPeriod());
@@ -296,14 +326,14 @@ public class SIPAccountRegistrationWizard
         {
             SIPAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException exc)
         {
             SIPAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
index b934f32..82cc6ba 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/FirstWizardPage.java
@@ -41,16 +41,17 @@ public class FirstWizardPage
     
     private JPanel valuesPanel = new TransparentPanel();
     
-    private JLabel accountID = new JLabel(Resources.getString("accountID"));
+    private JLabel accountID
+        = new JLabel(Resources.getString("plugin.sshaccregwizz.USERNAME"));
     
-    private JLabel identityFile = new JLabel(Resources.getString(
-                                        "identityFile"));
+    private JLabel identityFile
+        = new JLabel(Resources.getString("plugin.sshaccregwizz.IDENTITY_FILE"));
     
-    private JLabel knownHostsFile = new JLabel(Resources.getString(
-                                        "knownHosts"));
+    private JLabel knownHostsFile
+        = new JLabel(Resources.getString("plugin.sshaccregwizz.KNOWN_HOSTS"));
     
     private JLabel existingAccountLabel
-            = new JLabel(Resources.getString("existingAccount"));
+        = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
     
     private JPanel emptyPanel1 = new TransparentPanel();
     
@@ -72,17 +73,21 @@ public class FirstWizardPage
     
     private JTextField accountIDField = new JTextField();
     
-    private JTextField identityFileField = new JTextField("Optional");
+    private JTextField identityFileField = new JTextField(
+        Resources.getString("plugin.sshaccregwizz.OPTIONAL"));
     
-    private JButton identityFileButton = new JButton("Browse");
+    private JButton identityFileButton = new JButton(
+        Resources.getString("service.gui.BROWSE"));
     
     private JFileChooser identityFileChooser = new JFileChooser();
     
     private JPanel identityFilePanel = new TransparentPanel();
     
-    private JTextField knownHostsFileField = new JTextField("Optional");
+    private JTextField knownHostsFileField = new JTextField(
+        Resources.getString("plugin.sshaccregwizz.KNOWN_HOSTS"));
     
-    private JButton knownHostsFileButton = new JButton("Browse");
+    private JButton knownHostsFileButton = new JButton(
+        Resources.getString("service.gui.BROWSE"));
     
     private JFileChooser knownHostsFileChooser = new JFileChooser();
     
@@ -236,7 +241,7 @@ public class FirstWizardPage
         
         accountPanel.setBorder(BorderFactory
                 .createTitledBorder(Resources.getString(
-                "accountDetails")));
+                "plugin.sshaccregwizz.ACCOUNT_DETAILS")));
         
         this.add(accountPanel, BorderLayout.NORTH);
     }
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
index b12ccc4..b2519bd 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/SSHAccountRegistrationWizard.java
@@ -63,7 +63,8 @@ public class SSHAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer.setFinishButtonText(
+            Resources.getString("service.gui.SIGN_IN"));
     }
     
     /**
@@ -92,7 +93,7 @@ public class SSHAccountRegistrationWizard
      * @return String
      */
     public String getProtocolName() {
-        return Resources.getString("protocolNameSsh");
+        return Resources.getString("plugin.sshaccregwizz.PROTOCOL_NAME");
     }
     
     /**
@@ -101,7 +102,7 @@ public class SSHAccountRegistrationWizard
      * @return String
      */
     public String getProtocolDescription() {
-        return Resources.getString("protocolDescriptionSsh");
+        return Resources.getString("plugin.sshaccregwizz.PROTOCOL_DESCRIPTION");
     }
     
     /**
@@ -208,14 +209,14 @@ public class SSHAccountRegistrationWizard
         {
             SSHAccRegWizzActivator.getUIService().getPopupDialog()
             .showMessagePopupDialog(exc.getMessage(),
-                Resources.getString("error"),
+                Resources.getString("service.gui.ERROR"),
                 PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException exc)
         {
             SSHAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         
diff --git a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
index cb9b86e..d3ff1a2 100644
--- a/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
+++ b/src/net/java/sip/communicator/plugin/updatechecker/UpdateCheckActivator.java
@@ -81,7 +81,7 @@ public class UpdateCheckActivator
             }
         };
         dialog.setTitle(
-            getResources().getI18NString("dialogTitle"));
+            getResources().getI18NString("plugin.updatechecker.DIALOG_TITLE"));
 
         JEditorPane contentMessage = new JEditorPane();
         contentMessage.setContentType("text/html");
@@ -89,15 +89,17 @@ public class UpdateCheckActivator
         contentMessage.setEditable(false);
 
         String dialogMsg =
-            getResources().getI18NString("dialogMessage1",
-            new String[]{getResources().getSettingsString("applicationName")});
+            getResources().getI18NString("plugin.updatechecker.DIALOG_MESSAGE",
+            new String[]{getResources()
+                .getSettingsString("service.gui.APPLICATION_NAME")});
 
         if(lastVersion != null)
             dialogMsg +=
                 getResources().getI18NString(
-                "dialogMessage2",
+                "plugin.updatechecker.DIALOG_MESSAGE_2",
                 new String[]{
-                    getResources().getSettingsString("applicationName"),
+                    getResources().getSettingsString(
+                        "service.gui.APPLICATION_NAME"),
                     lastVersion});
 
         contentMessage.setText(dialogMsg);
@@ -108,8 +110,8 @@ public class UpdateCheckActivator
 
         JPanel buttonPanel
             = new TransparentPanel(new FlowLayout(FlowLayout.CENTER, 10, 10));
-        JButton closeButton
-            = new JButton( getResources().getI18NString("buttonClose"));
+        JButton closeButton = new JButton(
+            getResources().getI18NString("plugin.updatechecker.BUTTON_CLOSE"));
 
         closeButton.addActionListener(new ActionListener() {
 
@@ -121,8 +123,8 @@ public class UpdateCheckActivator
 
         if(downloadLink != null)
         {
-            JButton downloadButton =
-                new JButton(getResources().getI18NString("buttonDownload"));
+            JButton downloadButton = new JButton(getResources().getI18NString(
+                "plugin.updatechecker.BUTTON_DOWNLOAD"));
 
             downloadButton.addActionListener(new ActionListener() {
 
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
index fd051bc..55a0ca5 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardMenuItem.java
@@ -25,7 +25,7 @@ public class WhiteboardMenuItem
                 ActionListener
 {
     private JMenu whiteboardMenu
-        = new JMenu(Resources.getString("whiteboardMenuItemText"));
+        = new JMenu(Resources.getString("plugin.whiteboard.MENU_ITEM"));
 
     /**
      * The current meta contact
@@ -45,7 +45,8 @@ public class WhiteboardMenuItem
     public WhiteboardMenuItem (WhiteboardSessionManager session)
     {
         this.session = session;
-        this.whiteboardMenu.setIcon (Resources.getImage ("mpenIcon"));
+        this.whiteboardMenu.setIcon (
+            Resources.getImage ("plugin.whiteboard.MPEN_ICON"));
     }
 
     /**
@@ -81,7 +82,7 @@ public class WhiteboardMenuItem
             {
                 contactItem.setEnabled(false);
                 contactItem.setToolTipText(
-                        Resources.getString("whiteboardMenuItemNotSupportedTooltip"));
+                        Resources.getString("plugin.whiteboard.NOT_SUPPORTED"));
             }
 
             this.whiteboardMenu.add(contactItem);
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
index 43c1f19..51cbebb 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/WhiteboardSessionManager.java
@@ -566,7 +566,7 @@ public class WhiteboardSessionManager
                 .showMessagePopupDialog(
                     Resources.getString("failedToJoinWhiteboard",
                         new String[] {whiteboard.getWhiteboardID()}),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
 
             logger.error("Failed to join whiteboard: "
@@ -631,7 +631,7 @@ public class WhiteboardSessionManager
                         Resources.getString("failedToJoinWhiteboard",
                             new String[]{whiteboardSession.getWhiteboardID()})
                                 + evt.getReason(),
-                        Resources.getString("error"),
+                        Resources.getString("service.gui.ERROR"),
                         PopupDialog.ERROR_MESSAGE);
             }
             else if (evt.getEventType().equals(
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
index 22f414d..471c197 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/InvitationReceivedDialog.java
@@ -31,7 +31,7 @@ public class InvitationReceivedDialog
     private JPanel reasonPanel = new TransparentPanel(new BorderLayout());
 
     private JLabel reasonLabel = new JLabel(
-        Resources.getString("reason") + ": ");
+        Resources.getString("service.gui.REASON") + ": ");
 
     private JTextField reasonField = new JTextField();
 
@@ -39,11 +39,12 @@ public class InvitationReceivedDialog
 
     private JPanel buttonsPanel = new TransparentPanel(new FlowLayout(FlowLayout.RIGHT));
 
-    private JButton acceptButton = new JButton(Resources.getString("accept"));
+    private JButton acceptButton
+        = new JButton(Resources.getString("service.gui.ACCEPT"));
     
-    private JButton rejectButton = new JButton(Resources.getString("reject"));
+    private JButton rejectButton = new JButton(Resources.getString("service.gui.REJECT"));
     
-    private JButton ignoreButton = new JButton(Resources.getString("ignore"));
+    private JButton ignoreButton = new JButton(Resources.getString("service.gui.IGNORE"));
     
     private JPanel mainPanel = new TransparentPanel(new BorderLayout(10, 10));
     
@@ -52,7 +53,7 @@ public class InvitationReceivedDialog
     private JLabel iconLabel = new JLabel(Resources.getImage("inviteIcon"));
     
     private String title
-        = Resources.getString("invitationReceived");
+        = Resources.getString("service.gui.INVITATION_RECEIVED");
     
     /**
      * The <tt>ChatRoomInvitation</tt> for which this dialog is.
@@ -97,7 +98,7 @@ public class InvitationReceivedDialog
         this.mainPanel.setPreferredSize(new Dimension(400, 230));
 
         infoTextArea.setText(
-            Resources.getString("invitationReceivedFormInfo",
+            Resources.getString("service.gui.INVITATION_RECEIVED_MSG",
                 new String[] {  invitation.getInviter(),
                                 invitation.getTargetWhiteboard()
                                     .getWhiteboardID()}));
@@ -107,7 +108,7 @@ public class InvitationReceivedDialog
             invitationReasonTextArea.setText(invitation.getReason());
             invitationReasonTextArea.setBorder(
                 BorderFactory.createTitledBorder(
-                    Resources.getString("invitation")));
+                    Resources.getString("service.gui.INVITATION")));
 
             this.dataPanel.add(invitationReasonTextArea, BorderLayout.CENTER);
         }
@@ -137,8 +138,8 @@ public class InvitationReceivedDialog
         
         this.getRootPane().setDefaultButton(acceptButton);
         this.acceptButton.setMnemonic(Resources.getMnemonic("accept"));
-        this.rejectButton.setMnemonic(Resources.getMnemonic("reject"));
-        this.ignoreButton.setMnemonic(Resources.getMnemonic("ignore"));
+        this.rejectButton.setMnemonic(Resources.getMnemonic("service.gui.REJECT"));
+        this.ignoreButton.setMnemonic(Resources.getMnemonic("service.gui.IGNORE"));
         
         this.mainPanel.setBorder(
             BorderFactory.createEmptyBorder(15, 15, 15, 15));
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
index 88fe32e..c08c583 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
+++ b/src/net/java/sip/communicator/plugin/whiteboard/gui/WhiteboardFrame.java
@@ -325,7 +325,8 @@ public class WhiteboardFrame
      */
     private void initIcons()
     {
-        setIconImage(Resources.getImage("sc_logo16x16").getImage());
+        setIconImage(
+            Resources.getImage("service.gui.SIP_COMMUNICATOR_LOGO").getImage());
 
         selectionButton
             .setIcon(Resources.getImage("plugin.whiteboard.SELECT_ICON"));
@@ -829,7 +830,7 @@ public class WhiteboardFrame
         leftPanel = new TransparentPanel(new BorderLayout());
 
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-        setTitle(Resources.getString("whiteboardTitle"));
+        setTitle(Resources.getString("plugin.whiteboard.TITLE"));
 
         if (session != null)
         {
@@ -841,16 +842,16 @@ public class WhiteboardFrame
             }
         }
 
-        jLabelStatus.setText(Resources.getString("draw"));
+        jLabelStatus.setText(Resources.getString("plugin.whiteboard.DRAW"));
         jLabelStatus.setBorder(javax.swing.BorderFactory
             .createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));
         getContentPane().add(jLabelStatus, java.awt.BorderLayout.SOUTH);
 
-        jButtonNew.setToolTipText(Resources.getString("new"));
+        jButtonNew.setToolTipText(Resources.getString("service.gui.NEW"));
         jButtonNew.setEnabled(false);
         jToolBar1.add(jButtonNew);
 
-        jButtonSave.setToolTipText(Resources.getString("save"));
+        jButtonSave.setToolTipText(Resources.getString("service.gui.SAVE"));
         jButtonSave.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -861,15 +862,15 @@ public class WhiteboardFrame
 
         jToolBar1.add(jButtonSave);
 
-        jButtonOpen.setToolTipText(Resources.getString("open"));
+        jButtonOpen.setToolTipText(Resources.getString("plugin.whiteboard.OPEN"));
         jButtonOpen.setEnabled(false);
         jToolBar1.add(jButtonOpen);
 
-        jButtonCopy.setToolTipText(Resources.getString("copy"));
+        jButtonCopy.setToolTipText(Resources.getString("service.gui.COPY"));
         jButtonCopy.setEnabled(false);
         jToolBar1.add(jButtonCopy);
 
-        jButtonPaste.setToolTipText(Resources.getString("paste"));
+        jButtonPaste.setToolTipText(Resources.getString("service.gui.PASTE"));
         jButtonPaste.setEnabled(false);
         jToolBar1.add(jButtonPaste);
 
@@ -882,7 +883,7 @@ public class WhiteboardFrame
         toolBar.setBorder(BorderFactory.createEmptyBorder(5, 8, 5, 8));
 
         buttonGroup.add(selectionButton);
-        selectionButton.setToolTipText(Resources.getString("select"));
+        selectionButton.setToolTipText(Resources.getString("plugin.whiteboard.SELECT"));
         selectionButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -894,7 +895,7 @@ public class WhiteboardFrame
         toolBar.add(selectionButton);
 
         buttonGroup.add(modifButton);
-        modifButton.setToolTipText(Resources.getString("modification"));
+        modifButton.setToolTipText(Resources.getString("plugin.whiteboard.MODIFICATION"));
         modifButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -906,7 +907,7 @@ public class WhiteboardFrame
         toolBar.add(modifButton);
 
         buttonGroup.add(penButton);
-        penButton.setToolTipText(Resources.getString("pen"));
+        penButton.setToolTipText(Resources.getString("plugin.whiteboard.PEN"));
         penButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -918,7 +919,7 @@ public class WhiteboardFrame
         toolBar.add(penButton);
 
         buttonGroup.add(textButton);
-        textButton.setToolTipText(Resources.getString("text"));
+        textButton.setToolTipText(Resources.getString("plugin.whiteboard.TEXT"));
         textButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -930,7 +931,7 @@ public class WhiteboardFrame
         toolBar.add(textButton);
 
         buttonGroup.add(lineButton);
-        lineButton.setToolTipText(Resources.getString("line"));
+        lineButton.setToolTipText(Resources.getString("plugin.whiteboard.LINE"));
         lineButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -942,7 +943,7 @@ public class WhiteboardFrame
         toolBar.add(lineButton);
 
         buttonGroup.add(polylineButton);
-        polylineButton.setToolTipText(Resources.getString("polyline"));
+        polylineButton.setToolTipText(Resources.getString("plugin.whiteboard.POLYLINE"));
         polylineButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -954,7 +955,7 @@ public class WhiteboardFrame
         toolBar.add(polylineButton);
 
         buttonGroup.add(rectangleButton);
-        rectangleButton.setToolTipText(Resources.getString("rectangle"));
+        rectangleButton.setToolTipText(Resources.getString("plugin.whiteboard.RECTANGLE"));
         rectangleButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -966,7 +967,7 @@ public class WhiteboardFrame
         toolBar.add(rectangleButton);
 
         buttonGroup.add(fillRectangleButton);
-        fillRectangleButton.setToolTipText(Resources.getString("fillRectangle"));
+        fillRectangleButton.setToolTipText(Resources.getString("plugin.whiteboard.FILLED_RECTANGLE"));
         fillRectangleButton
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -979,7 +980,7 @@ public class WhiteboardFrame
         toolBar.add(fillRectangleButton);
 
         buttonGroup.add(imageButton);
-        imageButton.setToolTipText(Resources.getString("image"));
+        imageButton.setToolTipText(Resources.getString("plugin.whiteboard.IMAGE"));
         imageButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -991,7 +992,7 @@ public class WhiteboardFrame
         toolBar.add(imageButton);
 
         buttonGroup.add(polygonButton);
-        polygonButton.setToolTipText(Resources.getString("polygon"));
+        polygonButton.setToolTipText(Resources.getString("plugin.whiteboard.POLYGON"));
         polygonButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1003,7 +1004,7 @@ public class WhiteboardFrame
         toolBar.add(polygonButton);
 
         buttonGroup.add(fillPolygonButton);
-        fillPolygonButton.setToolTipText(Resources.getString("fillPolygon"));
+        fillPolygonButton.setToolTipText(Resources.getString("plugin.whiteboard.FILLEDPOLYGON"));
         fillPolygonButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1015,7 +1016,7 @@ public class WhiteboardFrame
         toolBar.add(fillPolygonButton);
 
         buttonGroup.add(circleButton);
-        circleButton.setToolTipText(Resources.getString("circle"));
+        circleButton.setToolTipText(Resources.getString("plugin.whiteboard.CIRCLE"));
         circleButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1027,7 +1028,7 @@ public class WhiteboardFrame
         toolBar.add(circleButton);
 
         buttonGroup.add(fillCircleButton);
-        fillCircleButton.setToolTipText(Resources.getString("fillCircle"));
+        fillCircleButton.setToolTipText(Resources.getString("plugin.whiteboard.FILLED_CIRCLE"));
         fillCircleButton.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1038,7 +1039,7 @@ public class WhiteboardFrame
 
         toolBar.add(fillCircleButton);
 
-        colorChooserButton.setToolTipText(Resources.getString("color"));
+        colorChooserButton.setToolTipText(Resources.getString("plugin.whiteboard.COLOR"));
         colorChooserButton
             .addActionListener(new java.awt.event.ActionListener()
             {
@@ -1059,7 +1060,7 @@ public class WhiteboardFrame
 
         jPanel2.setLayout(new GridBagLayout());
 
-        jLabelThickness.setText(Resources.getString("thickness"));
+        jLabelThickness.setText(Resources.getString("plugin.whiteboard.THICKNESS"));
 
         jPanel2.add(jLabelThickness);
 
@@ -1080,9 +1081,9 @@ public class WhiteboardFrame
 
         getContentPane().add(leftPanel, BorderLayout.WEST);
 
-        fileMenu.setText(Resources.getString("file"));
+        fileMenu.setText(Resources.getString("service.gui.FILE"));
 
-        newMenuItem.setText(Resources.getString("new"));
+        newMenuItem.setText(Resources.getString("service.gui.NEW"));
         newMenuItem.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent e)
@@ -1102,19 +1103,19 @@ public class WhiteboardFrame
         });
         fileMenu.add(newMenuItem);
 
-        openMenuItem.setText(Resources.getString("open"));
+        openMenuItem.setText(Resources.getString("plugin.whiteboard.OPEN"));
         openMenuItem.setEnabled(false);
         fileMenu.add(openMenuItem);
 
-        saveMenuItem.setText(Resources.getString("save"));
+        saveMenuItem.setText(Resources.getString("service.gui.SAVE"));
         saveMenuItem.setEnabled(false);
         fileMenu.add(saveMenuItem);
 
-        printMenuItem.setText(Resources.getString("print"));
+        printMenuItem.setText(Resources.getString("service.gui.PRINT"));
         printMenuItem.setEnabled(false);
         fileMenu.add(printMenuItem);
 
-        exitMenuItem.setText(Resources.getString("exit"));
+        exitMenuItem.setText(Resources.getString("service.gui.EXIT"));
         exitMenuItem.addActionListener(new ActionListener()
         {
             public void actionPerformed(ActionEvent e)
@@ -1126,8 +1127,8 @@ public class WhiteboardFrame
 
         menuBar.add(fileMenu);
 
-        editMenu.setText(Resources.getString("edit"));
-        gridMenuItem.setText(Resources.getString("grid"));
+        editMenu.setText(Resources.getString("service.gui.EDIT"));
+        gridMenuItem.setText(Resources.getString("plugin.whiteboard.GRID"));
         gridMenuItem.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1138,7 +1139,7 @@ public class WhiteboardFrame
 
         editMenu.add(gridMenuItem);
 
-        deselectMenuItem.setText(Resources.getString("deselect"));
+        deselectMenuItem.setText(Resources.getString("plugin.whiteboard.DESELECT"));
         deselectMenuItem.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1149,17 +1150,17 @@ public class WhiteboardFrame
 
         editMenu.add(deselectMenuItem);
 
-        copyMenuItem.setText(Resources.getString("copy"));
+        copyMenuItem.setText(Resources.getString("service.gui.COPY"));
         copyMenuItem.setEnabled(false);
         editMenu.add(copyMenuItem);
 
-        pasteMenuItem.setText(Resources.getString("paste"));
+        pasteMenuItem.setText(Resources.getString("service.gui.PASTE"));
         pasteMenuItem.setEnabled(false);
         editMenu.add(pasteMenuItem);
 
         deleteMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
             java.awt.event.KeyEvent.VK_DELETE, 0));
-        deleteMenuItem.setText(Resources.getString("delete"));
+        deleteMenuItem.setText(Resources.getString("plugin.whiteboard.DELETE"));
         deleteMenuItem.addActionListener(new java.awt.event.ActionListener()
         {
             public void actionPerformed(java.awt.event.ActionEvent evt)
@@ -1170,18 +1171,18 @@ public class WhiteboardFrame
 
         editMenu.add(deleteMenuItem);
 
-        propertiesMenuItem.setText(Resources.getString("properties"));
+        propertiesMenuItem.setText(Resources.getString("plugin.whiteboard.PROPERTIES"));
         propertiesMenuItem.setEnabled(false);
         editMenu.add(propertiesMenuItem);
 
         menuBar.add(editMenu);
 
-        helpMenu.setText(Resources.getString("help"));
+        helpMenu.setText(Resources.getString("service.gui.HELP"));
         helpMenu.setEnabled(false);
-        helpMenuItem.setText(Resources.getString("help"));
+        helpMenuItem.setText(Resources.getString("service.gui.HELP"));
         helpMenu.add(helpMenuItem);
 
-        aboutMenuItem.setText(Resources.getString("about"));
+        aboutMenuItem.setText(Resources.getString("service.gui.ABOUT"));
         helpMenu.add(aboutMenuItem);
 
         menuBar.add(helpMenu);
@@ -2130,8 +2131,8 @@ public class WhiteboardFrame
 
         String t =
             (String) JOptionPane.showInputDialog(this,
-                "Please enter your text", "Text", JOptionPane.QUESTION_MESSAGE,
-                null, null, "text");
+                "Please enter your text", "plugin.whiteboard.TEXT", JOptionPane.QUESTION_MESSAGE,
+                null, null, "plugin.whiteboard.TEXT");
 
         if (t != null && t.length() > 0)
         {
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
index 6361527..a973db8 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/FirstWizardPage.java
@@ -39,12 +39,14 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel uinLabel = new JLabel(Resources.getString("id"));
+    private JLabel uinLabel = new JLabel(
+        Resources.getString("plugin.yahooaccregwizz.USERNAME"));
 
-    private JLabel passLabel = new JLabel(Resources.getString("password"));
+    private JLabel passLabel
+        = new JLabel(Resources.getString("service.gui.PASSWORD"));
 
     private JLabel existingAccountLabel =
-        new JLabel(Resources.getString("existingAccount"));
+        new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JPanel emptyPanel = new TransparentPanel();
 
@@ -55,7 +57,8 @@ public class FirstWizardPage
     private JPasswordField passField = new JPasswordField();
 
     private JCheckBox rememberPassBox =
-        new SIPCommCheckBox(Resources.getString("rememberPassword"));
+        new SIPCommCheckBox(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"));
 
     private JPanel mainPanel = new TransparentPanel();
 
@@ -125,7 +128,7 @@ public class FirstWizardPage
         uinPassPanel.add(rememberPassBox, BorderLayout.SOUTH);
 
         uinPassPanel.setBorder(BorderFactory.createTitledBorder(Resources
-            .getString("yahooUinAndPassword")));
+            .getString("plugin.yahooaccregwizz.USERID_AND_PASSWORD")));
 
         mainPanel.add(uinPassPanel);
         this.add(mainPanel, BorderLayout.NORTH);
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
index 1a9937a..8873294 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/YahooAccountRegistrationWizard.java
@@ -47,7 +47,8 @@ public class YahooAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer
+            .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -80,7 +81,7 @@ public class YahooAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameYahoo");
+        return Resources.getString("plugin.yahooaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -92,7 +93,8 @@ public class YahooAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionYahoo");
+        return Resources
+            .getString("plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -119,9 +121,12 @@ public class YahooAccountRegistrationWizard
     {
         Hashtable summaryTable = new Hashtable();
 
-        summaryTable.put(Resources.getString("id"), registration.getUin());
-        summaryTable.put(   Resources.getString("rememberPassword"),
-                            new Boolean(registration.isRememberPassword()));
+        summaryTable.put(
+            Resources.getString("plugin.yahooaccregwizz.USERNAME"),
+            registration.getUin());
+        summaryTable.put(
+            Resources.getString("service.gui.REMEMBER_PASSWORD"),
+            new Boolean(registration.isRememberPassword()));
 
         return summaryTable.entrySet().iterator();
     }
@@ -201,14 +206,14 @@ public class YahooAccountRegistrationWizard
         {
             YahooAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException e)
         {
             YahooAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(e.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
 
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
index 0a86fc4..a68c329 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/FirstWizardPage.java
@@ -36,15 +36,19 @@ public class FirstWizardPage
 
     private JPanel valuesPanel = new TransparentPanel();
 
-    private JLabel userID = new JLabel(Resources.getString("userID"));
+    private JLabel userID = new JLabel(
+        Resources.getString("plugin.zeroaccregwizz.USERID"));
 
     /* TEMPORARY : HARD CODED !! Should be added to Resource */
-    private JLabel firstLabel = new JLabel("Firstname:");
-    private JLabel lastLabel = new JLabel("Lastname:");
-    private JLabel mailLabel = new JLabel("Mail address:");
+    private JLabel firstLabel
+        = new JLabel(Resources.getString("plugin.zeroaccregwizz.FIRST_NAME"));
+    private JLabel lastLabel
+        = new JLabel(Resources.getString("plugin.zeroaccregwizz.LAST_NAME"));
+    private JLabel mailLabel
+        = new JLabel(Resources.getString("plugin.zeroaccregwizz.EMAIL"));
 
     private JLabel existingAccountLabel
-        = new JLabel(Resources.getString("existingAccount"));
+        = new JLabel(Resources.getString("service.gui.EXISTING_ACCOUNT_ERROR"));
 
     private JPanel emptyPanel = new TransparentPanel();
     private JPanel emptyPanel2 = new TransparentPanel();
@@ -61,8 +65,9 @@ public class FirstWizardPage
     private JTextField lastField = new JTextField();
     private JTextField mailField = new JTextField();
 
-    private JCheckBox rememberContacts =
-        new SIPCommCheckBox("Remember Bonjour contacts?");
+    private JCheckBox rememberContacts = 
+        new SIPCommCheckBox(Resources.getString(
+            "plugin.zeroaccregwizz.REMEMBER_CONTACTS"));
 
     private JPanel mainPanel = new TransparentPanel();
 
@@ -160,9 +165,8 @@ public class FirstWizardPage
         userPassPanel.add(valuesPanel, BorderLayout.CENTER);
         userPassPanel.add(rememberContacts, BorderLayout.SOUTH);
 
-        userPassPanel.setBorder(BorderFactory
-                                .createTitledBorder(Resources.getString(
-                                    "userAndPassword")));
+        userPassPanel.setBorder(BorderFactory.createTitledBorder(
+            Resources.getString("plugin.zeroaccregwizz.USERID_AND_PASSWORD")));
 
         this.add(userPassPanel, BorderLayout.NORTH);
     }
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
index 56565a0..c81afa7 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/ZeroconfAccountRegistrationWizard.java
@@ -56,7 +56,8 @@ public class ZeroconfAccountRegistrationWizard
     {
         this.wizardContainer = wizardContainer;
 
-        this.wizardContainer.setFinishButtonText(Resources.getString("signin"));
+        this.wizardContainer
+            .setFinishButtonText(Resources.getString("service.gui.SIGN_IN"));
     }
 
     /**
@@ -87,7 +88,7 @@ public class ZeroconfAccountRegistrationWizard
      */
     public String getProtocolName()
     {
-        return Resources.getString("protocolNameZeroconf");
+        return Resources.getString("plugin.zeroaccregwizz.PROTOCOL_NAME");
     }
 
     /**
@@ -97,7 +98,7 @@ public class ZeroconfAccountRegistrationWizard
      */
     public String getProtocolDescription()
     {
-        return Resources.getString("protocolDescriptionZeroconf");
+        return Resources.getString("plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION");
     }
 
     /**
@@ -208,14 +209,14 @@ public class ZeroconfAccountRegistrationWizard
         {
             ZeroconfAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
         catch (IllegalStateException exc)
         {
             ZeroconfAccRegWizzActivator.getUIService().getPopupDialog()
                 .showMessagePopupDialog(exc.getMessage(),
-                    Resources.getString("error"),
+                    Resources.getString("service.gui.ERROR"),
                     PopupDialog.ERROR_MESSAGE);
         }
 
@@ -318,7 +319,7 @@ public class ZeroconfAccountRegistrationWizard
      */
     public String getPasswordLabel()
     {
-        return Resources.getString("password");
+        return Resources.getString("service.gui.PASSWORD");
     }
 
     /**
diff --git a/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java b/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java
index 4744c9e..5afb688 100644
--- a/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java
+++ b/src/net/java/sip/communicator/service/protocol/AuthorizationResponse.java
@@ -32,7 +32,7 @@ public class AuthorizationResponse
      * the user to their contact list.
      */
     public static final AuthorizationResponseCode ACCEPT
-        = new AuthorizationResponseCode("Accept");
+        = new AuthorizationResponseCode("service.gui.ACCEPT");
 
     /**
      * Indicates that source authorization request which this response is about
diff --git a/src/net/java/sip/communicator/util/GuiUtils.java b/src/net/java/sip/communicator/util/GuiUtils.java
index b10f535..4c733c2 100644
--- a/src/net/java/sip/communicator/util/GuiUtils.java
+++ b/src/net/java/sip/communicator/util/GuiUtils.java
@@ -181,41 +181,41 @@ public class GuiUtils {
     {
         String monthString = "";
         if(month == 1)
-            monthString
-                = UtilActivator.getResources().getI18NString("january");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.JANUARY");
         else if(month == 2)
-            monthString
-                = UtilActivator.getResources().getI18NString("february");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("shervice.gui.FEBRUARY");
         else if(month == 3)
-            monthString
-                = UtilActivator.getResources().getI18NString("march");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.MARCH");
         else if(month == 4)
-            monthString
-                = UtilActivator.getResources().getI18NString("april");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.APRIL");
         else if(month == 5)
-            monthString
-                = UtilActivator.getResources().getI18NString("may");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.MAY");
         else if(month == 6)
-            monthString
-                = UtilActivator.getResources().getI18NString("june");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.JUNE");
         else if(month == 7)
-            monthString
-                = UtilActivator.getResources().getI18NString("july");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.JULY");
         else if(month == 8)
-            monthString
-                = UtilActivator.getResources().getI18NString("august");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.AUGUST");
         else if(month == 9)
-            monthString
-                = UtilActivator.getResources().getI18NString("september");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.SEPTEMBER");
         else if(month == 10)
-            monthString
-                = UtilActivator.getResources().getI18NString("october");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.OCTOBER");
         else if(month == 11)
-            monthString
-                = UtilActivator.getResources().getI18NString("november");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.NOVEMBER");
         else if(month == 12)
-            monthString
-                = UtilActivator.getResources().getI18NString("december");
+            monthString = UtilActivator.getResources()
+                            .getI18NString("service.gui.DECEMBER");
 
         return monthString;
     }