Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

38 files changed, 5297 insertions, 5156 deletions

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index cafbe93..bc39d06 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -43,7 +43,6 @@ service.gui.ACCOUNT_ME=Me
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Account Registration Wizard
 service.gui.ACCOUNTS=Accounts
 service.gui.ADD=&Add
-service.gui.ADD_ACCOUNT=Add account
 service.gui.ADD_CONTACT=&Add contact
 service.gui.ADD_AUTHORIZED_CONTACT=Add {0} to your contact list
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Add the contact to your contact list
@@ -53,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Add contact Error
 service.gui.ADD_CONTACT_EXIST_ERROR=The contact {0} already exists in your contact list.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Server did not respond to our request adding contact with id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Failed to add contact with id: {0}. Operation not supported.
-service.gui.ADD_CONTACT_IDENTIFIER=In the field below enter the identifier of the contact you would like to add.
-service.gui.ADD_CONTACT_WIZARD=Add contact wizard
 service.gui.ADD_CONTACT_NOT_CONNECTED=You need to be connected in in order to add a contact. Please sign in to the selected provider and try again.
 service.gui.ADD_GROUP_LOCAL_ERROR=Failed to add group with name: {0}. The problem occurred during a local IO operation.
 service.gui.ADD_GROUP_EXIST_ERROR=The group {0} already exists in your contact list. Please choose another name.
 service.gui.ADD_GROUP_NET_ERROR=Failed to add group with name: {0}. The problem occurred due to a network failure. Please check your network connection and try again.
 service.gui.ADD_GROUP_ERROR=Failed to add group with name: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=The group name must not be empty.
-service.gui.ADD_GROUP=Create group
-service.gui.ADD_SUBCONTACT=&Add subcontact
 service.gui.ADDRESS=Address
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=&Advanced
-service.gui.ALL=&All
 service.gui.ALL_CONTACTS=&All contacts
 service.gui.ALTERNATE_ADDRESS=Alternate address
 service.gui.APPLY=&Apply
@@ -76,7 +70,6 @@ service.gui.AT=at
 service.gui.AUTHORIZE=&Authorize
 service.gui.AUTHORIZATION_ACCEPTED={0} has accepted your authorization request.
 service.gui.AUTHENTICATION_FAILED=Authentication failed for {0}. The password you entered is not valid.
-service.gui.AUTHENTICATION_REQUESTED=Authentication requested
 service.gui.AUTHENTICATION_REQUESTED_SERVER=The {0} server has requested your authentication.
 service.gui.AUTHENTICATION_REJECTED={0} has rejected your authorization request.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} authentication
@@ -118,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=In the field below, you can enter your new nic
 service.gui.CHANGE_NICKNAME_ERROR=Error changing nickname
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nickname already exists
 service.gui.CHANGE_VIDEO_QUALITY=Change remote video quality
-service.gui.CHAT_CONFERENCE_LABEL=Conferences
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}''s conference
 service.gui.CHAT_ROOM_ALREADY_JOINED=The {0} chat room is already joined.
 service.gui.CHAT_ROOM_CONFIGURATION={0} chat room configuration
@@ -132,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=has left {0}
 service.gui.CHAT_ROOM_USER_KICKED=has been kicked from {0}
 service.gui.CHAT_ROOM_USER_QUIT=has quit {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Message sending is forbidden (voice revoked)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Saves the chat room for future use
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Removes the selected room from the list of saved rooms
 service.gui.CHAT_ROOM_NAME=Chat room name
 service.gui.CLEAR_CUSTOM_MESSAGES=Clear custom messages
 service.gui.ROOM_NAME=Chat Room
-service.gui.AUTOJOIN=Autojoin
 service.gui.CHANGE_PASSWORD=Change password
 service.gui.CHAT_ROOM_NAME_INFO=In the field below enter the name of the chat room that you would like to create.
 service.gui.CHAT_ROOM_NOT_EXIST=The {0} room was not found in the {1} server. Please verify if the name you typed is correct.
 service.gui.CHAT_ROOM_NOT_CONNECTED=You need to be logged in in order to join the {0} chat room.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=You need to be logged in in order to leave a chat room.
-service.gui.CHAT_ROOM_NOT_JOINED=You need to be joined to the chat room in order to do further operations with it.
 service.gui.CHAT_ROOM_OPTIONS=Chat room options
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=The {0} chat room requires registration to be joined.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=The {0} chat room has requested a password.
@@ -168,16 +156,15 @@ service.gui.CONNECTING=Connecting...
 service.gui.CONNECTING_STATUS=Connecting
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Connecting*
 service.gui.CONNECTION=Connection
-service.gui.CONNECTION_FAILED_MSG=Connection failed for the following account: User name: {0}, Server name: {1}. Please check your network connection or contact your network administrator for more information.
 service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from the {0} server.
 service.gui.CONTACT_NAME=ID or Number
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The chosen {0} contact doesn''t support telephony.
+service.gui.CONTACT_NAME_PROMPT=jane.doe@example.com
+service.gui.CONTACT_NAME_INFO=Add either an instant messaging address (such as jane.doe@example.com) or a VoIP number
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=The chosen {0} contact doesn''t support chat conferencing.
 service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message
 service.gui.CONTACT_TYPING={0} is typing a message
 service.gui.CONTACT_TYPING_SEND_FAILED=uh-oh...we couldn''t tell {0} that you were writing
 service.gui.CONTACT_INFO=&Contact info
-service.gui.CONTACTLIST=Contactlist
 service.gui.CONTACTS=Contacts
 service.gui.COPY=&Copy
 service.gui.COPY_LINK=Copy &link
@@ -187,28 +174,26 @@ service.gui.CREATE_CHAT_ROOM=&Create chat room...
 service.gui.CREATE_CHAT_ROOM_ERROR=Failed to create {0} chat room.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Create chat room wizard
 service.gui.CREATE_CONFERENCE_CALL=&Create a conference call...
-service.gui.CREATE_CONFERENCE_CHAT=&Create a conference chat...
 service.gui.CREATE_GROUP=&Create group...
 service.gui.CREATE_GROUP_NAME=In the field below enter the name of the group you would like to create.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Your contact list doesn't contain any groups. Please create a group first (File/Create group).
 service.gui.CREATE_VIDEO_BRIDGE=Create a &video bridge...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Create a &video bridge
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Create / Join video conference
 service.gui.CREATE_VIDEO_CONFERENCE=Create a new video conference for this chat room
 service.gui.CONTACT_INFO_NOT_SUPPORTED=This contact doesn't support web contact info
 service.gui.CUT=C&ut
-service.gui.DATE=Date
 service.gui.DELETE=Delete
 service.gui.DENY=&Deny
 service.gui.DESKTOP_SHARING_WARNING=<b>Are you sure you want to start screen sharing?</b> <br> Clicking OK will let people on this call see your screen.
 service.gui.DESKTOP_SHARING_DIALOG_INDICATE=You are sharing your screen
 service.gui.DIALPAD=Dial Pad
 service.gui.DISPLAY_NAME=Display name
+service.gui.DISPLAY_NAME_PROMPT=Jane Doe
+service.gui.DISPLAY_NAME_INFO=Add a name for this contact. If left blank the IM address or VoIP number will be used. (Optional)
 service.gui.DISCONNECTED_STATUS=Disconnected
 service.gui.DND_STATUS=Do not disturb
 service.gui.DO_NOT_ASK_AGAIN=Don't ask again
 service.gui.DO_NOT_SHOW_AGAIN=Don't show this message again
-service.gui.DOWNLOAD_NOW=&Download now
 service.gui.DRAG_FOR_SHARING=Drag here anything you want to share...
 service.gui.DURATION=duration
 service.gui.DESTROY_CHATROOM=Destroy chat room
@@ -229,7 +214,6 @@ service.gui.ERROR_RECEIVED_FROM=Error received from {0}
 service.gui.ESTIMATED_TIME=Estimated time:
 service.gui.EVENTS=Events
 service.gui.EXIT=E&xit
-service.gui.EXTENDED_CRITERIA=Extended criteria
 service.gui.GENERAL=General
 service.gui.GENERAL_ERROR=General error
 service.gui.GROUP_NAME=Group name
@@ -271,7 +255,6 @@ service.gui.FONT_ITALIC=Italic
 service.gui.FONT_SIZE=Size
 service.gui.FONT_STYLE=Style
 service.gui.FONT_UNDERLINE=Underline
-service.gui.FROM={0} from {1}
 service.gui.GRANT_OWNERSHIP=Grant ownership...
 service.gui.GRANT_ADMIN=Grant administrator...
 service.gui.GRANT_MODERATOR=Grant moderator
@@ -298,7 +281,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Are you sure you want to permanently remo
 service.gui.HISTORY_REMOVE_ERROR=Error removing locally stored messages.
 service.gui.HOME=Home
 service.gui.HOME_PAGE=Home page
-service.gui.HOUR=Hour
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifier
 service.gui.IGNORE=&Ignore
@@ -322,16 +304,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Invite contacts to video bridge
 service.gui.INVITE_REASON=Invite reason
 service.gui.IS_CALLING={0} is calling...
 service.gui.IS_NOW={0} is now {1}
-service.gui.JITSI_WARNING=SIP Communicator has recently been renamed to Jitsi.<br/>\
- If you want your version to remain up-to-date, then please download Jitsi now.\
-<br/><br/>We are sorry for any inconvenience that this may be causing you.\
-<br/><br/>The Jitsi Dev Team
-service.gui.JITSI_WARNING_TITLE=SIP Communicator becomes Jitsi
 service.gui.JOIN=&Join
 service.gui.JOIN_AS=J&oin as
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Join an existing video conference
 service.gui.JOIN_VIDEO=Join video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=C&lose
 service.gui.JOB_TITLE=Job title
 service.gui.JOIN_CHAT_ROOM=&Join chat room...
 service.gui.JOIN_CHAT_ROOM_TITLE=Join chat room
@@ -344,7 +320,6 @@ service.gui.KICK_FAILED=Kick failed
 service.gui.KICK_FAILED_GENERAL_ERROR=Failed to kick {0}. A general server error occurred.
 service.gui.KICK_FAILED_NOT_ALLOWED=Failed to kick {0}. The owner and the administrator of the room could not be kicked.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Failed to kick {0}. You don''t have enough privileges to do that.
-service.gui.LAST=Last
 service.gui.LAST_NAME=Last name
 service.gui.LEAVE=&Leave
 service.gui.LIMIT_REACHED_FOR_IP=You have too many existing registrations from the local IP address and the {0} server doesn''t allow to open any more of them.
@@ -364,7 +339,6 @@ service.gui.MESSAGE=Message
 service.gui.MISSED_CALLS_TOOL_TIP=Missed calls from:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= and {0} more
 service.gui.MODERATOR=moderator
-service.gui.MORE=See more
 service.gui.MORE_LABEL=More
 service.gui.MOVE=Move
 service.gui.MOVE_SUBCONTACT=M&ove contact
@@ -373,7 +347,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=The contact you have chosen is the same as \n
 service.gui.MOVE_SUBCONTACT_QUESTION=Are you sure you want to move {0} to {1}?
 service.gui.MOVE_TO_GROUP=&Move to group
 service.gui.MOVE_CONTACT=Move Contact
-service.gui.MOVE_CONTACT_ERROR=&Contact cannot be moved
 service.gui.MSG_DELIVERY_FAILURE=The above message could not be delivered
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=The protocol you are using doesn''t \
 support offline messages. You could try to reach {0} through another \
@@ -389,7 +362,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=You should be connected to be able to se
 service.gui.MULTIPLE_LOGINS=You have logged in more than once with the same account. The following account: User name: {0}, Server name: {1} is currently disconnected.
 service.gui.MY_CHAT_ROOMS=Add chat room
 service.gui.MY_CHAT_ROOMS_TITLE=Add chat room
-service.gui.MUTE=Mute
 service.gui.MUTUALLY_ON_HOLD_STATUS=Mutually On Hold
 service.gui.NAME=Name
 service.gui.NETWORK=Network
@@ -421,7 +393,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=NotInContactList
 service.gui.SD_QUALITY=Standard quality
 service.gui.OFFLINE=Offline
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Older calls
 service.gui.ONLINE=Online
 service.gui.OPEN=Open
 service.gui.OPEN_FILE_FROM_IMAGE=Double click to open file.
@@ -433,7 +404,6 @@ service.gui.OPEN_ON_ACTIVITY=Open on activity
 service.gui.OPEN_ON_MESSAGE=Open on message only
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Open on important messages only
 service.gui.OR=or
-service.gui.OR_ENTER_PHONE_NUMBER=Or enter phone number here...
 service.gui.ORGANIZATION=Organization
 service.gui.OTHER=Other
 service.gui.chat.role.OWNER=Owner
@@ -459,7 +429,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' for suggestions
 service.gui.PRESS_FOR_CALL_INFO=Press for call info
 service.gui.PRESS_TO_OPEN_CRM=Press to open CRM application
 service.gui.PREVIOUS=Previous
-service.gui.PREVIOUS_TOOLTIP=Browse older conversations
 service.gui.PRINT=&Print
 service.gui.PROACTIVE_NOTIFICATION=is writing a message
 service.gui.PROBLEMS_ENCOUNTERED=Problems encountered
@@ -475,7 +444,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=You have have been disconnecting and rec
 service.gui.RE_REQUEST_AUTHORIZATION=Re-request authorization
 service.gui.REFERRED_STATUS=Referred
 service.gui.REJECT=&Reject
-service.gui.REMIND_ME_LATER=Remind me later
 service.gui.REMEMBER_PASSWORD=Remember password
 service.gui.REMOVE=&Remove
 service.gui.REMOVE_ACCOUNT=&Remove account
@@ -501,29 +469,23 @@ service.gui.REVOKE_ADMIN=Revoke admin
 service.gui.REVOKE_MODERATOR=Revoke moderator
 service.gui.REVOKE_MEMBERSHIP=Revoke membership
 service.gui.REVOKE_VOICE=Revoke voice
-service.gui.ROOT_GROUP=Root group
 service.gui.SAVE=&Save
-service.gui.SAVE_AS_DEFAULT=Save as default
 service.gui.SEARCH=&Search
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Click the below button to show all chat rooms existing in the selected server. Then select the one you would like to join and click the join button.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Searched contact
 service.gui.SECURITY=Security
 service.gui.SELECT_ACCOUNT=Select account
+service.gui.SELECT_ACCOUNT_INFO=Which account do you want to use to communicate with this contact?
 service.gui.SELECT_COLOR=Select color
 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_INFO=Which group do you want to display this contact under? (Optional)
 service.gui.SELECT_NO_GROUP=No group
-service.gui.SELECT_GROUP_WIZARD=Specify group
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=The list below contains all accounts that support the multi user chat feature. Select the one you would like to use to create your chat room.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=The list below contains all registered accounts. Select the one you would like to use to communicate with the new contact.
-service.gui.SELECT_PROVIDERS_WIZARD=Select account
 service.gui.SELECT_VIDEO_CONFERENCE=Select video conference
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Select chat room from the list and press OK to add it.
 service.gui.SEND=&Send
 service.gui.SEND_FILE=Send &file
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=There is no info for this contact.
 service.gui.SEND_MESSAGE=&Send a message
-service.gui.SEND_AS_SMS=Send as SMS
 service.gui.SEND_PRIVATE_MESSAGE=Send private message
 service.gui.SEND_SMS=S&end SMS
 service.gui.SEND_SMS_DETAILS=Remember that you need to enter the number in international \
@@ -563,7 +525,6 @@ service.gui.STREET=Street
 service.gui.SUBJECT=Subject
 service.gui.SUMMARY=Summary
 service.gui.TELEPHONY=Telephony
-service.gui.TODAY=Today
 service.gui.TOOLS=&Tools
 service.gui.TRANSFER=Trans&fer
 service.gui.TO=&To:
@@ -573,7 +534,6 @@ service.gui.TRANSFER_CALL_TO=Transfer to:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparency is not supported by your current configuration.
 service.gui.TYPE_YOUR_REQUEST=Type your request here
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=We were not able to change video quality for this call.
-service.gui.UNMUTE=Unmute
 service.gui.USER_IDENTIFIER=User identifier:
 service.gui.USER_EXISTS_ERROR=This user already exists on the selected network. Please choose another user or network.
 service.gui.USERNAME_NULL=Please fill your username and password.
@@ -586,7 +546,6 @@ service.gui.USE_PROVISIONING=Use online provisioning
 service.gui.VALUE=Value
 service.gui.VIDEO_CALL=&Video call
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&View
 service.gui.VIEW_HISTORY=View &history
 service.gui.VIEW_SMILEYS=View &smileys
@@ -606,9 +565,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Adjust volume
 service.gui.WAITING_AUTHORIZATION=Waiting for authorization
 service.gui.WARNING=Warning
 service.gui.YES=Yes
-service.gui.YESTERDAY=Yesterday
-service.gui.EXISTING_ACCOUNT_ERROR=The account you entered is already installed.
-service.gui.NEW_MAIL=<b>You have one new Mail!</b><br/><b>From:</b> {0} {1} <br/><b>Subject:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=You have received a new mail message in your {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=You have received {2} new mail messages in your {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=one more unread conversation in your <a href="{0}">inbox</a>.<br/>
@@ -635,7 +591,6 @@ service.gui.SECURITY_ERROR=Security error
 service.gui.SPEED=Speed:
 service.gui.SILENT_MEMBER=silent member
 service.gui.NON_SECURE_CONNECTION=No secure connection can be made for account {0}. If you want to connect to non-secure server, please check \"Allow non-secure connections\" in your account configuration
-service.gui.UPDATE=Update
 service.gui.MOBILE_PHONE=Mobile
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Work
@@ -672,12 +627,10 @@ service.gui.callinfo.CALL_INFORMATION=Call information
 service.gui.callinfo.CALL_IDENTITY=Identity
 service.gui.callinfo.PEER_COUNT=Participant count
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Conference focus
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Encryption enabled
 service.gui.callinfo.CALL_TRANSPORT=Signalling call transport
 service.gui.callinfo.CALL_DURATION=Call duration
 service.gui.callinfo.TLS_PROTOCOL=TLS protocol
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS cipher suite
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=TLS server certificate chain
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=The content of the TLS server \
 certificate is displayed below.
 service.gui.callinfo.VIEW_CERTIFICATE=View certificate
@@ -688,7 +641,7 @@ service.gui.callinfo.AUDIO_INFO=Audio info
 service.gui.callinfo.VIDEO_INFO=Video info
 service.gui.callinfo.LOCAL_IP=Local IP / Port
 service.gui.callinfo.REMOTE_IP=Remote IP / Port
-service.gui.callinfo.BANDWITH=Bandwith
+service.gui.callinfo.BANDWITH=Bandwidth
 service.gui.callinfo.LOSS_RATE=Loss rate
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -698,10 +651,14 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Key exchange protocol
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE candidate extended type
 service.gui.callinfo.ICE_STATE=ICE Processing State
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Gather candidates
 service.gui.callinfo.ICE_STATE.RUNNING=Connectivity checks
 service.gui.callinfo.ICE_STATE.COMPLETED=Completed
 service.gui.callinfo.ICE_STATE.FAILED=Failed
+service.gui.callinfo.ICE_STATE.TERMINATED=Terminated
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Local host IP / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Local reflexive IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Local relayed IP / Port
@@ -733,12 +690,6 @@ The certificate is not trusted, which means that the server''s \
 identity cannot<br> be automatically verified. \
 Do you want to continue connecting?<br><br> \
 For more information, click "Show Certificate".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} can''t verify the identity \
-of the connecting client.<br><br> \
-The certificate is not trusted, which means that the client''s \
-identity cannot<br> be automatically verified. \
-Do you want to accept the connection?<br><br> \
-For more information, click "Show Certificate".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} can''t verify the identity \
 of the peer {1}.<br><br> \
 The certificate is not trusted, which means that the peer''s \
@@ -748,6 +699,8 @@ For more information, click "Show Certificate".</html>
 service.gui.CONTINUE_ANYWAY=Continue anyway
 service.gui.CERT_INFO_CHAIN=Certificate Chain:
 service.gui.CERT_INFO_ISSUED_TO=Issued To
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Common Name:
 service.gui.CERT_INFO_O=Organization:
 service.gui.CERT_INFO_C=Country Name:
@@ -766,12 +719,10 @@ service.gui.CERT_INFO_SIGN_ALG=Signature Algorithm:
 service.gui.CERT_INFO_PUB_KEY_INFO=Public Key Info
 service.gui.CERT_INFO_ALG=Algorithm:
 service.gui.CERT_INFO_PUB_KEY=Public Key:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Exponent:
 service.gui.CERT_INFO_KEY_SIZE=Key Size:
 service.gui.CERT_INFO_SIGN=Signature:
-service.gui.CONTINUE=Continue
 service.gui.SHOW_CERT=Show Certificate
 service.gui.HIDE_CERT=Hide Certificate
 
@@ -794,12 +745,9 @@ service.gui.security.SECURE_AUDIO=Secure audio
 service.gui.security.AUDIO_NOT_SECURED=Audio not secure
 service.gui.security.SECURE_VIDEO=Secure video
 service.gui.security.VIDEO_NOT_SECURED=Video not secure
-service.gui.security.NO_VIDEO=No video
-service.gui.security.CIPHER=Cipher: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Call secured. For more information click here.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Call not secure.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Press here to compare security secret with your partner.
-service.gui.security.COMPARE_WITH_PARTNER=Compare with partner and click the padlock to confirm.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Compare with partner:
 service.gui.security.STRING_COMPARED=String compared!
@@ -824,20 +772,22 @@ service.gui.avatar.imagepicker.CLICK=Click and Smile
 service.gui.avatar.imagepicker.IMAGE_FILES=Image files
 service.gui.avatar.imagepicker.IMAGE_PICKER=Picture
 service.gui.avatar.imagepicker.IMAGE_SIZE=Image size
-service.gui.avatar.imagepicker.INITIALIZING=Initializing
 service.gui.avatar.imagepicker.RESET=Reset
 service.gui.avatar.imagepicker.SET=Set
 service.gui.avatar.imagepicker.TAKE_PHOTO=Take a photo
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Webcam error
 
 service.gui.security.encryption.required=Encryption required!
 
 service.protocol.ICE_FAILED=Could not establish connection (ICE failed and no relay found)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
+service.systray.MODE=Tray implementation
+service.systray.mode.NATIVE=Default
+service.systray.mode.DISABLED=Disabled
+service.systray.mode.APPINDICATOR=AppIndicator (Unity, KDE, not plain Gnome 3; may crash on Debian)
+service.systray.mode.APPINDICATOR_STATIC=AppIndicator Static (no account status menus)
+service.systray.CLI_NOTE=If your choice does not work, you can start {0} with the "--notray" option. \
+ This forces the mode to "Disabled" and shows the GUI. \
+ Changing the tray implementation requires a restart.
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Error in SIP contact list storage
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Resource cannot be read {0}. For {1}
@@ -867,9 +817,7 @@ impl.ldap.QUERY_CUSTOM=Custom query
 impl.ldap.QUERY_CUSTOM_HINT=Use {0} as a placeholder for the search term.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Automatically add wildcards to the query term
 impl.ldap.QUERY_PHOTO_INLINE=Fetch photo along with other attributes
-impl.ldap.NEW=New
 impl.ldap.EDIT=edit
-impl.ldap.REMOVE=Remove
 impl.ldap.ENABLED=Enabled
 impl.ldap.SERVER_NAME=Server name
 impl.ldap.SERVER_NAME_EXAMPLE=My LDAP server
@@ -902,14 +850,21 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 impl.ldap.PHONE_PREFIX=Phone prefix
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ex.: 00
 
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS=''{0}'' is not a valid SIP address.
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS=''{0}'' is not a valid XMPP JID.
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Address book
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Enable MacOSX Address Book search
 plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=Enable Microsoft Outlook search
+plugin.addrbook.ENABLE_OUTLOOK_CALENDAR=Disable setting presence using the Microsoft Outlook Calendar
 plugin.addrbook.DESCRIPTION=If enabled everything you type in the search field \
  of the contact list will be also searched in your system address book and all \
  matching contacts from your address book will appear in your contact list.
- plugin.addrbook.DEFAULT_IM_APP=Make Jitsi the default Instant Messaging Provider (Outlook integration)
+plugin.addrbook.DEFAULT_IM_APP=Make Jitsi the default Instant Messaging Provider (Outlook integration)
 plugin.addrbook.PREFIX=Specific phone number prefix
 plugin.addrbook.PREFIX_EXAMPLE=Ex.: 00
 plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE=Error accessing your Microsoft Outlook contacts.
@@ -918,9 +873,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Make Outlook default mail clien
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google Contacts
-impl.googlecontacts.NEW=New
 impl.googlecontacts.EDIT=edit
-impl.googlecontacts.REMOVE=Remove
 impl.googlecontacts.ENABLED=Enabled
 impl.googlecontacts.ACCOUNT_NAME=Account name
 impl.googlecontacts.SAVE=Save
@@ -963,11 +916,8 @@ plugin.accountinfo.ORGANIZATION=Organization Name:
 plugin.accountinfo.JOB_TITLE=Job Title:
 plugin.accountinfo.ABOUT_ME=About Me:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=User Pictures
 plugin.accountinfo.GLOBAL_ICON=Use global icon
 plugin.accountinfo.LOCAL_ICON=Use this icon:
-plugin.accountinfo.CHANGE=Change
-plugin.accountinfo.ONLY_MESSAGE=Only messages
 
 # connection info
 plugin.connectioninfo.TITLE=Connection Info
@@ -987,61 +937,18 @@ plugin.aimaccregwizz.USERNAME=AIM Screenname:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Screen Name and Password
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Register new account
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=In case you don't have an AIM account, click on this button to create a new one.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=About {0}
 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>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright \
-          <b>jitsi.org</b>. All rights reserved. Visit \
-          <a href="https://jitsi.org">https://jitsi.org</a>.\
-          </font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> is distributed under \
-        the terms of the Apache \
-        (<a href=\"http://www.apache.org/licenses/LICENSE-2.0\">\
-        http://www.apache.org/licenses/LICENSE-2.0</a>).</DIV>
+plugin.branding.COPYRIGHT_LICENSE=<DIV><font size=3 color={0}>Copyright 2003-{1} \
+          <a href="{2}"><b>{3}</b></a>, All rights reserved.\
+          </font><br><br>{4} is distributed under \
+        the terms of the <a href=\"{5}\">{6}</a>.</DIV>
 
 plugin.busylampfield.PICKUP=Pickup call
 
-# Dict protocol
-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.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 dictionary you would like to add.
-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
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">In order to use Facebook Chat you need to create a "Username" <br>from your "Account Settings" page on Facebook.</a><br><br>Note: When you create username you must logout from the webpage <br>and it can take a while before you are able to login with your new username!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=The Facebook Chat protocol
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Username:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Username and Password
-
 # generalconfig
 plugin.generalconfig.AUTO_START=Auto-start {0} when computer restarts or reboots
 plugin.generalconfig.CHATALERTS_ON_MESSAGE=Use task bar / dock alerts on incoming calls and chats
@@ -1051,9 +958,6 @@ plugin.generalconfig.SHOW_HISTORY=Show
 plugin.generalconfig.HISTORY_SIZE=recent messages in new chats
 plugin.generalconfig.SEND_MESSAGES_WITH=Send messages with:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Bring chat window to front
-plugin.generalconfig.ERROR_PERMISSION=You don't have enough privileges to remove autostart
-plugin.generalconfig.TRANSPARENCY=Transparency
-plugin.generalconfig.ENABLE_TRANSPARENCY=Enable transparency
 plugin.generalconfig.DEFAULT_LANGUAGE=Interface Language
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Your changes will take effect on next restart.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% translated
@@ -1069,6 +973,8 @@ plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Remove special symbols before
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Convert letters in phone numbers
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=e.g. +1-800-MYPHONE -> +1-800-694663
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.XMPP_USE_ALL_RESOURCES=Use all resources when detecting a contact's features
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Sampling rate:
 plugin.generalconfig.OPUS_BITRATE=Encoder average bitrate (kbps):
@@ -1082,6 +988,7 @@ plugin.generalconfig.SILK_ALWAYS_ASSUME_PACKET_LOSS=Always assume packet loss:
 plugin.generalconfig.SILK_SAT=Speech activity threshold (0-1):
 plugin.generalconfig.SILK_ADVERTISE_FEC=Advertise FEC support in SDP:
 plugin.generalconfig.RESTORE=Restore defaults
+plugin.generalconfig.MINIMIZE_NOT_HIDE=Minimize the main window instead of closing or hiding it
 
 # gibberish accregwizz
 plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
@@ -1140,13 +1047,10 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Comment
 plugin.jabberaccregwizz.RESOURCE=Resource
 plugin.jabberaccregwizz.AUTORESOURCE=Auto generate resource
 plugin.jabberaccregwizz.PRIORITY=Priority
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP Error
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unknown XMPP error ({0}). Verify that the server name is correct.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Your passwords did not match.
 plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Advanced options
 plugin.jabberaccregwizz.USE_ICE=Use ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Use Google's Jingle/ICE (experimental)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Auto discover STUN/TURN servers
 plugin.jabberaccregwizz.SUPPORT_TURN=Support TURN
 plugin.jabberaccregwizz.TURN_USERNAME=TURN username
@@ -1174,11 +1078,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Disable message carbons
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Choose automatically between RTP and Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Server options
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Change account password
-plugin.jabberaccregwizz.NEW_PASSWORD=New password
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirm new password
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Please fill a valid port number in order to continue.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=The account has to be signed in before changing a password.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=The password is empty.
 plugin.jabberaccregwizz.TLS_REQUIRED=The connection does not use TLS, will not attempt a password change.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=The password has been successfully changed
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Your XMPP server does not support password changes.
@@ -1192,15 +1093,6 @@ plugin.jabberaccregwizz.RESET=Reset
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Reset to the global settings
 plugin.jabberaccregwizz.DISABLE_JINGLE=Disable Jingle (audio and video calls with XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Outgoing Message:
-plugin.mailbox.INCOMING=Incoming Messages:
-plugin.mailbox.WAIT_TIME=Delay Until Call Sent to Voicemail
-plugin.mailbox.MAX_MESSAGE_TIME=Maximum Incoming Message Duration
-plugin.mailbox.CONFIRM=Confirm
-plugin.mailbox.DEFAULTS=Defaults
-plugin.mailbox.MAILBOX=Mailbox
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Install
 plugin.pluginmanager.UNINSTALL=Uninstall
@@ -1229,7 +1121,6 @@ plugin.sipaccregwizz.SERVER_PORT=Server port
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxy port
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferred transport
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Advanced options
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxy options
 plugin.sipaccregwizz.PROXY_AUTO=Configure proxy automatically
 plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Bypass proxy security check for HA scenarios (use only if needed)
@@ -1250,8 +1141,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Choose automatically between RTP and Inband
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Override server default options
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Enable support to encrypt calls
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Indicate support of ZRTP in signalling protocol
 plugin.sipaccregwizz.AUTH_NAME=Authorization name
@@ -1272,10 +1161,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Voicemail check URI
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Your passwords did not match.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none> (use regular authentication)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP indication
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Off (indicate RTP/AVP only) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Mandatory (offer and accept only RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Optional (offer RTP/SAVP first, then RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Enable S-Descriptor (also known as SDES or SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Choose enabled encryption protocols and their priority (top protocol first):
 plugin.sipaccregwizz.CIPHER_SUITES=Enabled cipher suites:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} will automatically try to secure all \
@@ -1292,15 +1181,6 @@ plugin.skinmanager.DEFAULT_SKIN=Default skin
 plugin.skinmanager.ADD_NEW_SKIN=Add new skin...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=The default skin of the application.
 
-# ssh accregwizz
-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=Identity File:
-plugin.sshaccregwizz.KNOWN_HOSTS=Known Hosts:
-plugin.sshaccregwizz.OPTIONAL=Optional
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Account details
-
 # status update
 plugin.autoaway.AUTO_STATUS=Auto Away
 plugin.autoaway.ENABLE_CHANGE_STATUS=Change status while away
@@ -1348,22 +1228,6 @@ plugin.whiteboard.DESELECT=Deselect
 plugin.whiteboard.DELETE=Delete
 plugin.whiteboard.PROPERTIES=Properties
 
-# yahoo accregwizz
-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
-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
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=The Google Talk protocol
@@ -1377,19 +1241,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, the IP Telecommunications
 plugin.iptelaccregwizz.USERNAME=User name
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Subscribe to iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP and chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Username
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Retype password
 plugin.sip2sipaccregwizz.EMAIL=Email address
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=For help about this service visit<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>The email address is used to send voicemail messages, <br>missed calls notifications and to recover a lost password</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>For help about this service visit <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Existing sip2sip.info account
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Create a free sip2sip.info account
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Instant Messaging
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=For help about this service visit<br>http://ippi.fr
@@ -1398,6 +1254,8 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Existing ippi account
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Create a free ippi account
 
 # key binding chooser
+plugin.keybindings.WAITING=Press shortcut...
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Close Chat Window
 plugin.keybindings.CHAT_COPY=Copy
 plugin.keybindings.CHAT_CUT=Cut
@@ -1420,10 +1278,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Name
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primary shortcut
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Second shortcut
 plugin.keybindings.globalchooser.PRESS_BTN=Press to set shortcut
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Waiting
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Push to talk
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Enable special key detection
 plugin.keybindings.PLUGIN_NAME=Keybindings
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Main
 plugin.keybindings.GLOBAL=Global shortcuts
@@ -1451,6 +1309,7 @@ plugin.notificationconfig.tableheader.SOUND=Play a sound through notification de
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Play a sound through playback device
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Play a sound through PC speaker device
 plugin.notificationconfig.tableheader.DESCRIPTION=Description of event
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Incoming Call
 plugin.notificationconfig.event.SecurityMessage=Security Message
 plugin.notificationconfig.event.IncomingFile=Incoming File
@@ -1557,6 +1416,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Periodic Intra Refresh
 impl.neomedia.configform.H264.defaultProfile=Default profile to encode into:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Baseline
 impl.neomedia.configform.H264.defaultProfile.high=High
 impl.neomedia.configform.H264.defaultProfile.main=Main
@@ -1587,7 +1447,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Current password:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Enter new password:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Re-enter password:
 plugin.securityconfig.masterpassword.MP_TITLE=Master Password
-plugin.securityconfig.masterpassword.MP_NOT_SET=(not set)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=You did not enter the correct current Master Password. Please try again.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=The Master Password is not correct!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Password Change Failed
@@ -1718,8 +1577,6 @@ Proxy support is currently experimental and only works with some protocols. \
 Check out the table below for more details:
 plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> \
 <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr>\
-<tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr>\
-<tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr>\
 <tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr>\
 <tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr>\
 </table></html>
@@ -1760,7 +1617,6 @@ plugin.provisioning.RESTART_WARNING=Note that your changes will only take effect
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Copy UUID to clipboard
 plugin.provisioning.CLIPBOARD_FAILED=Failed to copy UUID to clipboard
-plugin.provisioning.EXIT_ON_FAIL=Exit the application if the provisioning fails
 plugin.provisioning.CREDENTIALS=Last stored provisioning credentials
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Are you sure you want to remove provisioning password?
 plugin.provisioning.PROV_FAILED=Provisioning failed
@@ -1842,8 +1698,6 @@ inform them about the issue. \
 #plugin spellcheck
 plugin.spellcheck.TITLE=Spelling and Grammar
 plugin.spellcheck.MENU=Show Spelling and Grammar
-plugin.spellcheck.LANG=Language
-plugin.spellcheck.EDIT_PERSONAL_DICT=Edit
 plugin.spellcheck.ENABLE_SPELL_CHECK=Enable spell check
 plugin.spellcheck.dialog.FIND=Find Next
 plugin.spellcheck.dialog.REPLACE=Replace   
diff --git a/resources/languages/resources_ar.properties b/resources/languages/resources_ar.properties
index 9583582..deee731 100644
--- a/resources/languages/resources_ar.properties
+++ b/resources/languages/resources_ar.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,29 +43,24 @@ service.gui.ACCOUNT_ME=أنا (خاص بي)
 service.gui.ACCOUNT_REGISTRATION_WIZARD=المساعدة في تسجيل الحساب
 service.gui.ACCOUNTS=حسابات
 service.gui.ADD=&إضافة
-service.gui.ADD_ACCOUNT=إضافة حساب
 service.gui.ADD_CONTACT=إضافة عضو (مستخدم)
-service.gui.ADD_AUTHORIZED_CONTACT=إضف {0} إلى قائمة المستخدمين لديك
+service.gui.ADD_AUTHORIZED_CONTACT=أضِف {0} إلى قائمة جهات الاتصال
+service.gui.ADD_CONTACT_TO_CONTACTLIST=أضف الإسم هذه إلى قائمة جهات اتصالك
 service.gui.ADD_CONTACT_TO=إضافة عضو إلى
 service.gui.ADD_CONTACT_ERROR=خطأ عند إضافة المستخدم التالي : {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=حدث خطأ لدى إضافة مستخدم
 service.gui.ADD_CONTACT_EXIST_ERROR=اسم المستخدم {0} موجود بالفعل في قائمة المستخدمين لديك.
 service.gui.ADD_CONTACT_NETWORK_ERROR=الخادم لم يستجب لطلب إضافة الصديق ذات الرقم {0}
 service.gui.ADD_CONTACT_NOT_SUPPORTED=فشل في إضافة المستخدم:{0}. عملية غير مدعومة.
-service.gui.ADD_CONTACT_IDENTIFIER=أكتب في الخانة التي في الأسفل اسم العضو (المستخدم) الذي تريد إضافته.
-service.gui.ADD_CONTACT_WIZARD=المساعد في إضافة مشترك (عضو أو مستخدم).
 service.gui.ADD_CONTACT_NOT_CONNECTED=يجب أن تكون متصل لكي تضيف اسم مستخدم الى قائمة الأصدقاء, رجاءا سجل دخولك و جرب مرة اخرى.
 service.gui.ADD_GROUP_LOCAL_ERROR=لم تتم إضافة المجموعة :{0}. السبب : مشكلة حدثت اثناء عملية إدخال-إخراج محلية.
 service.gui.ADD_GROUP_EXIST_ERROR=المجموعة {0} موجودة بالفعل في قائمة المستخدمين لديك. من فضلك اختر إسما آخر.
 service.gui.ADD_GROUP_NET_ERROR=لم تتم إضافة المجموعة بإسم {0}. السبب : حدوث مشكلة في الشبكة. من فضلك تأكد من اتصال الشبكة لديك ثم حاول مرة اخرى.
 service.gui.ADD_GROUP_ERROR=لم تتم إضافة المجموعة بإسم : {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=إسم المجموعة يحب أن لا يكون فارغا.
-service.gui.ADD_GROUP=إنشاء مجموعة
-service.gui.ADD_SUBCONTACT=&إضافة مستخدم فرعي.
 service.gui.ADDRESS=عنوان
 service.gui.ADMINISTRATOR=المسؤول
 service.gui.ADVANCED=&متقدم
-service.gui.ALL=&الكل
 service.gui.ALL_CONTACTS=&جميع المستخدمين.
 service.gui.APPLY=&تطبيق
 service.gui.ARE_CALLING={0} يتصل بك...
@@ -63,7 +69,6 @@ service.gui.AT=عند
 service.gui.AUTHORIZE=&ترخيص
 service.gui.AUTHORIZATION_ACCEPTED={0} وافق على طلب تفويضك.
 service.gui.AUTHENTICATION_FAILED=فشل التحقق ل{0} . كلمة السر التي ادخلتها غير صالحة.
-service.gui.AUTHENTICATION_REQUESTED=طلب التحقق
 service.gui.AUTHENTICATION_REQUESTED_SERVER=الخادم {0} يطلب منك معلومات الدخول (التحقق).
 service.gui.AUTHENTICATION_REJECTED={0} رفض طلب تفويضك .
 service.gui.AUTHENTICATION_WINDOW_TITLE=التحقق أو التأكد من الهوية لـ {0}.
@@ -102,7 +107,6 @@ service.gui.CHANGE_NICKNAME_LABEL=فى الحقل فى الأسفل، يمكنك
 service.gui.CHANGE_NICKNAME_ERROR=خطأ في تغير الإسم المستعار
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=الاسم موجود مسبقاً
 service.gui.CHANGE_VIDEO_QUALITY=تغيير جودة الفيديو
-service.gui.CHAT_CONFERENCE_LABEL=مأتمرات
 service.gui.CHAT_ROOM_ALREADY_JOINED=تم دخول الغرفة {0} مسبقا.
 service.gui.CHAT_ROOM_CONFIGURATION=إعدادات غرفة الدردشة {0}
 service.gui.CHAT_ROOM_CONFIGURATION_FAILED=فشل فى الحصول على إعدادات غرفة الدردشة {0}. فقط مالك صالون الدردشة قادر على تغير الإعدادات .
@@ -114,13 +118,11 @@ service.gui.CHAT_ROOM_USER_QUIT=خرج من {0}
 service.gui.CHAT_ROOM_NAME=إسم غرفه الدردشة
 service.gui.CLEAR_CUSTOM_MESSAGES=احذف الرسائل المخصصة
 service.gui.ROOM_NAME=غرفة الدردشة
-service.gui.AUTOJOIN=دخول تلقائي
 service.gui.CHANGE_PASSWORD=تغيير كلمة المرور
 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_LEAVE_NOT_CONNECTED=يجب أن تكون مسجلا لكي تخرج من غرفة الدردشة.
-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} تتطلب كلمة سر.
@@ -136,21 +138,17 @@ service.gui.CLEAR=مسح
 service.gui.CLOSE=غلق&
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=لقد وصلتك رسالة جديدة منذ أقل من ثانيتين. هل تود أن تغلق هذا الحوار أو النقاش؟
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=لديك ملفات تنقل حاليا و غير مكتملة. هل أنت متأكد من رغبتك في إلغائها؟
-service.gui.CONFIRM=أكِّد
 service.gui.CONNECTED_STATUS=متصل
 service.gui.CONNECTING=الاتصال جار...
 service.gui.CONNECTING_STATUS=جاري الإتصال
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=جاري الإتصال*
 service.gui.CONNECTION=الإتصال
-service.gui.CONNECTION_FAILED_MSG=لم يتم الاتصال من الحساب : إسم المستخدم: {0} إسم الخادم : {1}. يرجى التأكد من الاتصال بالشبكة أو الاتصال بمسؤول الشبكة لديك لمزيد من المعلومات.
 service.gui.CONNECTION_EXPIRED_MSG=أنت غير متصل عبر الخادم {0}.
 service.gui.CONTACT_NAME=معرًف أو رقم
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=المستخدم {0} الذي تم إختياره لا يمكنه الاتصال بالهاتف.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=المستخدم {0} الذي تم إختياره لا يمكنه استخدام الدردشة عديدة المستخدمين.
 service.gui.CONTACT_PAUSED_TYPING=لقد توقف {0} لحظة عن كتابة الرسالة.
 service.gui.CONTACT_TYPING=المستخدم {0} يكتب رسالة الآن.
 service.gui.CONTACT_INFO=&معلومات جهة الإتصال
-service.gui.CONTACTLIST=قائمة جهات الإتصال
 service.gui.CONTACTS=المستخدمين (الأعضاء)
 service.gui.COPY=&نسخ
 service.gui.COPY_LINK=نسخ  &ربط
@@ -160,15 +158,12 @@ service.gui.CREATE_CHAT_ROOM=&إنشاء غرفة دردشة ...
 service.gui.CREATE_CHAT_ROOM_ERROR=فشل إنشاء غرفة الدردشة {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=مساعدة لإنشاء غرفة دردشة
 service.gui.CREATE_CONFERENCE_CALL=&إنشاء اتصال حوار متعدد (مكالمة)...
-service.gui.CREATE_CONFERENCE_CHAT=&إنشاء حوار متعدد (اتصال دردشة)...
 service.gui.CREATE_GROUP=&إنشاء مجموعة...
 service.gui.CREATE_GROUP_NAME=فى الحقل فى الأسفل أدخل أسم المجموعة التى تريد إنشاءها.
-service.gui.CREATE_FIRST_GROUP_WIZARD=قائمة المستخدمين لديك ليس فيها أي مجموعة. لطفا، بادر بإنشاء مجموعة (ملف /إنشاء مجموعة).
 service.gui.CREATE_VIDEO_BRIDGE=إنشاء &جسر فيديو...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=إنشاء &جسر فيديو
 service.gui.CONTACT_INFO_NOT_SUPPORTED=هذا المستخدم لا يمكنه التعامل مع معلومات المستخدم في الشبكة العنكبوتية
 service.gui.CUT=&قص
-service.gui.DATE=تاريخ
 service.gui.DELETE=حذف
 service.gui.DENY=&رفض
 service.gui.DESKTOP_SHARING_WARNING=<b>هل أنت متأكد من أنك تريد بدء مشاركة الشاشة؟<br></b>عند الموافقة سيتمكن البعض من رؤية ما تراه أمامك على الشاشة.
@@ -178,7 +173,6 @@ service.gui.DISCONNECTED_STATUS=مفصول
 service.gui.DND_STATUS=لا تزعجني
 service.gui.DO_NOT_ASK_AGAIN=لا تسألني مرة ثانية
 service.gui.DO_NOT_SHOW_AGAIN=لا تعرض هذه الرسالة مرة ثانية
-service.gui.DOWNLOAD_NOW=&تنزيل الآن
 service.gui.DRAG_FOR_SHARING=اسحب هنا كل ما تريد مشاركته...
 service.gui.DURATION=مدة
 service.gui.EDIT=&تعديل
@@ -195,7 +189,6 @@ service.gui.ERROR_RECEIVED_FROM=خطأ مستقبل من
 service.gui.ESTIMATED_TIME=الوقت المخمن :
 service.gui.EVENTS=أحداث
 service.gui.EXIT=خ&روج
-service.gui.EXTENDED_CRITERIA=معايير مطولة
 service.gui.GENERAL=عام
 service.gui.GENERAL_ERROR=خطأ عام
 service.gui.GROUP_NAME=إسم المجموعة
@@ -253,12 +246,12 @@ service.gui.HISTORY=&السجل
 service.gui.HISTORY_CONTACT=سجل - {0}
 service.gui.HOME=الرئيسية
 service.gui.HOME_PAGE=الصفحة الرئيسية
-service.gui.HOUR=ساعة
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=معرف
 service.gui.IGNORE=&تجاهل
 service.gui.INSERT_SMILEY=أدخل وجها تعبيريا
 service.gui.INCOMING_CALL=مكالمة واردة من : {0}
+service.gui.INCOMING_SCREEN_SHARE=مكالمة واردة من : {0}
 service.gui.INCOMING_CALL_STATUS=مكالمة واردة
 service.gui.INSTANT_MESSAGINGS=IMs
 service.gui.INITIATING_CALL_STATUS=التحضير للمكالمة
@@ -273,11 +266,8 @@ service.gui.INVITE_CONTACT_TO_CALL=أرسل دعوة إلى المستخدمين
 service.gui.INVITE_REASON=سبب الدعوة
 service.gui.IS_CALLING=يتصل ....
 service.gui.IS_NOW={0} هو {1} الآن
-service.gui.JITSI_WARNING=لقد تم تسمية سيب كومينيكاتور بـ جيتسي مؤخرا.<br> لجعل نسختك حديثة دوما، بادر بتنزيل جيتسي الآن. <br> نأسف لما قد يسببه ذلك لكم.<br> مع تحيات فريق تطوير جيتسي
-service.gui.JITSI_WARNING_TITLE=سيب كومينيكاتور أصبح يعرف بـ جيتسي
 service.gui.JOIN=&إنضم أو شارك
 service.gui.JOIN_AS=إ&نضم كـ
-service.gui.CLOSE_CHAT_ROOM_DIALOG=غ&لق
 service.gui.JOB_TITLE=عنوان الوظيفة
 service.gui.JOIN_CHAT_ROOM=&أدخل غرفة الدردشة...
 service.gui.JOIN_CHAT_ROOM_TITLE=أدخل غرفة الدردشة
@@ -288,7 +278,6 @@ 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.LAST_NAME=اسم العائلة
 service.gui.LEAVE=&أترك
 service.gui.LIMIT_REACHED_FOR_IP=لديك العديد من التسجيلات من عنوان انترنت واحد و الخادم {0} لا يسمح لك بعمل المزيد منها.
@@ -308,7 +297,6 @@ service.gui.MESSAGE=رسالة
 service.gui.MISSED_CALLS_TOOL_TIP=مكالمات لم يتم الرد عليها واردة من:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= و بالاضافة إلى {0}
 service.gui.MODERATOR=منسق
-service.gui.MORE=رؤية المزيد
 service.gui.MORE_LABEL=أنقل
 service.gui.MOVE=أنقل
 service.gui.MOVE_SUBCONTACT=أن&قل مستخدم
@@ -317,7 +305,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=المستخدم الذي اخترت هو ن�
 service.gui.MOVE_SUBCONTACT_QUESTION=متأكد من نقل {0} إلى {1}؟
 service.gui.MOVE_TO_GROUP=&أنقل إلى مجموعة
 service.gui.MOVE_CONTACT=نقل مستخدم
-service.gui.MOVE_CONTACT_ERROR=&لا يمكن نقل المستخدم
 service.gui.MSG_DELIVERY_FAILURE=الرسالة في أعلاه لم يتمكن من إرسالها
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=نظام الاتصال (بروتوكول) المستخدم لا يتعامل مع الرسائل المبيتة. حاول أن تستخدم {0} نظاما آخر أو أن تنتظر حتى يكون المستخدم متصلا,
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=حصل خلل داخلي. أغلب الظن بسبب خلل. يرجى الإعلام عنه هنا: http://www.jitsi.org/index.php/Development/BugsAndIssues
@@ -328,7 +315,6 @@ service.gui.MSG_NOT_POSSIBLE=الرسائل غير ممكنة مع هذا الم
 service.gui.MSG_RECEIVED={0} كتب
 service.gui.MSG_SEND_CONNECTION_PROBLEM=عليك أن تكون مسجلا حتى تبعث رسائلا.
 service.gui.MULTIPLE_LOGINS=لقد سجلت دخولك أكثر من مرة بهذا الحساب. الحساب التالي غير موصول حاليا: اسم المستخدم: {0}، اسم الخادم: {1}.
-service.gui.MUTE=بدون صوت
 service.gui.MUTUALLY_ON_HOLD_STATUS=في وضع الانتظار من الجهتين.
 service.gui.NAME=اسم
 service.gui.NETWORK=شبكة
@@ -339,6 +325,7 @@ service.gui.NEW_MESSAGE=رسالة جديدة
 service.gui.NEW_NAME=اسم جديد
 service.gui.NEW_STATUS_MESSAGE=رسالة جديدة للدلالة على الحالة
 service.gui.NEW_STATUS_MESSAGE_SAVE=أحفظ كرسالة مخصصة
+service.gui.NICKNAME=لقب
 service.gui.NO=لا
 service.gui.NONE=لا أحد
 service.gui.NO_CAMERA_AVAILABLE=لا توجد كاميرا
@@ -355,7 +342,6 @@ service.gui.NON_EXISTING_USER_ID=الخادم {0} لا يعرف هوية الم�
 service.gui.SD_QUALITY=جودة قياسية
 service.gui.OFFLINE=غير متصل
 service.gui.OK=&موافق
-service.gui.OLDER_CALLS=المكالمات السابقة
 service.gui.ONLINE=متصل (مسجل)
 service.gui.OPEN=فتح
 service.gui.OPEN_FILE_FROM_IMAGE=اضغط مرتين لفتح الملف.
@@ -363,9 +349,12 @@ service.gui.OPEN_FOLDER=فتح المجلد
 service.gui.OPEN_IN_BROWSER=فتح في &مستعرض
 service.gui.OPTIONS=خيارات
 service.gui.OR=أو
-service.gui.OR_ENTER_PHONE_NUMBER=أو أدخل رقم الهاتف هنا...
 service.gui.ORGANIZATION=منظمة
 service.gui.OTHER=أخرى
+service.gui.chat.role.ADMINISTRATOR=المسؤول
+service.gui.chat.role.MODERATOR=منسق
+service.gui.chat.role.MEMBER=عضو أو مشترك
+service.gui.chat.role.SILENT_MEMBER=عضو صامت
 service.gui.OWNER=مالك الغرفة
 service.gui.PASSWORD=كلمة السر
 service.gui.PASSWORD_CHANGE_FAILURE=فشل تغيير كلمة المرور
@@ -380,7 +369,6 @@ service.gui.PRESENCE=حضور
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS="إدخال" للمقترحات
 service.gui.PRESS_FOR_CALL_INFO=إضغط للحصول على معلومات المكالمة
 service.gui.PREVIOUS=سابق
-service.gui.PREVIOUS_TOOLTIP=استعراض الحوارات السابقة
 service.gui.PRINT=&طباعة
 service.gui.PROACTIVE_NOTIFICATION=يكتب رسالة
 service.gui.PROTOCOL=نظام (بروتوكول)
@@ -393,7 +381,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=لقد قمت بقطع الاتصال و
 service.gui.RE_REQUEST_AUTHORIZATION=(أعد) طلب التصريح
 service.gui.REFERRED_STATUS=مشار إليه
 service.gui.REJECT=&رفض
-service.gui.REMIND_ME_LATER=ذكرًني لاحقا
 service.gui.REMEMBER_PASSWORD=حفظ كلمة السر
 service.gui.REMOVE=&حذف
 service.gui.REMOVE_ACCOUNT=&حذف حساب
@@ -417,27 +404,18 @@ service.gui.REVOKE_ADMIN=إخلاء المسؤولية
 service.gui.REVOKE_MODERATOR=التخلي عن واجب التنسيق
 service.gui.REVOKE_MEMBERSHIP=التخلي عن العضوية
 service.gui.REVOKE_VOICE=التخلي عن الكلام
-service.gui.ROOT_GROUP=مجموعة رئيسة
 service.gui.SAVE=&احفظ
-service.gui.SAVE_AS_DEFAULT=احفظ كافتراضي
 service.gui.SEARCH=&ابحث
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=اضغط على الزر في الأسفل لإظهار جميع غرف الحوار على الخادم الذي اخترت. ثم اختر ما تريد منها للدخول إليها و اضغط على دخول أو انضمام.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=بحث جهة إتصال
 service.gui.SECURITY=حماية
-service.gui.SELECT_ACCOUNT=اختر حسابا
 service.gui.SELECT_COLOR=اختر لونا
 service.gui.SELECT_GROUP=اختر مجموعة
-service.gui.SELECT_GROUP_WIZARD_MSG=القائمة في الأسفل تحتوي على جميع أسماء مجموعات المستخدمين لديك. اختر ما شئت منها لتحديد مكان إضافة المستخدم الجديد.
 service.gui.SELECT_NO_GROUP=و لا مجموعة
-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=أرسل رسالة قصيرة (خدمة SMS)
 service.gui.SEND_SMS=أ&رسل رسالة قصيرة (خدمة SMS)
 service.gui.SEND_SMS_DETAILS=تذكًر أن عليك إدخال الرقم كاملا. مثال ، بـدءا بـ 44+ لبريطانيا، كما يلي : 447777000000+.
 service.gui.SEND_SMS_NOT_SUPPORTED=البروتوكول الذي اخترت لا يتعامل مع خدمة الرسائل القصيرة.
@@ -472,7 +450,6 @@ service.gui.STREET=الشارع
 service.gui.SUBJECT=موضوع
 service.gui.SUMMARY=خلاصة
 service.gui.TELEPHONY=هاتف
-service.gui.TODAY=اليوم
 service.gui.TOOLS=&أداوات
 service.gui.TRANSFER=&تحويل
 service.gui.TO=&إلى:
@@ -482,7 +459,6 @@ service.gui.TRANSFER_CALL_TO=تحويل إلى :
 service.gui.TRANSPARENCY_NOT_ENABLED=الشفافية غير متاحة حسب الاعدادات الحالية لديك.
 service.gui.TYPE_YOUR_REQUEST=أدخل طلبك هنا
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=لم نستطع تغييرجودة فيديوهذه المكالمة.
-service.gui.UNMUTE=تفعيل الصوت
 service.gui.USER_IDENTIFIER=معرف المستخدم :
 service.gui.USER_EXISTS_ERROR=هذا المستخدم موجود أصلا على الشبكة التي اخترت. لطفا، اختر شبكة أخرى.
 service.gui.USERNAME_NULL=إملأ اسم المستخدم و كلمة السر.
@@ -494,7 +470,6 @@ service.gui.USE_PROVISIONING=استخدم التزود (بخدمة أو بعنو
 service.gui.VALUE=قيمة:
 service.gui.VIDEO_CALL=&مكالمة بالصوت و الصورة (فيديو)
 service.gui.VIA=عبر
-service.gui.VIA_SMS=باستخدام خدمة الرسائل القصيرة
 service.gui.VIEW=&عرض
 service.gui.VIEW_HISTORY=عرض &السجل
 service.gui.VIEW_SMILEYS=أظهر الرسوم &التعبيرية
@@ -512,9 +487,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=عدّل مستوى الصوت
 service.gui.WAITING_AUTHORIZATION=جاري انتظار تصريح
 service.gui.WARNING=تحذير
 service.gui.YES=نعم
-service.gui.YESTERDAY=يوم أمس
-service.gui.EXISTING_ACCOUNT_ERROR=الحساب الذي أدخلت موجود أصلا.
-service.gui.NEW_MAIL=<b>لديك بريد جديد واحد ! </b><br/><b>من:</b> {0} {1} <br/><b>الموضوع</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=لديك رسالة جديدة في {0} <a href="{1}">صندوق البريد</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=عدد الرسائل الجديدة هو {2} في <a href="{1}">صندوق البريد</a>:{0} <br/>
 service.gui.NEW_GMAIL_FOOTER=لديك حوارا واحدا لم يقرأ بعد في <a href="{0}">صندوقك</a>.<br/>
@@ -536,7 +508,6 @@ service.gui.SECURITY_WARNING=تحذير حماية
 service.gui.SECURITY_ERROR=خلل حماية
 service.gui.SPEED=السرعة:
 service.gui.SILENT_MEMBER=عضو صامت
-service.gui.UPDATE=تجديد أو تحديث
 service.gui.MOBILE_PHONE=محمول
 service.gui.VIDEO_PHONE=فيديو 
 service.gui.WORK_PHONE=العمل
@@ -563,7 +534,6 @@ service.gui.callinfo.TECHNICAL_CALL_INFO=معلومة تقنية عن الإتص
 service.gui.callinfo.CALL_INFORMATION=معلومات الطلب
 service.gui.callinfo.CALL_IDENTITY=هوية
 service.gui.callinfo.PEER_COUNT=عدد المشاركين
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=تفعيل التشفير
 service.gui.callinfo.CALL_DURATION=مدة المكالمة
 service.gui.callinfo.VIEW_CERTIFICATE=أظهر الشهادة
 service.gui.callinfo.CODEC=برنامج ترميز / تردد
@@ -578,8 +548,11 @@ service.gui.callinfo.JITTER=Jitter
 service.gui.callinfo.MEDIA_STREAM_RTP=RTP
 service.gui.callinfo.MEDIA_STREAM_SRTP=RTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=بروتوكول مفتاح التبادل
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.COMPLETED=إكتمل
 service.gui.callinfo.ICE_STATE.FAILED=فشل
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=مضيف محلي / مدخل
 service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=IP عن بعد / مدخل
 service.gui.callinfo.HARVESTING_MS_FOR=ms (ل
@@ -588,9 +561,10 @@ service.gui.ALWAYS_TRUST=الوثوق دوما بهذه الشهادة
 service.gui.CERT_DIALOG_TITLE=تحقق من الشهادة
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0}لا يمكن التحقق من هوية الخادم عند الاتصال <br>بـ {1}:{2}.<br><br> الشهادة غير موثوق بها، يعني أن هوية الخادم لا يمكن <br> التحقق منها تلقائيا. هل تريد الاستمرار بالاتصال؟<br><br> للمزيد من المعلومات اضغط على "إظهار الشهادة".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0}لا يمكن التحقق من هوية الخادم عند الاتصال <br>بـ {1}:{2}.<br><br> الشهادة غير موثوق بها، يعني أن هوية الخادم لا يمكن <br> التحقق منها تلقائيا. هل تريد الاستمرار بالاتصال؟<br><br> للمزيد من المعلومات اضغط على "إظهار الشهادة".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} لا يمكن التحقق من هوية  المستخدم.<br><br> الشهادة غير موثوق بها، يعني أن هوية المستخدم لا يمكن <br> التحقق منها تلقائيا. هل تريد الاستمرار بالاتصال؟<br><br> للمزيد من المعلومات اضغط على "إظهار الشهادة".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} لا يمكن التحقق من هوية  المستخدم.<br><br> الشهادة غير موثوق بها، يعني أن هوية المستخدم لا يمكن <br> التحقق منها تلقائيا. هل تريد الاستمرار بالاتصال؟<br><br> للمزيد من المعلومات اضغط على "إظهار الشهادة".</html>
 service.gui.CONTINUE_ANYWAY=واصل على أي حال
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=اسم الشهرة:
 service.gui.CERT_INFO_O=منظمة :
 service.gui.CERT_INFO_C=اسم البلد:
@@ -599,17 +573,16 @@ service.gui.CERT_INFO_L=المكان أو المنطقة:
 service.gui.CERT_INFO_OU=الوحدة التنظيمية:
 service.gui.CERT_INFO_ISSUED_ON=أصدرت بتاريخ:
 service.gui.CERT_INFO_EXPIRES_ON=تاريخ انتهاء الصلاحية:
+service.gui.CERT_INFO_FINGERPRINTS=بصمة
 service.gui.CERT_INFO_SER_NUM=الرقم التسلسلي:
 service.gui.CERT_INFO_VER=نسخة:
 service.gui.CERT_INFO_SIGN_ALG=نوع نمط التوقيع:
 service.gui.CERT_INFO_ALG=النمط المستخدم:
 service.gui.CERT_INFO_PUB_KEY=المفتاح العام:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} بايت: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} بت
 service.gui.CERT_INFO_EXP=الأس:
 service.gui.CERT_INFO_KEY_SIZE=طول المفتاح
 service.gui.CERT_INFO_SIGN=التوقيع:
-service.gui.CONTINUE=تابع
 service.gui.SHOW_CERT=أظهر الشهادة
 service.gui.HIDE_CERT=إخفاء الشهادة
 
@@ -630,10 +603,8 @@ service.gui.security.SECURE_AUDIO=صوت أمن
 service.gui.security.AUDIO_NOT_SECURED=صوت غير أمن
 service.gui.security.SECURE_VIDEO=فيديو أمن
 service.gui.security.VIDEO_NOT_SECURED=فيديو غير أمن
-service.gui.security.NO_VIDEO=لا يوجد فيديو
-service.gui.security.CIPHER=تشفير: {0}
+service.gui.security.CALL_SECURED_TOOLTIP=مكالمة أمنة. لمعلومات أكثر إضغط هنا.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=مكالمة غير أمنة.
-service.gui.security.COMPARE_WITH_PARTNER=قارن مع رفيق (أو شريك) و اضغط على القفل للتفعيل.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=قارن مع الرفيق أو الشريك : {0}
 service.gui.security.STRING_COMPARED=سلسلة حرفية مقارنة!
@@ -650,19 +621,13 @@ service.gui.avatar.imagepicker.CLICK=اضغط و ابتسم
 service.gui.avatar.imagepicker.IMAGE_FILES=ملفات الصور
 service.gui.avatar.imagepicker.IMAGE_PICKER=صورة
 service.gui.avatar.imagepicker.IMAGE_SIZE=حجم الصورة
-service.gui.avatar.imagepicker.INITIALIZING=تجهيز
 service.gui.avatar.imagepicker.RESET=إعادة لوضع البدء
 service.gui.avatar.imagepicker.SET=جهِّز
 service.gui.avatar.imagepicker.TAKE_PHOTO=تصور
-service.gui.avatar.imagepicker.WEBCAM_ERROR=خطأ في الكاميرا
 
 service.gui.security.encryption.required=تشفير ملزم!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=خطأ في تخزين قائمة الإتصال SIP
 impl.protocol.sip.XCAP_ERROR_UNAUTHORIZED=اسم المستخدم أو كلمة السر خاطئة بإستخدام xcap. ل {0}.
@@ -684,9 +649,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=اختر شبكة
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=إعداد LDAP
 impl.ldap.GENERAL=عام
-impl.ldap.NEW=جديد
 impl.ldap.EDIT=تعديل
-impl.ldap.REMOVE=احذف
 impl.ldap.ENABLED=تم تفعيله
 impl.ldap.SERVER_NAME=اسم الخادم
 impl.ldap.SERVER_NAME_EXAMPLE=خادمي LDAP
@@ -719,6 +682,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=هاتف البيت
 impl.ldap.PHONE_PREFIX=بادئة هاتف
 impl.ldap.PHONE_PREFIX_EXAMPLE=مثال: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=كتاب العناوين
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=تفعيل البحث في كتاب العناوين لنظام ماكنتوش أوو أس إكس
@@ -729,9 +696,7 @@ plugin.addrbook.PREFIX_EXAMPLE=مثال: 00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=مستخدمي غوغل
-impl.googlecontacts.NEW=جديد
 impl.googlecontacts.EDIT=حرر
-impl.googlecontacts.REMOVE=حذف
 impl.googlecontacts.ENABLED=تم تفعيله
 impl.googlecontacts.ACCOUNT_NAME=اسم الحساب
 impl.googlecontacts.SAVE=احفظ
@@ -760,9 +725,6 @@ plugin.accountinfo.EMAIL=بريد ألكتروني:
 plugin.accountinfo.PHONE=هاتف:
 plugin.accountinfo.MOBILE_PHONE=هاتف جوال
 plugin.accountinfo.JOB_TITLE=عنوان الوظيفة
-plugin.accountinfo.USER_PICTURES=صور المستخدم
-plugin.accountinfo.CHANGE=غيِّر
-plugin.accountinfo.ONLY_MESSAGE=رسائل فقط
 
 # connection info
 
@@ -781,49 +743,12 @@ plugin.aimaccregwizz.USERNAME=اسم مستخدم AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=اسم المستخدم و كلمة السر
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=التسجيل بحساب جديد
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=إذا لم يكن لديك حساب من AIM ، اضغط على هذا الزر لإنشاء حساب جديد.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=تخطي خيارات الخادم الافتراضية
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=عن {0}
 plugin.branding.LOGO_MESSAGE=نقل الصوت عبر الانترنت و الرسائل المباشرة، تقنية مجانية
-plugin.branding.LOADING=تحميل
 plugin.branding.ABOUT_MENU_ENTRY=&عن البرنامج
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}> {1} حاليا تحت التطوير المستمر‫.‬ النسخة التي لديك نسخة تجريبية و قد لا تعمل كما تتوقع‫.‬ لمزيد من المعلومات بإمكانك زيارة  {2} .</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 حقوق النشر <b>jitsi.org</b>. الحقوق محفوظة. بالإمكان زيارة <a href="http://jitsi.org">http://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}> <b>جيتسي</b> يوزع حسب اتفاقية LGPL ""(<a href=\\"http://www.gnu.org\\">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=القواميس
-plugin.dictaccregwizz.ANY_DICTIONARY=أي قاموس
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=أي قاموس من {0}
-plugin.dictaccregwizz.FIRST_MATCH=أول تطابق
-plugin.dictaccregwizz.NO_MATCH=لا تطابق
-plugin.dictaccregwizz.MATCH_RESULT=لا توجد تعريفات لـ "{0}"، ربما أنك تقصد:\n
-plugin.dictaccregwizz.INVALID_DATABASE=القاموس الحالي "{0}" لم يعد موجودا لدى الخادم.
-plugin.dictaccregwizz.INVALID_STRATEGY=فنون التخطيط الحالية غير موجودة لدى الخادم.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول خدمة Dict
-plugin.dictaccregwizz.HOST=المضيف
-plugin.dictaccregwizz.SERVER_INFO=معلومات الخادم
-plugin.dictaccregwizz.STRATEGY_SELECTION=اختيار فن التخطيط
-plugin.dictaccregwizz.STRATEGY_LIST=قائمة بفنون التخطيط:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=فنون تخطيط البحث
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=أساليب البحث تبحث عن التشابه في الكلمات، إذا لم يوجد تطابق، بفضل عدة حلول. مثلا أساليب البحث حسب البداية تبحث عن الكلمات التي تبدأ بالمقطع الذي تحدده.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=معلومات حساب Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=هذا المساعد سينشئ لك حساب Dict من dict.org.\n\nيمكنك أن تضيف قاموسا جديدا باستخدام "المساعد في تسجيل حساب جديد". املأ حقل اسم المضيف باسم القاموس الذي تود اضافته.
-plugin.dictaccregwizz.THREAD_CONNECT=محاولة الاتصال بالخادم
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=فشل الاتصال، هذا ليس خادم Dict أو أن الخادم غير متصل.
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=عرض فنون التخطيط
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=لا توجد فنون للتخطيط على الخادم
-plugin.dictaccregwizz.POPULATE_LIST=ملء القائمة
-plugin.dictaccregwizz.CLOSING_CONNECTION=إنهاء الإتصال
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">لاستخدام الدردشة على الفيس بوك يجب إنشاء "اسم مستخدم<br>من صفحة إعدادات الحساب على الفيس بوك.</a><br><br>Nملاحظة: عندما تنشئ اسم مستخدم عليك  أن تسجل خروجك من الصفحة<br>، قد يتطلب وقتا قبل أن تسجل دخولك باستخدام اسم المستخدم الجديد! </center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول الدردشة لفيس بوك
-plugin.facebookaccregwizz.PROTOCOL_NAME=فيس بوك
-plugin.facebookaccregwizz.USERNAME=اسم المستخدم:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=اسم المستخدم و كلمة السر
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=إعادة تشغيل {0} تلقائيا عند بدء تشغيل أو إعادة تشغيل الحاسوب
@@ -833,9 +758,6 @@ plugin.generalconfig.SHOW_HISTORY=أظهر
 plugin.generalconfig.HISTORY_SIZE=الرسائل الحديثة في الحوارات الجديدة
 plugin.generalconfig.SEND_MESSAGES_WITH=ابعث الرسائل مع:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=لجعل نافذة الحوار فوق الأخريات
-plugin.generalconfig.ERROR_PERMISSION=ليس لديك صلاحيات كافية لإلغاء إعادة التشغيل تلقائيا
-plugin.generalconfig.TRANSPARENCY=شفافية أو صراحة
-plugin.generalconfig.ENABLE_TRANSPARENCY=تفعيل الشفافية
 plugin.generalconfig.DEFAULT_LANGUAGE=لغة الواجهة البينية
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=التغييرات سوف تفعَّل لدى اعادة التشغيل التالي.
 plugin.generalconfig.SIP_CLIENT_PORT=ميناء عميل سيب SIP
@@ -873,19 +795,20 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=تسجيل حساب جديد
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول IRC.
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=رمز المستخدم و كلمة السر
+plugin.ircaccregwizz.USERNAME=لقب
 plugin.ircaccregwizz.INFO_PASSWORD=أغلب خوادم IRC لا تتطلب كلمة سر.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=غيِّر تلقائيا اللقب إذا كان مستعملا أصلا
 plugin.ircaccregwizz.USE_DEFAULT_PORT=استعمل الميناء الافتراضي
 plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=لقبي لا يحتاج إلى تعريف
 plugin.ircaccregwizz.HOST=اسم المضيف:
 plugin.ircaccregwizz.IRC_SERVER=خادم
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=التحقق أو التأكد من الهوية لـ {0}.
+plugin.ircaccregwizz.SASL_USERNAME=اسم المستخدم:
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول XMPP
 plugin.jabberaccregwizz.USERNAME=XMPP إسم المستخدم
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=أكد كلمة السر
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=اسم المستخدم و كلمة السر
 plugin.jabberaccregwizz.CSERVER=خادم
 plugin.jabberaccregwizz.SERVER=الاتصال بالخادم
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=تفعيل "إبقاء الاتصال"
@@ -901,13 +824,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=تعقيب أو ملاحظة
 plugin.jabberaccregwizz.RESOURCE=وسيلة أو مورد
 plugin.jabberaccregwizz.AUTORESOURCE=أنتج تلقائيا وسيلة
 plugin.jabberaccregwizz.PRIORITY=أولوية
-plugin.jabberaccregwizz.XMPP_ERROR=خطأ XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=خطأ XMPP غير معروف. تأكد من اسم الخادم.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=كلمة السر غير مطابقة
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=تخطي خيارات الخادم الافتراضية
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=خيارات متقدمة
 plugin.jabberaccregwizz.USE_ICE=استعمل ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=إستعمل Google's Jingle/ICE (تجريبي)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=استكشف تلقائيا خادم STUN/TURN
 plugin.jabberaccregwizz.SUPPORT_TURN=دعم لـ TURN
 plugin.jabberaccregwizz.TURN_USERNAME=اسم المستخدم لـ TURN
@@ -933,9 +852,6 @@ plugin.jabberaccregwizz.TELEPHONY_DOMAIN=نطاق الهاتف
 plugin.jabberaccregwizz.ALLOW_NON_SECURE=إسمح لإتصالات غير أمنة
 plugin.jabberaccregwizz.SERVER_OPTIONS=خيارات الخادم
 plugin.jabberaccregwizz.CHANGE_PASSWORD=تغيير حساب كلمة المرور
-plugin.jabberaccregwizz.NEW_PASSWORD=كلمة مرور جديدة
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=أكد كلمة السر
-plugin.jabberaccregwizz.PASSWORD_EMPTY=كلمة المرور فارغة
 plugin.jabberaccregwizz.PASSWORD_CHANGED=لقد تمّ تغيير كلمة المرور بنجاح
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=خادمك XMPP لا يدعم تغيير كلمة المرور.
 plugin.jabberaccregwizz.ENTER_NEW_PASSWORD=الرجاء إدخال كلمة المرور في كلا الحقلين
@@ -944,25 +860,9 @@ plugin.jabberaccregwizz.AUDIO=سمعي
 plugin.jabberaccregwizz.VIDEO=فيديو (عرض بالصور)
 plugin.jabberaccregwizz.RESET=إعادة لوضع البدء
 
-# mailbox
-plugin.mailbox.OUTGOING=رسالة صادرة:
-plugin.mailbox.INCOMING=رسائل واردة:
-plugin.mailbox.WAIT_TIME=المدة حتى ترسل المكالمة إلى البريد الصوتي
-plugin.mailbox.MAX_MESSAGE_TIME=أقصى فترة للرسالة الواردة
-plugin.mailbox.CONFIRM=أكِّد
-plugin.mailbox.DEFAULTS=افتراضيات
-plugin.mailbox.MAILBOX=صندوق البريد
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول للوصول إلى الدردشة في خدمة MSN
-plugin.msnaccregwizz.USERNAME=بريد الكتروني:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=اسم المستخدم و كلمة السر
-
 # plugin manager
 plugin.pluginmanager.INSTALL=تثبيت
 plugin.pluginmanager.UNINSTALL=إزالة
-plugin.pluginmanager.UPDATE=تجديد أو تحديث
 plugin.pluginmanager.PLUGINS=إضافات مدمجة
 plugin.pluginmanager.URL=عنوان وحيد لكائن مصدري
 plugin.pluginmanager.CHOOSE_FILE=اختر ملفا
@@ -987,7 +887,6 @@ plugin.sipaccregwizz.SERVER_PORT=ميناء الخادم
 plugin.sipaccregwizz.PROXY=بروكسي (خادم يقوم مقام عميل أو خادم)
 plugin.sipaccregwizz.PROXY_PORT=ميناء البروكسي
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=وسيلة النقل المفضلة
-plugin.sipaccregwizz.ADVANCED_OPTIONS=خيارات متقدمة
 plugin.sipaccregwizz.PROXY_OPTIONS=خيارات البروكسي
 plugin.sipaccregwizz.PROXY_AUTO=إعداد البروكسي تلقائيا
 plugin.sipaccregwizz.ENABLE_PRESENCE=تفعيل الحضور (بسيط)
@@ -1003,8 +902,6 @@ plugin.sipaccregwizz.DTMF=DTMF
 plugin.sipaccregwizz.DTMF_METHOD=طريقة DTMF
 plugin.sipaccregwizz.DTMF_RTP=(RTP ( RFC2833 / RFC 4733 
 plugin.sipaccregwizz.DTMF_SIP_INFO=معلومات SIP
-plugin.sipaccregwizz.REGISTER=سجَّل
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=تجاهل خيارات الخادم الافتراضية
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=تفعيل تشفير المكالمات
 plugin.sipaccregwizz.AUTH_NAME=اسم السماح بالدخول
 plugin.sipaccregwizz.DISPLAY_NAME=الإسم المعروض
@@ -1021,6 +918,7 @@ plugin.sipaccregwizz.VOICEMAIL=بريد صوتي
 plugin.sipaccregwizz.MWI=جاري إنتطار رسالة (MWI)
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=كلمة السر غير مطابقة
 plugin.sipaccregwizz.SAVP_OPTION=إشارة RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_1=إجباري (عرض و اقبل فقط RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=أختياري (عرض أولا RTP/SAVP, و بعدها RTP/AVP)
 plugin.sipaccregwizz.SHOW_ADVANCED=إعدادات متقدمة للتشفير
@@ -1033,15 +931,6 @@ plugin.skinmanager.DEFAULT_SKIN=المظهَر الافتراضي
 plugin.skinmanager.ADD_NEW_SKIN=أضف مظهَراً جديداً...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=المظهَر الافتراضي للتطبيق
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول آمن للاتصال بالحواسيب البعيدة باستخدام SSH
-plugin.sshaccregwizz.USERNAME=معرِّف الحساب:
-plugin.sshaccregwizz.IDENTITY_FILE=ملف الهوية:
-plugin.sshaccregwizz.KNOWN_HOSTS=الحواسيب أو المضيفات المعروفة:
-plugin.sshaccregwizz.OPTIONAL=اختياري
-plugin.sshaccregwizz.ACCOUNT_DETAILS=تفاصيل الحساب
-
 # status update
 plugin.autoaway.AUTO_STATUS=غائب تلقائياً
 plugin.autoaway.ENABLE_CHANGE_STATUS=غيِّر الحالة أثناء غيابك
@@ -1087,22 +976,6 @@ plugin.whiteboard.DESELECT=إلغاء الاختيار
 plugin.whiteboard.DELETE=حذف
 plugin.whiteboard.PROPERTIES=خصائص
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول للاتصال و الدردشة مع خدمة ياهوو.
-plugin.yahooaccregwizz.USERNAME=اسم المستخدم:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=اسم المستخدم و كلمة السر
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=خدمة الـ"من دون تعريف"
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=نظام الـ"بدون تعريف" أو بونجور.
-plugin.zeroaccregwizz.FIRST_NAME=الاسم الأول:
-plugin.zeroaccregwizz.LAST_NAME=اسم العائلة:
-plugin.zeroaccregwizz.EMAIL=بريد ألكتروني:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=تذكر مستخدمي بونجور ؟
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=المعرِّف و كلمة السر
-plugin.zeroaccregwizz.USERID=معرِّف المستخدم :
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=بروتوكول نقاش غوغل
@@ -1116,19 +989,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org، بوابة الاتصا�
 plugin.iptelaccregwizz.USERNAME=اسم المستخدم:
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=اشترك مع iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=الاتصال بالصوت (و الصورة) و التحاور عبر الانترنت
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=اسم المستخدم:
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD= أعد كتابة كلمة السر
 plugin.sip2sipaccregwizz.EMAIL=بريد ألكتروني
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=للمزيد عن هذه الخدمة تفضل بزيارة<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>عنوان البريد الالكتروني يستعمل لارسال بريد صوتي<br>و للتنبيه عند وجود مكالمات فائتة و لاسترجاع كلمة السر مفقودة</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>للمساعدة حول هذه الخدمة، تفضل بزيارة<a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=حساب sip2sip.info موجود أصلا
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=أنشئ حساب sip2sip.info مجانا
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=نقل الصوت عبر الانترنت و الرسائل المباشرة
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=للمزيد عن هذه الخدمة تفضل بزيارة<br>http://ippi.fr
@@ -1137,6 +1002,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=حساب ippi موجود أصلا
 plugin.ippiaccregwizz.CREATE_ACCOUNT=أنشئ حساب ippi مجانا
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=إغلاق نافذة الدردشة
 plugin.keybindings.CHAT_COPY=نسخ
 plugin.keybindings.CHAT_CUT=قص
@@ -1158,14 +1024,15 @@ plugin.keybindings.globalchooser.MUTE_CALLS=كتم المكالمات
 plugin.keybindings.globalchooser.SHORTCUT_NAME=اسم
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=إختصار أوّلي
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=إختصار ثانوي
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=جاري الإنتظار
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=تفعيل مفتاح التحقق الخاص
 plugin.keybindings.PLUGIN_NAME=ارتباط المفاتيح
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=دردشة
 plugin.keybindings.MAIN=رئيسي
 plugin.keybindings.GLOBAL=اختصارات عامة
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=تفعيل
 plugin.notificationconfig.DESCRIPTION=وصف
 plugin.notificationconfig.TURN_ON_ALL=تشغيل الكل
 plugin.notificationconfig.TURN_OFF_ALL=إيقاف الكل
@@ -1182,6 +1049,7 @@ plugin.notificationconfig.BROWSE_SOUND=اختر ملف الصوت
 plugin.notificationconfig.BROWSE_PROGRAM=إختر برنامج
 plugin.notificationconfig.tableheader.EXECUTE=تنفيذ برنامج:
 plugin.notificationconfig.tableheader.DESCRIPTION=وصف الحدث
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=مكالمة واردة
 plugin.notificationconfig.event.SecurityMessage=رسالة أمنة
 plugin.notificationconfig.event.IncomingFile=مكالمة واردة
@@ -1275,6 +1143,7 @@ impl.neomedia.configform.VIDEO=فيديو
 
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultProfile=تشفير التخطيط الافتراضي للخيارات للمستخدم إلى:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=خط أساس
 impl.neomedia.configform.H264.defaultProfile.high=عالي
 impl.neomedia.configform.H264.defaultProfile.main=رئيسي
@@ -1303,7 +1172,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=كلمة السر الحا
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=أدخل كلمة سر جديدة:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=أعد كتابة كلمة السر:
 plugin.securityconfig.masterpassword.MP_TITLE=كلمة السر الرئيسة 
-plugin.securityconfig.masterpassword.MP_NOT_SET=(غير مجهز)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=لم تقم بإدخال كلمة السر الرئيسة الحالية كما يجب. لطفا، حاول مرة أخزى.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=كلمة السر الرئيسة غير صحيحة !
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=فشل تغيير كلمة السر
@@ -1319,7 +1187,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=كلمة السر
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(مجهول)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(لا يمكن فك الترميز)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=كلمات مرور محفوظة
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=حذف
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=احذف الكل
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=أمتأكد من أنك تريد حذف كل كلمات السر؟
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=حذف كل كلمات السر
@@ -1381,7 +1248,6 @@ plugin.globalproxy.PROXY_PORT=ميناء البروكسي
 plugin.globalproxy.PROXY_USERNAME=اسم المستخدم للبروكسي
 plugin.globalproxy.PROXY_PASSWORD=كلمة السر للبروكسي
 plugin.globalproxy.DESCRIPTION={0} سيستخدم إعدادات البروكسي أعلاه لجميع الشبكات التي ستتصل بها أو منها منذ الآن.\nإن دعم البروكسي هو تجريبي حاليا و يعمل مع عدد من البروتوكولات. تأكد من الجدول في الأسفل لمزيد من المعلومات:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -1394,6 +1260,8 @@ plugin.reconnectplugin.NETWORK_DOWN=قطع الاتصال بالشبكة !
 plugin.chatconfig.TITLE=دردشة أو حوار
 plugin.chatconfig.replacement.TITLE=صورة/فيديو
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=تفعيل تبديل الوجوه التعبيرية
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=تفعيل تبديل الصورة أو الفيديو
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=تفعيل
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=مصادر:
 plugin.chatconfig.spellcheck.TITLE=تدقيق إملاء
 
@@ -1461,8 +1329,6 @@ net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult
 #plugin spellcheck
 plugin.spellcheck.TITLE=هجاء و قواعد
 plugin.spellcheck.MENU=أظهر هجاء و قواعد
-plugin.spellcheck.LANG=لغة
-plugin.spellcheck.EDIT_PERSONAL_DICT=تعديل
 plugin.spellcheck.ENABLE_SPELL_CHECK=مكن التدقيق الإملائي
 plugin.spellcheck.dialog.FIND=ابحث عن التالي
 plugin.spellcheck.dialog.REPLACE=بدّل
diff --git a/resources/languages/resources_ast.properties b/resources/languages/resources_ast.properties
index 980daac..bfba5d9 100644
--- a/resources/languages/resources_ast.properties
+++ b/resources/languages/resources_ast.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Yo
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Encontu pal rexistru de cuentes
 service.gui.ACCOUNTS=Cuentes
 service.gui.ADD=&Amestar
-service.gui.ADD_ACCOUNT=Amestar cuenta
 service.gui.ADD_CONTACT=&Amestar contautu
 service.gui.ADD_AUTHORIZED_CONTACT=Amestar a {0} a la to llista contautos
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Amestar el contautu a la to llista contautos
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Fallu al amestar el contautu
 service.gui.ADD_CONTACT_EXIST_ERROR=El contautu {0} yá esiste na to llista contautos.
 service.gui.ADD_CONTACT_NETWORK_ERROR=El sirvidor nun respondió la nuesa petición d'amestar el contautu cola ID: {0} .
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Fallu al amestar contautu cola ID: {0} . Operación non sofitada.
-service.gui.ADD_CONTACT_IDENTIFIER=Nel campu d'embaxo, pon l'identificador del contautu que te prestaría amestar.
-service.gui.ADD_CONTACT_WIZARD=Encontu p'amestar contautos
 service.gui.ADD_CONTACT_NOT_CONNECTED=Necesites tar coneutáu p'amestar un contautu. Por favor, rexístrate nel fornidor esbilláu ya intentalo de nueves.
 service.gui.ADD_GROUP_LOCAL_ERROR=Fallu al amestar el grupu col nome: {0} . La torga asocedió nuna operación E/S llocal.
 service.gui.ADD_GROUP_EXIST_ERROR=El grupu {0} yá esiste na to llista contautos. Por favor, escueyi otru nome.
 service.gui.ADD_GROUP_NET_ERROR=Fallu al amestar el grupu col nome: {0} . El problema asocedió pola mor d'un fallu de rede. Por favor, comprueba la to conexón ya intentalo de nueves.
 service.gui.ADD_GROUP_ERROR=Fallu al amestar el grupu col nome: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=El nome del grupu nun tien de tar baleru.
-service.gui.ADD_GROUP=Crear grupu
-service.gui.ADD_SUBCONTACT=&Amestar socontautu
 service.gui.ADDRESS=Direición
 service.gui.ADMINISTRATOR=alministrador
 service.gui.ADVANCED=&Avanzáu
-service.gui.ALL=&Too
 service.gui.ALL_CONTACTS=&Tolos contautos
 service.gui.ALTERNATE_ADDRESS=Alternar direición
 service.gui.APPLY=&Aplicar
@@ -65,7 +70,6 @@ service.gui.AT=a les
 service.gui.AUTHORIZE=&Autorizar
 service.gui.AUTHORIZATION_ACCEPTED={0} aceutó la to solicitú d'autorización.
 service.gui.AUTHENTICATION_FAILED=Falló l''autenticación pa {0} . La contraseña que punxesti nun ye válida.
-service.gui.AUTHENTICATION_REQUESTED=Autenticación riquida
 service.gui.AUTHENTICATION_REQUESTED_SERVER=El sirvidor {0} solicitó la to autenticación.
 service.gui.AUTHENTICATION_REJECTED={0} refugó la to solicitú d'autorización.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autenticación
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Nel campu d'embaxo, pues poner el to nomatu nu
 service.gui.CHANGE_NICKNAME_ERROR=Fallu camudando'l nomatu
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Yá esiste'l nomatu
 service.gui.CHANGE_VIDEO_QUALITY=Camudar calidá de vidéu remota
-service.gui.CHAT_CONFERENCE_LABEL=Conferencies
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Conferencia de {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Yá s'alcuentra na sala de charra {0} .
 service.gui.CHAT_ROOM_CONFIGURATION=Configuración de la sala de charra {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT={0} coló
 service.gui.CHAT_ROOM_USER_KICKED=fosti espulsáu de {0}
 service.gui.CHAT_ROOM_USER_QUIT=coló {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Ta prohibíu'l dunviu de mensaxes (voz revocada)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Atroxa la sala de charra pa un usu futuru
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Desanicia la sala esbillada de la llista de sales atroxaes
 service.gui.CHAT_ROOM_NAME=Nome de la sala de charra
 service.gui.CLEAR_CUSTOM_MESSAGES=Llimpiar mensaxes personalizaos
 service.gui.ROOM_NAME=Sala de charra
-service.gui.AUTOJOIN=Xunise automáticamente
 service.gui.CHANGE_PASSWORD=Camudar contraseña
 service.gui.CHAT_ROOM_NAME_INFO=Nel campu d'embaxo pon el nome de la sala de charra que te prestaría crear.
 service.gui.CHAT_ROOM_NOT_EXIST=La sala {0} nun fo alcontrada nel sirvidor {1}. Por favor, verifica si'l nome qu'escribiesti ye'l correutu.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Necesites aniciar sesión pa xunite a la sala de charra {0} .
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Necesites aniciar sesión pa colar de la sala de charra.
-service.gui.CHAT_ROOM_NOT_JOINED=Necesites xunite a la sala de charra pa cola fin de faer operaciones con ella.
 service.gui.CHAT_ROOM_OPTIONS=Opciones de la sala de charra
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=La sala de charra {0} rique d'un rexistru pa xunise.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=La sala de charra {0} solicitó una contraseña.
@@ -151,22 +150,18 @@ service.gui.CLEAR=Llimpiar
 service.gui.CLOSE=Za&rrar
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Recibiesti fai menos de 2 segundos un mensax nuevu. ¿De xuru quies zarrar esta charra?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Tienes tresferencies de ficheros actives. ¿De xuru quies encaboxales toes?
-service.gui.CONFIRM=Confirmar
 service.gui.CONNECTED_STATUS=Coneutáu
 service.gui.CONNECTING=Coneutando…
 service.gui.CONNECTING_STATUS=Coneutando
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Coneutando*
 service.gui.CONNECTION=Conexón
-service.gui.CONNECTION_FAILED_MSG=Conexón fallida cola siguiente cuenta: Nome d'usuariu: {0} , Nome'l sirvidor: {1} . Por favor, comprueba la to conexón de rede o contauta col to alministrador de redes pa más información.
 service.gui.CONNECTION_EXPIRED_MSG=Anguaño tas desconeutáu del sirvidor {0} .
 service.gui.CONTACT_NAME=ID o númberu
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=El contautu escoyíu {0} nun sofita telefonía.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=El contautu escoyíu {0} nun sofita conferencies.
 service.gui.CONTACT_PAUSED_TYPING={0} posó d''escribir el mensax
 service.gui.CONTACT_TYPING={0} ta escribiendo un mensax
 service.gui.CONTACT_TYPING_SEND_FAILED=¡Fo!... nun pudimos dici-y a {0} que tabes escribiendo
 service.gui.CONTACT_INFO=&Información de contautu
-service.gui.CONTACTLIST=Llista contautos
 service.gui.CONTACTS=Contautos
 service.gui.COPY=&Copiar
 service.gui.COPY_LINK=Copiar &enllaz
@@ -176,27 +171,24 @@ service.gui.CREATE_CHAT_ROOM=&Crear sala de charra...
 service.gui.CREATE_CHAT_ROOM_ERROR=Fallu al crear la sala de cahrra {0} .
 service.gui.CREATE_CHAT_ROOM_WIZARD=Encontu pa la criación de sales de charra
 service.gui.CREATE_CONFERENCE_CALL=&Crear una llamada de conferencia...
-service.gui.CREATE_CONFERENCE_CHAT=&Crear una charra de conferencia...
 service.gui.CREATE_GROUP=&Crear grupu...
 service.gui.CREATE_GROUP_NAME=Nel campu d'embaxo pon el nome'l grupu que te prestaría crear.
-service.gui.CREATE_FIRST_GROUP_WIZARD=La to llista contautos nun tien dengún grupu. Por favor, crea un grupu primero (Ficheru/Crear grupu).
 service.gui.CREATE_VIDEO_BRIDGE=Crear una ponte &vidéu...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Crear una ponte &vidéu
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Crear / Xunise a una conferencia de vidéu
 service.gui.CREATE_VIDEO_CONFERENCE=Crear una videoconferencia nueva nesta sala de charra
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Esti contautu nun sofita información de contautu web
 service.gui.CUT=F&rañir
-service.gui.DATE=Data
 service.gui.DELETE=Desaniciar
 service.gui.DENY=&Refugar
 service.gui.DESKTOP_SHARING_WARNING=<b>¿De xuru quies entamar la compartición de pantalla?</b> <br> Primi Val pa dexar a la xente nesta llamada ver la to pantalla.
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Tas compartiendo la to pantalla
 service.gui.DIALPAD=Tecláu numbéricu
 service.gui.DISPLAY_NAME=Amosar nome
 service.gui.DISCONNECTED_STATUS=Desconeutáu
 service.gui.DND_STATUS=Nun cafiar
 service.gui.DO_NOT_ASK_AGAIN=Nun entrugar más
 service.gui.DO_NOT_SHOW_AGAIN=Nun amosar esti mensax más
-service.gui.DOWNLOAD_NOW=&Baxar agora
 service.gui.DRAG_FOR_SHARING=Arrastra equí tolo que quies compartir...
 service.gui.DURATION=duración
 service.gui.DESTROY_CHATROOM=Destruyir sala de charra
@@ -217,7 +209,6 @@ service.gui.ERROR_RECEIVED_FROM=Fallu recibíu de {0}
 service.gui.ESTIMATED_TIME=Tiempu estimáu:
 service.gui.EVENTS=Eventos
 service.gui.EXIT=C&olar
-service.gui.EXTENDED_CRITERIA=Criteriu estendíu
 service.gui.GENERAL=Xeneral
 service.gui.GENERAL_ERROR=Fallu xeneral
 service.gui.GROUP_NAME=Nome del grupu
@@ -259,7 +250,6 @@ service.gui.FONT_ITALIC=Cursiva
 service.gui.FONT_SIZE=Tamañu
 service.gui.FONT_STYLE=Estilu
 service.gui.FONT_UNDERLINE=Solliñar
-service.gui.FROM={0} de {1}
 service.gui.GRANT_OWNERSHIP=Faer propietariu...
 service.gui.GRANT_ADMIN=Faer alministrador...
 service.gui.GRANT_MODERATOR=Faer llendador
@@ -285,7 +275,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=¿De xuru quies desaniciar dafechu tolos
 service.gui.HISTORY_REMOVE_ERROR=Fallu desaniciando los mensaxes atroxaos llocalmente.
 service.gui.HOME=Llar
 service.gui.HOME_PAGE=Páxina d'aniciu
-service.gui.HOUR=Hora
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identificador
 service.gui.IGNORE=&Inorar
@@ -309,13 +298,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Convidar contautos a la ponte de vid�
 service.gui.INVITE_REASON=Razón d'invitación
 service.gui.IS_CALLING={0} ta llamando...
 service.gui.IS_NOW={0} ye agora {1}
-service.gui.JITSI_WARNING=SIP Communicator fo renomáu apocayá como Jitsi.<br/>Si quies que la to versión tea anovada, entós baxa Jitsi agora.<br/><br/>Sentimos cualaquier inconveniencia que puea causate ésto.<br/><br/>L'equipu Jitsi Dev
-service.gui.JITSI_WARNING_TITLE=SIP Communicator ye agora Jitsi
 service.gui.JOIN=&Xunise
 service.gui.JOIN_AS=X&unise como
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Xunise a una videoconferencia esistente
 service.gui.JOIN_VIDEO=Xunir vidéu
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Z&arrar
 service.gui.JOB_TITLE=Títulu'l trabayu
 service.gui.JOIN_CHAT_ROOM=&Xunise a la charra de charra...
 service.gui.JOIN_CHAT_ROOM_TITLE=Xunise a la sala de charra
@@ -328,7 +314,6 @@ service.gui.KICK_FAILED=Espulsión fallida
 service.gui.KICK_FAILED_GENERAL_ERROR=Fallu al espulsar a {0} . Asocedió un fallu xeneral del sirvidor.
 service.gui.KICK_FAILED_NOT_ALLOWED=Fallu al espulsar a {0} . Nun puen espulsase al dueñu y l'alministrador la sala.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Fallu al espulsar a {0} . Nun tienes abondos privilexos pa fer esto.
-service.gui.LAST=Caberu
 service.gui.LAST_NAME=Apellíos
 service.gui.LEAVE=&Colar
 service.gui.LIMIT_REACHED_FOR_IP=Tienes milenta rexistros esistentes dende la to direción IP llocal y el sirvidor {0} nun almite abrir dengún más d'ellos.
@@ -348,7 +333,6 @@ service.gui.MESSAGE=Mensax
 service.gui.MISSED_CALLS_TOOL_TIP=Llamaes perdíes de:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= y {0} más
 service.gui.MODERATOR=llendador
-service.gui.MORE=Ver más
 service.gui.MORE_LABEL=Más
 service.gui.MOVE=Mover
 service.gui.MOVE_SUBCONTACT=M&over contautu
@@ -357,7 +341,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=El contautu qu'escoyesti ye'l mesmu que\nl'or
 service.gui.MOVE_SUBCONTACT_QUESTION=¿De xuru quies mover {0} a {1} ?
 service.gui.MOVE_TO_GROUP=&Mover al grupu
 service.gui.MOVE_CONTACT=Mover contautu
-service.gui.MOVE_CONTACT_ERROR=&El contautu nun pue movese
 service.gui.MSG_DELIVERY_FAILURE=Nun pudo entregase'l mensax d'enriba
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=El protocolu que tas usando nun sofita mensaxes fuera de llinia. Pues intentar contautar con {0} pente medies d'otru protocolu o esperar fasta qu'elli/ella tea en llinia.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Asocedió un fallu internu. Esto pue ser de xuru un problema. Por favor, repórtalu equí: https://jitsi.org/Development/BugsAndIssues.
@@ -371,7 +354,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Deberíes tar coneutáu pa poder dunviar
 service.gui.MULTIPLE_LOGINS=Aniciesti sesión más d'una vegada cola mesma cuenta. La siguiente cuenta: Nome d'usuariu: {0} , Nome'l sirvidor: {1} ta anguaño desconeutada.
 service.gui.MY_CHAT_ROOMS=Amestar sala de charra
 service.gui.MY_CHAT_ROOMS_TITLE=Amestar sala de charra
-service.gui.MUTE=Silenciar
 service.gui.MUTUALLY_ON_HOLD_STATUS=Dambos n'espera
 service.gui.NAME=Nome
 service.gui.NETWORK=Rede
@@ -403,7 +385,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Nun ta na llista contautos
 service.gui.SD_QUALITY=Calidá estándar
 service.gui.OFFLINE=Fuera de llinia
 service.gui.OK=&Val
-service.gui.OLDER_CALLS=Llamaes más vieyes
 service.gui.ONLINE=En llinia
 service.gui.OPEN=Abrir
 service.gui.OPEN_FILE_FROM_IMAGE=Clic doblu p'abrir el ficheru.
@@ -415,7 +396,6 @@ service.gui.OPEN_ON_ACTIVITY=Abrir al tar activu
 service.gui.OPEN_ON_MESSAGE=Abrir namái nel mensax
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Abrir namái en mensaxes importantes
 service.gui.OR=o
-service.gui.OR_ENTER_PHONE_NUMBER=O pon equí'l númberu de teléfonu...
 service.gui.ORGANIZATION=Organización
 service.gui.OTHER=Otru
 service.gui.chat.role.OWNER=Dueñu
@@ -440,7 +420,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Intru' pa suxerencies
 service.gui.PRESS_FOR_CALL_INFO=Primi pa información de la llamada
 service.gui.PRESS_TO_OPEN_CRM=Primi p'abrir l'aplicación CRM
 service.gui.PREVIOUS=Previu
-service.gui.PREVIOUS_TOOLTIP=Restolar charres más vieyes
 service.gui.PRINT=&Imprentar
 service.gui.PROACTIVE_NOTIFICATION=ta escribiendo un mensax
 service.gui.PROBLEMS_ENCOUNTERED=Problemes alcontraos
@@ -456,7 +435,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Tuviesti desconeutándote y reconeutánd
 service.gui.RE_REQUEST_AUTHORIZATION=Solicitar autorización de nueves
 service.gui.REFERRED_STATUS=Referíu
 service.gui.REJECT=&Refugar
-service.gui.REMIND_ME_LATER=Recuérdamelo sero
 service.gui.REMEMBER_PASSWORD=Recordar contraseña
 service.gui.REMOVE=&Desaniciar
 service.gui.REMOVE_ACCOUNT=&Desaniciar cuenta
@@ -482,29 +460,20 @@ service.gui.REVOKE_ADMIN=Revocar almin
 service.gui.REVOKE_MODERATOR=Revocar llendador
 service.gui.REVOKE_MEMBERSHIP=Revocar membresía
 service.gui.REVOKE_VOICE=Revocar voz
-service.gui.ROOT_GROUP=Grupu raigañu
 service.gui.SAVE=&Atroxar
-service.gui.SAVE_AS_DEFAULT=Atroxar como predetermináu
 service.gui.SEARCH=&Guetar
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Primi'l botón d'embaxo p'amosar toles sales de charra esistentes nel sirvidor esbilláu. Dempués esbilla a la que te prestaría xunite primiendo nel botón Xunise.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Contautu guetáu
 service.gui.SECURITY=Seguranza
-service.gui.SELECT_ACCOUNT=Esbillar cuenta
 service.gui.SELECT_COLOR=Esbillar color
 service.gui.SELECT_GROUP=Esbillar grupu
-service.gui.SELECT_GROUP_WIZARD_MSG=La llista d'embaxo contien tolos grupos na to llista contautos. Esbilla a la que te prestaría amestar el contautu nuevu.
 service.gui.SELECT_NO_GROUP=Ensin grupu
-service.gui.SELECT_GROUP_WIZARD=Especificar grupu
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=La llista d'embaxo contien toles cuentes que sofiten la carauteristica de charra multi usuariu. Esbilla la que te prestaría usar pa criar la to sala de charres.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=La llista d'embaxo contien toles cuentes rexistraes. Esbilla cola que te prestaría comunicate col contautu nuevu.
-service.gui.SELECT_PROVIDERS_WIZARD=Esbillar cuenta
 service.gui.SELECT_VIDEO_CONFERENCE=Esbillar conferencia de vidéu
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Esbilla una sala de charra de la llista y primi Val p'amestala.
 service.gui.SEND=&Dunviar
 service.gui.SEND_FILE=Dunviar &ficheru
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Nun hai información pa esti contautu.
 service.gui.SEND_MESSAGE=&Dunviar un mensax
-service.gui.SEND_AS_SMS=Dunviar como SMS
 service.gui.SEND_PRIVATE_MESSAGE=Dunviar un mensax priváu
 service.gui.SEND_SMS=D&unviar SMS
 service.gui.SEND_SMS_DETAILS=Alcuérdate que necesites poner el númberu en formatu internacional. Exemp.: entamando per +34 pa ES por exemplu, +34999999999
@@ -543,7 +512,6 @@ service.gui.STREET=Cai
 service.gui.SUBJECT=Asuntu
 service.gui.SUMMARY=Resume
 service.gui.TELEPHONY=Telefonía
-service.gui.TODAY=Güei
 service.gui.TOOLS=&Ferramientes
 service.gui.TRANSFER=Tres&ferir
 service.gui.TO=&A:
@@ -553,7 +521,6 @@ service.gui.TRANSFER_CALL_TO=Tresferir a:
 service.gui.TRANSPARENCY_NOT_ENABLED=La tresparencia nun ta sofitada anguaño pola to configuración.
 service.gui.TYPE_YOUR_REQUEST=Escribi equí la to petición
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Nun podemos camudar la calidá de vidéu d'esta llamada.
-service.gui.UNMUTE=Quitar silenciu
 service.gui.USER_IDENTIFIER=Indentificador d'usuariu:
 service.gui.USER_EXISTS_ERROR=Esti usuariu yá esiste na rede esbillada. Por favor, escueyi otru usuariu o rede.
 service.gui.USERNAME_NULL=Por favor, enllena'l to nome d'usuariu y contraseña.
@@ -566,7 +533,6 @@ service.gui.USE_PROVISIONING=Usar aprovisionamientu en llinia
 service.gui.VALUE=Valor
 service.gui.VIDEO_CALL=&Llamada de vidéu
 service.gui.VIA=per
-service.gui.VIA_SMS=Per SMS
 service.gui.VIEW=&Ver
 service.gui.VIEW_HISTORY=Ver &historia
 service.gui.VIEW_SMILEYS=Ver &fustaxes
@@ -586,9 +552,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Axustar volume
 service.gui.WAITING_AUTHORIZATION=Esperando pola autorización
 service.gui.WARNING=Avisu
 service.gui.YES=Sí
-service.gui.YESTERDAY=Ayeri
-service.gui.EXISTING_ACCOUNT_ERROR=Yá ta intalada a cuenta que punxesti.
-service.gui.NEW_MAIL=<b>¡Tienes un corréu nuevu!</b><br/><b>De:</b> {0} {1} <br/><b>Asuntu:</b> {2} <br/>{3} ;
 service.gui.NEW_GMAIL_HEADER=Recibiesti un corréu nuevu na to <a href="{1}">bandexa d'entrada</a>:<br/> {0}
 service.gui.NEW_GMAIL_MANY_HEADER=Recibiesti {2} correos nuevos na to <a href="{1}">bandexa d'entrada</a>:<br/> {0}
 service.gui.NEW_GMAIL_FOOTER=ún o más correos ensin lleer na to <a href="{0}">bandexa d'entrada</a>.<br/>
@@ -612,7 +575,6 @@ service.gui.SECURITY_ERROR=Fallu de seguranza
 service.gui.SPEED=Velocidá:
 service.gui.SILENT_MEMBER=silenciar miembru
 service.gui.NON_SECURE_CONNECTION=Nun pue asegurase la conexón pa la cuenta {0} . Si quies coneutate a un sirvidor non seguru, por favor conseña "Almitir conexones non segures" nos axustes de la to cuenta
-service.gui.UPDATE=Anovar
 service.gui.MOBILE_PHONE=Móvil
 service.gui.VIDEO_PHONE=Vidéu
 service.gui.WORK_PHONE=Trabayu
@@ -647,12 +609,10 @@ service.gui.callinfo.CALL_INFORMATION=Información de llamada
 service.gui.callinfo.CALL_IDENTITY=Identidá
 service.gui.callinfo.PEER_COUNT=Participación
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Enfocar charra
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Cifráu habilitáu
 service.gui.callinfo.CALL_TRANSPORT=Señalización de tresporte de llamada
 service.gui.callinfo.CALL_DURATION=Duración de llamada
 service.gui.callinfo.TLS_PROTOCOL=Protocolu TLS
 service.gui.callinfo.TLS_CIPHER_SUITE=Suit de cifráu TLS
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Cadena del certificáu TLS del sirvidor
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Ta amosáu embaxo'l conteníu'l certificáu TLS.
 service.gui.callinfo.VIEW_CERTIFICATE=Ver certificáu
 service.gui.callinfo.CODEC=Codificador / Frecuencia
@@ -662,7 +622,6 @@ service.gui.callinfo.AUDIO_INFO=Información d'audiu
 service.gui.callinfo.VIDEO_INFO=Información de vidéu
 service.gui.callinfo.LOCAL_IP=IP llocal / puertu
 service.gui.callinfo.REMOTE_IP=IP remota / puertu
-service.gui.callinfo.BANDWITH=Anchor de banda
 service.gui.callinfo.LOSS_RATE=Tasa de perda
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -672,10 +631,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Protocolu d'intercambéu claves
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Candidatu ICE de triba estendida
 service.gui.callinfo.ICE_STATE=Estáu de procesamientu ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Axuntando candidatos
 service.gui.callinfo.ICE_STATE.RUNNING=Comprobaciones de conectividá
 service.gui.callinfo.ICE_STATE.COMPLETED=Completáu
 service.gui.callinfo.ICE_STATE.FAILED=Falló
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=IP llocal d'agospiu / Puertu
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=IP llocal reflexiva / Puertu
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=IP llocal tresmitida / Puertu
@@ -696,10 +658,11 @@ service.gui.ALWAYS_TRUST=Confiar siempres nesti certificáu
 service.gui.CERT_DIALOG_TITLE=Verificar certificáu
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} nun pue verificar la identidá''l sirvidor al coneutase a<br><b>{1}</b>.<br><br>Nun pue confiase nel certificáu, lo que quier dicir que la identida''l sirvidor nun pue verificase automáticamente.<br><br> ¿Quies siguir coneutándote?<br> Pa más información primi n'"Amosar certificáu".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} nun pue verificar la identidá del certificáu del sirvidor.<br><br> Nun pue confiase nel certificáu, lo que quier dicir que la identida''l sirvidor nun pue<br> verificase automáticamente. ¿Quies siguir coneutándote?<br><br> Pa más información primi n''"Amosar certificáu".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} nun pue verificar la identidá''l veceru coneutáu.<br><br> Nun pue confiase nel certificáu, lo que quier dicir que la identida''l sirvidor nun pue<br> verificase automáticamente. ¿Quies siguir coneutándote?<br><br> Pa más información primi n'"Amosar certificáu".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} nun pue verificar la identidá''l veceru {1}.<br><br> Nun pue confiase nel certificáu, lo que quier dicir que la identida''l sirvidor nun pue<br> verificase automáticamente. ¿Quies siguir coneutándote?<br><br> Pa más información primi n''"Amosar certificáu".</html>
 service.gui.CONTINUE_ANYWAY=Siguir de toes toes
 service.gui.CERT_INFO_CHAIN=Cadena del certificáu:
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nome común:
 service.gui.CERT_INFO_O=Organización:
 service.gui.CERT_INFO_C=Nome'l país:
@@ -717,12 +680,10 @@ service.gui.CERT_INFO_SIGN_ALG=Algoritmu de robla:
 service.gui.CERT_INFO_PUB_KEY_INFO=Información de clave pública
 service.gui.CERT_INFO_ALG=Algoritmu:
 service.gui.CERT_INFO_PUB_KEY=Clave pública:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Esponente:
 service.gui.CERT_INFO_KEY_SIZE=Tamañu la clave:
 service.gui.CERT_INFO_SIGN=Robla:
-service.gui.CONTINUE=Siguir
 service.gui.SHOW_CERT=Amosar certificáu
 service.gui.HIDE_CERT=Anubrir certificáu
 
@@ -745,12 +706,9 @@ service.gui.security.SECURE_AUDIO=Audiu seguru
 service.gui.security.AUDIO_NOT_SECURED=Audiu non seguru
 service.gui.security.SECURE_VIDEO=Vidéu seguru
 service.gui.security.VIDEO_NOT_SECURED=Vidéu non seguru
-service.gui.security.NO_VIDEO=Ensin vidéu
-service.gui.security.CIPHER=Cifráu: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Llamada asegurada. Pa más información primi equí.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Llamada non asegurada.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Primi equí pa comparar el secretu de seguranza col to collaciu.
-service.gui.security.COMPARE_WITH_PARTNER=Compara col to collaciu y primi nel candáu pa confirmar.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Comparar col collaciu:
 service.gui.security.STRING_COMPARED=¡Cadena comparada!
@@ -768,20 +726,14 @@ service.gui.avatar.imagepicker.CLICK=Primi y sorrí
 service.gui.avatar.imagepicker.IMAGE_FILES=Ficheros d'imaxes
 service.gui.avatar.imagepicker.IMAGE_PICKER=Semeya
 service.gui.avatar.imagepicker.IMAGE_SIZE=Tamañu d'imax
-service.gui.avatar.imagepicker.INITIALIZING=Aniciando
 service.gui.avatar.imagepicker.RESET=Reafitar
 service.gui.avatar.imagepicker.SET=Definir
 service.gui.avatar.imagepicker.TAKE_PHOTO=Fer una semeya
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Fallu de cámara web
 
 service.gui.security.encryption.required=¡Cifráu riquíu!
 
 service.protocol.ICE_FAILED=Nun pudo afitase la conexón (nun s'alcontró rempuesta y fallu d'ICE)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Fallu nel almacenamientu de llista contautos SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Nun puen lleese los recursos {0} . De {1}
@@ -811,9 +763,7 @@ impl.ldap.QUERY_CUSTOM=Consulta automática
 impl.ldap.QUERY_CUSTOM_HINT=Usa {0} como un marcador pal terminu de gueta.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Amestar automáticamente comodines al términu de gueta
 impl.ldap.QUERY_PHOTO_INLINE=Amesta una foto con otros atributos
-impl.ldap.NEW=Nuevu
 impl.ldap.EDIT=editar
-impl.ldap.REMOVE=Desaniciar
 impl.ldap.ENABLED=Habilitáu
 impl.ldap.SERVER_NAME=Nome'l sirvidor
 impl.ldap.SERVER_NAME_EXAMPLE=El mio sirvidor LDAP
@@ -846,6 +796,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=TeléfonuLlar
 impl.ldap.PHONE_PREFIX=Prefixu de teléfonu
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ex.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Llibreta de direiciones
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Habilitar gueta na llibreta de direiciones MacOSX
@@ -860,9 +814,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Faer Outlook el to veceru de co
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google Contacs
-impl.googlecontacts.NEW=Nuevu
 impl.googlecontacts.EDIT=editar
-impl.googlecontacts.REMOVE=Desaniciar
 impl.googlecontacts.ENABLED=Habilitáu
 impl.googlecontacts.ACCOUNT_NAME=Nome de cuenta
 impl.googlecontacts.SAVE=Atroxar
@@ -901,11 +853,8 @@ plugin.accountinfo.ORGANIZATION=Nome d'organización:
 plugin.accountinfo.JOB_TITLE=Títulu'l trabayu:
 plugin.accountinfo.ABOUT_ME=Tocante a min:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Semeyes d'usuariu
 plugin.accountinfo.GLOBAL_ICON=Usar iconu global
 plugin.accountinfo.LOCAL_ICON=Usar esti iconu:
-plugin.accountinfo.CHANGE=Camudar
-plugin.accountinfo.ONLY_MESSAGE=Namái mensaxes
 
 # connection info
 plugin.connectioninfo.TITLE=Información de conexón
@@ -925,49 +874,12 @@ plugin.aimaccregwizz.USERNAME=Usuariu AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Usuariu y contraseña
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Rexistrar cuenta nueva
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Nel casu que nun tengas una cuenta AIM, primi nesti botón pa crear una nueva.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Trocar les opciones predeterminaes del sirvidor
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Tocante a {0}
 plugin.branding.LOGO_MESSAGE=VoIP y mensaxeru nel intre de códigu llibre
-plugin.branding.LOADING=Cargando
 plugin.branding.ABOUT_MENU_ENTRY=&Tocante a
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} ta anguaño baxo desendolcu activu. La versión que tas executando ye namái esperimental y PUE QUE NUN furrule como s'espera. Por favor, consulta a {2} pa más información.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Tolos drechos reservaos. Visita <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> ta distribuyíu baxo los terminos de llicencia LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Diccionarios
-plugin.dictaccregwizz.ANY_DICTIONARY=Cualaquier diccionariu
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Cualaquier diccionariu de {0}
-plugin.dictaccregwizz.FIRST_MATCH=Primera coincidencia
-plugin.dictaccregwizz.NO_MATCH=Nun hai coincidencies
-plugin.dictaccregwizz.MATCH_RESULT=Nun hai definiciones alcontraes pa "{0}", quiciabes quixesti dicir:\n
-plugin.dictaccregwizz.INVALID_DATABASE=El diccionariu "{0}" d'anguaño nun esiste nel sirvidor.
-plugin.dictaccregwizz.INVALID_STRATEGY=La estratexa d'anguaño nun ta disponible nel sirvidor.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=El serviciu de protocolu Dict
-plugin.dictaccregwizz.HOST=Agospiu
-plugin.dictaccregwizz.SERVER_INFO=Informaciones del sirvidor
-plugin.dictaccregwizz.STRATEGY_SELECTION=Esbilla d'estratexa
-plugin.dictaccregwizz.STRATEGY_LIST=Llista d'estratexes:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Guetar estratexa
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=La estratexa úsase pa guetar pallabres asemeyaes, si nun s'alcuentra una torna, ye gracies a los diferentes enfoques. Por exemplu, les estratexes de prefixos guetarán pallabres qu'entamen como la pallabra que te prestaría tornar.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Información de cuenta Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Esti encontu creará la primer cuenta Dict pa tigo en dict.org.\n\nPues amestar un diccionariu nuevu diendo al encontu pal rexistru cuentes. Enllena'l campu l'agospiu col diccionariu que te prestaría amestar.
-plugin.dictaccregwizz.THREAD_CONNECT=Intentando coneutase al sirvidor
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Intentu de conexón fallíu, esti nun ye un sirvidor dict o'l sirvidor ta fuera de llinia
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Recibiendo estratexes
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Nun s'alcuentra estratexa dala nel sirvidor
-plugin.dictaccregwizz.POPULATE_LIST=Xenerando llista
-plugin.dictaccregwizz.CLOSING_CONNECTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Pa usar el Facebook Chat tienes de crear un "nome d'usuariu" <br>dende la páxina d'"Axustes de cuenta" na páxina de  Faceook.</a><br><br>Nota: ¡Cuando crees l'usuariu tienes d'aniciar sesión dende la páxina web <br> y esperar un pocoñín enantes de poder aniciar sesión col to nome d'usuariu nuevu!</center></body></html>
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Pa usar el Facebook Chat tienes de crear un usuariu <br>dende la páxina d'"Axustes de cuenta" en Faceook.</a><br><br>Nota: ¡Cuando crees l'usuariu tienes d'aniciar sesión dende la páxina web <br> y esperar un pocoñín enantes de poder aniciar sesión col to usuariu nuevu!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=El protocolu Facebook Chat
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nome d'usuariu:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nome d'usuariu y contraseña
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Aniciar {0} cuando l''ordenador se reanicie o prenda
@@ -978,9 +890,6 @@ plugin.generalconfig.SHOW_HISTORY=Amosar
 plugin.generalconfig.HISTORY_SIZE=mensaxes recientes en charres nueves
 plugin.generalconfig.SEND_MESSAGES_WITH=Dunviar mensaxes con:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Trayer la ventana la charra al frente
-plugin.generalconfig.ERROR_PERMISSION=Nun tienes abondos premisos pa desaniciar l'aniciu automáticu
-plugin.generalconfig.TRANSPARENCY=Tresparencia
-plugin.generalconfig.ENABLE_TRANSPARENCY=Habilitar tresparencia
 plugin.generalconfig.DEFAULT_LANGUAGE=Llingua d'interfaz
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Les tos camudancies fadrán efeutu nel prósimu reaniciu.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% tornáu
@@ -1037,13 +946,15 @@ plugin.ircaccregwizz.HOST=Nome d'agospiu:
 plugin.ircaccregwizz.IRC_SERVER=Sirvidor
 plugin.ircaccregwizz.EXAMPLE_SERVER=Exem: chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Usar conexón segura
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} autenticación
+plugin.ircaccregwizz.SASL_USERNAME=Nome d'usuariu
+plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED=La contraseña d'IRC d'enriba úsase pa l'autenticación SASL
+plugin.ircaccregwizz.RESOLVE_DNS_THROUGH_PROXY=Resolver siempres nomes DNS pente proxy
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=El protocolu XMPP
 plugin.jabberaccregwizz.USERNAME=Nome d'usuariu XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirmar contraseña
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID y contraseña
 plugin.jabberaccregwizz.CSERVER=Sirvidor
 plugin.jabberaccregwizz.SERVER=Coneutar al sirvidor
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Habilitar caltener vivu
@@ -1059,13 +970,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Comentariu
 plugin.jabberaccregwizz.RESOURCE=Recursu
 plugin.jabberaccregwizz.AUTORESOURCE=Xenerar recursu automáticamente
 plugin.jabberaccregwizz.PRIORITY=Prioridá
-plugin.jabberaccregwizz.XMPP_ERROR=Fallu XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Fallu XMPP ({0}) desconocíu. Verifica que'l nome'l sirvidor ye correutu.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Les tos contraseñes nun concasen.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Trocar opciones predeterminaes del sirvidor
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Opciones avanzaes
 plugin.jabberaccregwizz.USE_ICE=Usar ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Usar el Jingle/ICE de Google (esperimental)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Escubrir sirvidores STUN/TURN automáticamente
 plugin.jabberaccregwizz.SUPPORT_TURN=Sofitu TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Nome d'usuariu TURN
@@ -1093,11 +1000,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Deshabilitar copies de mensaxes
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Escoyer automáticamente ente RTP y en banda
 plugin.jabberaccregwizz.SERVER_OPTIONS=Opciones del sirivdor
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Camudar contraseña de cuenta
-plugin.jabberaccregwizz.NEW_PASSWORD=Contraseña nueva
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirmar contraseña nueva
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Por favor, rellena con un númberu de puertu válidu pa siguir.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=La cuenta tien de tar roblada enantes de camudar la contraseña.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=La contraseña ta balera.
 plugin.jabberaccregwizz.TLS_REQUIRED=La conexón nun utiliza TLS, nun s'intentará una camudancia de contraseña.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=La contraseña camudóse con ésitu
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=El to sirvidor XMPP nun sofita camudancies de contraseña.
@@ -1111,25 +1015,9 @@ plugin.jabberaccregwizz.RESET=Reafitar
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Reafitar axustes globales
 plugin.jabberaccregwizz.DISABLE_JINGLE=Deshabilitar Jingle (audiu y llamaes de vidéu con XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Mensax saliente:
-plugin.mailbox.INCOMING=Mensaxes entrantes:
-plugin.mailbox.WAIT_TIME=Esperar fasta que la llamada s'unvie al buzón de voz
-plugin.mailbox.MAX_MESSAGE_TIME=Duración másima de mensax entrante
-plugin.mailbox.CONFIRM=Confirmar
-plugin.mailbox.DEFAULTS=Por defeutu
-plugin.mailbox.MAILBOX=Buzón
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Un protocolu pa coneutar y charrar nel serviciu MSN.
-plugin.msnaccregwizz.USERNAME=Corréu:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID y contraseña
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Instalar
 plugin.pluginmanager.UNINSTALL=Desinstalar
-plugin.pluginmanager.UPDATE=Anovar
 plugin.pluginmanager.PLUGINS=Complementos
 plugin.pluginmanager.URL=Enllaz
 plugin.pluginmanager.CHOOSE_FILE=Esbillar ficheru
@@ -1154,7 +1042,6 @@ plugin.sipaccregwizz.SERVER_PORT=Puertu'l sirvidor
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Puertu'l proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Tresporte preferíu
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Opciones avanzaes
 plugin.sipaccregwizz.PROXY_OPTIONS=Opciones de proxy
 plugin.sipaccregwizz.PROXY_AUTO=Configurar proxy automáticamente
 plugin.sipaccregwizz.ENABLE_PRESENCE=Habilitar presencia (SIMPLE)
@@ -1174,8 +1061,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Escueyi automáticamente ente RTP y en band
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=En banda
-plugin.sipaccregwizz.REGISTER=REGISTRU
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Trocar les opciones por defeutu''l sirvidor
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Habilitar sofitu pa llamaes cifraes
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Indica'l sofitu de ZRTP nel protocolu de señalización
 plugin.sipaccregwizz.AUTH_NAME=Nome d'autorización
@@ -1196,10 +1081,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Comprobar URI de corréu de voz
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Les tos contraseñes nun concasen.
 plugin.sipaccregwizz.NO_CERTIFICATE=<ninguno> (usa autenticación regular)
 plugin.sipaccregwizz.SAVP_OPTION=Indicador RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Apagáu (indica RTP/AVP solo) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Obligatoriu (ufre y aceuta namái RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Opcional (ufre primero RTP/SAVP, y dempués RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Habilitar S-Descriptor (conocíu tamién como SDES o SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Escueyi protocolos con cifráu habilitáu y la so prioridá (primero'l protocolu cimeru):
 plugin.sipaccregwizz.CIPHER_SUITES=Suits de cifráu habilitaes:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} intentará asegurar automáticamente toles tos llamaes con ZRTP. Oyirás y verás una notificación cuando s''asegure la conexón afitada. Deberíes camudar namái los axustes avanzaos d'embaxo si tas bien seguru de lo que tas faciendo.</div></html>
@@ -1213,15 +1098,6 @@ plugin.skinmanager.DEFAULT_SKIN=Tema por defeutu
 plugin.skinmanager.ADD_NEW_SKIN=Amestar tema nuevu...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Tema por defeutu de l'aplicación.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Un protocolu pa coneutar máquines remotes per SSH.
-plugin.sshaccregwizz.USERNAME=ID de cuenta:
-plugin.sshaccregwizz.IDENTITY_FILE=Ficheru d'identidá:
-plugin.sshaccregwizz.KNOWN_HOSTS=Agospios conocíos:
-plugin.sshaccregwizz.OPTIONAL=Opcional
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Detalles de cuenta
-
 # status update
 plugin.autoaway.AUTO_STATUS=Ausencia automática
 plugin.autoaway.ENABLE_CHANGE_STATUS=Camudar l'estáu entrín nun tea
@@ -1269,22 +1145,6 @@ plugin.whiteboard.DESELECT=Deseleicionar
 plugin.whiteboard.DELETE=Desaniciar
 plugin.whiteboard.PROPERTIES=Propiedaes
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Un protocolu pa coneutase y charrar nel servicu Yahoo!.
-plugin.yahooaccregwizz.USERNAME=Nome d'usuariu:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID y contraseña
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=El protocolu del serviciu Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Nome:
-plugin.zeroaccregwizz.LAST_NAME=Apellíos:
-plugin.zeroaccregwizz.EMAIL=Corréu:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=¿Recordar contautos Bonjour?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID y contraseña
-plugin.zeroaccregwizz.USERID=ID d'usuariu
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=El protocolu Google Talk
@@ -1298,19 +1158,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, el portal de telecomunica
 plugin.iptelaccregwizz.USERNAME=Nome d'usuariu
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Soscribise a iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP y charra
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Nome d'usuariu
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Escribi la contraseña otra vegada
 plugin.sip2sipaccregwizz.EMAIL=Direición de corréu
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=P'aida tocante a esti serviciu visita<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>La direición de corréu úsase pa dunviar mensaxes del corréu de voz, <br>notificaciones de llamaes perdíes y pa recuperar una contraseña escaecida</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>P'aida tocante a esti serviciu visita <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Cuenta sip2sip.info esistente
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Crear una cuenta sip2sip.info de baldre
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP y mensaxería nel intre
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=P'aida tocante a esti serviciu visita<br>http://ippi.fr
@@ -1319,6 +1171,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Cuenta ippi esistente
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Crear una cuenta ippi de baldre
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Zarrar ventana de charra
 plugin.keybindings.CHAT_COPY=Copiar
 plugin.keybindings.CHAT_CUT=Frañir
@@ -1341,10 +1194,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Nome
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Atayu primariu
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Atayu secundariu
 plugin.keybindings.globalchooser.PRESS_BTN=Primi p'afitar un atayu
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Esperando
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Primi pa falar
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Habilitar deteición de tecles especiales
 plugin.keybindings.PLUGIN_NAME=Combinaciones de tecles
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Charra
 plugin.keybindings.MAIN=Principal
 plugin.keybindings.GLOBAL=Atayos globales
@@ -1372,6 +1225,7 @@ plugin.notificationconfig.tableheader.SOUND=Reproducir un soníu pente medies d'
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Repoducir un soníu pente medies d'un preséu de reproducción
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Reproducir un soníu pente medies d'unos altavoces
 plugin.notificationconfig.tableheader.DESCRIPTION=Descripción del eventu
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Llamada entrante
 plugin.notificationconfig.event.SecurityMessage=Mensax de seguranza
 plugin.notificationconfig.event.IncomingFile=Ficheru entrante
@@ -1473,6 +1327,7 @@ impl.neomedia.configform.VIDEO=Vidéu
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Anovamientu periódicu d'Intra
 impl.neomedia.configform.H264.defaultProfile=Perfil por defeutu pa codificar en:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Llinia bas
 impl.neomedia.configform.H264.defaultProfile.high=Alta
 impl.neomedia.configform.H264.defaultProfile.main=Principal
@@ -1503,7 +1358,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Contraseña d'anguaño:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Pon la contraseña nueva:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Escribi la contraseña de nueves:
 plugin.securityconfig.masterpassword.MP_TITLE=Contraseña maestra
-plugin.securityconfig.masterpassword.MP_NOT_SET=(ensin afitar)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Nun punxesti la contraseña maesta correuta. Por favor, inténtalo de nueves.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=¡La contraseña maestra nun ye correuta!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Fallu al camudar contraseña
@@ -1519,7 +1373,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Contraseña
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(desconocíu)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(nun pue descifrase)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Contraseñes atroxaes
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Desaniciar
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Desaniciar too
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=¿De xuru quies desaniciar toles contraseñes?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Desaniciar toles contraseñes
@@ -1615,7 +1468,6 @@ plugin.globalproxy.PROXY_PORT=Puertu proxy
 plugin.globalproxy.PROXY_USERNAME=Usuariu proxy
 plugin.globalproxy.PROXY_PASSWORD=Contraseña proxy
 plugin.globalproxy.DESCRIPTION={0} usará la configuración de proxy d'enriba pa toles redes a les que te coneutes o reconeutes dende agora. \nEl sofitu de proxy ye anguaño esperimental y namái furrula con dalgunos protocolos. Comprueba la tabla pa más detalles:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Tamién proxy DNS
 plugin.globalproxy.FWD_DNS_NOTE=Útil con Tor. Aida a evitar fugues de DNS direicionando tol tráficu DNS al proxy Tor. Requier reaniciar.
@@ -1650,7 +1502,6 @@ plugin.provisioning.RESTART_WARNING=¡Alcuerdate que les camudancies fadrán efe
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Copiar UUID al cartafueyu
 plugin.provisioning.CLIPBOARD_FAILED=Fallu al copiar UUID al cartafueyu
-plugin.provisioning.EXIT_ON_FAIL=Colar de l'aplicación si l'aprovisionamientu falla
 plugin.provisioning.CREDENTIALS=Caberes credenciales d'aprovisionamientu atroxaes
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=¿De xuru quies desaniciar la contraseña d'aprovisionamientu?
 plugin.provisioning.PROV_FAILED=Aprovisionamientu fallíu
@@ -1717,8 +1568,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} intentó coneutase al sirvido
 #plugin spellcheck
 plugin.spellcheck.TITLE=Ortografía y gramática
 plugin.spellcheck.MENU=Amosar ortografía y gramática
-plugin.spellcheck.LANG=Llingua
-plugin.spellcheck.EDIT_PERSONAL_DICT=Editar
 plugin.spellcheck.ENABLE_SPELL_CHECK=Activar revisión ortográfica
 plugin.spellcheck.dialog.FIND=Alcontrar siguiente
 plugin.spellcheck.dialog.REPLACE=Trocar  
diff --git a/resources/languages/resources_bg.properties b/resources/languages/resources_bg.properties
index c61c18e..4c3f380 100644
--- a/resources/languages/resources_bg.properties
+++ b/resources/languages/resources_bg.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Аз
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Регистрация на профил
 service.gui.ACCOUNTS=Профили
 service.gui.ADD=&Добави
-service.gui.ADD_ACCOUNT=Добави профил
 service.gui.ADD_CONTACT=&Добави контакт
 service.gui.ADD_AUTHORIZED_CONTACT=Добави {0} към списъка с контакти
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Добавяне на контакта към списък ви с контакти
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Грешка при добавяне на к
 service.gui.ADD_CONTACT_EXIST_ERROR=Контактът {0} вече съществува във вашият списък с контакти.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Сървърът не отговори на опита ни да добавим контакт: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Грешка при добавяне на {0}. Операцията не се поддържа.
-service.gui.ADD_CONTACT_IDENTIFIER=В полето по-долу въведете идентификатора на контакта, който бихте искали да добавите.
-service.gui.ADD_CONTACT_WIZARD=Добавяне на контакт
 service.gui.ADD_CONTACT_NOT_CONNECTED=Трябва да се свържете преди да добавите контакт. Моля свържете се и опитайте отново.
 service.gui.ADD_GROUP_LOCAL_ERROR=Възникна грешка при добавяне на група {0}. Проблемът е възникнал по време на входно-изходно операция.
 service.gui.ADD_GROUP_EXIST_ERROR=Групата {0} е вече добавена към вашия списък с контакти.
 service.gui.ADD_GROUP_NET_ERROR=Възникна грешка при добавяне на група {0}. Проблемът е възникнал по време на мрежова операция. Проверете мрежовите си настройки и опитайте отново.
 service.gui.ADD_GROUP_ERROR=Неуспешно добавяне на група: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Името на групата не трябва да е празно
-service.gui.ADD_GROUP=Грешка при добавяне на група
-service.gui.ADD_SUBCONTACT=&Добавяне на подконтакт
 service.gui.ADDRESS=Адрес
 service.gui.ADMINISTRATOR=администратор
 service.gui.ADVANCED=&Експертни
-service.gui.ALL=&Всички
 service.gui.ALL_CONTACTS=&Всички контаки
 service.gui.ALTERNATE_ADDRESS=Алтернативен адрес
 service.gui.APPLY=&Приложи
@@ -65,7 +70,6 @@ service.gui.AT=от
 service.gui.AUTHORIZE=&Разреши
 service.gui.AUTHORIZATION_ACCEPTED={0} прие молбата за легитимация.
 service.gui.AUTHENTICATION_FAILED=Неуспешна проверка на самоличността за {0}. Въвели сте невалидна парола.
-service.gui.AUTHENTICATION_REQUESTED=Молба за добавяне
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Идентификация за сървър {0}.
 service.gui.AUTHENTICATION_REJECTED={0} отказа молбата за легитимация.
 service.gui.AUTHENTICATION_WINDOW_TITLE=Проверка на самоличността
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Въдете новия прякор.
 service.gui.CHANGE_NICKNAME_ERROR=Грешка при смяната на псевдонима
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Псевдонимът вече съществува
 service.gui.CHANGE_VIDEO_QUALITY=Качество на видеото от събеседника ви
-service.gui.CHAT_CONFERENCE_LABEL=Конференции
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Конференцията на {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Вече сте влезли в стая {0}.
 service.gui.CHAT_ROOM_CONFIGURATION={0} конфигуриране на стая
@@ -121,18 +124,14 @@ 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_SEND_MSG_FORBIDDEN=Изпращането на съобщения е забранено (гласът е анулиран)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Запазва чат стаята за бъдеща употреба
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Премахва избраната стая от списъка на запазените стаи
 service.gui.CHAT_ROOM_NAME=Име на стая
 service.gui.CLEAR_CUSTOM_MESSAGES=Изтрий персонализираните статуси
 service.gui.ROOM_NAME=Стая за разговори
-service.gui.AUTOJOIN=Авт. влизане
 service.gui.CHANGE_PASSWORD=Промени паролата
 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_LEAVE_NOT_CONNECTED=Трябва да се свържете преди да напуснете стаята (парадоксално, а :) ).
-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}.
@@ -157,16 +156,13 @@ service.gui.CONNECTING=Свързване...
 service.gui.CONNECTING_STATUS=Свързване
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Свързване...
 service.gui.CONNECTION=Връзка
-service.gui.CONNECTION_FAILED_MSG=Връзката към сървър {1} е прекъсната за потребител {0}.
 service.gui.CONNECTION_EXPIRED_MSG=В момента не сте свързани с {0}.
 service.gui.CONTACT_NAME=ID или номер
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY={0} не поддържа телефонните разговори.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF={0} не поддържа чат конференции.
 service.gui.CONTACT_PAUSED_TYPING={0} спря да пише
 service.gui.CONTACT_TYPING={0} пише съобщение
 service.gui.CONTACT_TYPING_SEND_FAILED=оп...не успяхме да предупредим {0}, че пишете
 service.gui.CONTACT_INFO=&Информация за контакта
-service.gui.CONTACTLIST=Контакт листа
 service.gui.CONTACTS=Контакти
 service.gui.COPY=&Копирай
 service.gui.COPY_LINK=Копирай &връзка
@@ -176,17 +172,14 @@ service.gui.CREATE_CHAT_ROOM=&Създай стая за разговори...
 service.gui.CREATE_CHAT_ROOM_ERROR=Неуспешен опит за създаване на стая: {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Асистент по създаване на стая за разговори
 service.gui.CREATE_CONFERENCE_CALL=&Създай телефонна конференция...
-service.gui.CREATE_CONFERENCE_CHAT=&Създай чат конференция
 service.gui.CREATE_GROUP=&Създай групa...
 service.gui.CREATE_GROUP_NAME=Въведете името на групата, която бихте искали да създадете.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Списъкът ви с контакти не съдържа групи. Моля добавете група от меню Файл/Добави група.
 service.gui.CREATE_VIDEO_BRIDGE=Създай &видео мост...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Създай &видео мост
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Създай / присъедини се към видео конференция
 service.gui.CREATE_VIDEO_CONFERENCE=Създаване на нова видео-конференция за тази чат стая
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Контактът не поддържа уеб информация
 service.gui.CUT=О&трежи
-service.gui.DATE=Дата
 service.gui.DELETE=Изтрий
 service.gui.DENY=&Откажи
 service.gui.DESKTOP_SHARING_WARNING=<b>Сигурен ли сте че искате да споделите екрана си?</b> <br> Ако натиснете OK останалите участници в обаждането ще могат да видят екрана ви.
@@ -197,7 +190,6 @@ service.gui.DISCONNECTED_STATUS=Край на разговора
 service.gui.DND_STATUS=Не ме безпокойте
 service.gui.DO_NOT_ASK_AGAIN=Не ме питай повече
 service.gui.DO_NOT_SHOW_AGAIN=Повече не ми показвай това съобщение
-service.gui.DOWNLOAD_NOW=&Свали сега
 service.gui.DRAG_FOR_SHARING=Довлачете тука прозорците, които искате да покажете
 service.gui.DURATION=продължителност
 service.gui.DESTROY_CHATROOM=Унищожаване на чат стаята
@@ -218,7 +210,6 @@ service.gui.ERROR_RECEIVED_FROM=Получена грешка от {0}
 service.gui.ESTIMATED_TIME=Приблизително време:
 service.gui.EVENTS=Събития
 service.gui.EXIT=И&зход
-service.gui.EXTENDED_CRITERIA=Допълнителни условия
 service.gui.GENERAL=Общи
 service.gui.GENERAL_ERROR=Обща грешка
 service.gui.GROUP_NAME=Име на групата
@@ -260,7 +251,6 @@ service.gui.FONT_ITALIC=Курсив
 service.gui.FONT_SIZE=Размер
 service.gui.FONT_STYLE=Стил
 service.gui.FONT_UNDERLINE=Подчертан
-service.gui.FROM={0} от {1}
 service.gui.GRANT_OWNERSHIP=Даване на собственост...
 service.gui.GRANT_ADMIN=Даване на администраторски права...
 service.gui.GRANT_MODERATOR=Даване на роля на модератор
@@ -286,7 +276,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Сигурни ли сте, че иска
 service.gui.HISTORY_REMOVE_ERROR=Грешка при изтриването на локално запазените съобщения.
 service.gui.HOME=Домашен
 service.gui.HOME_PAGE=Начална страница
-service.gui.HOUR=Час
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Ключ
 service.gui.IGNORE=&Пренебрегни
@@ -310,13 +299,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Покани контакти във
 service.gui.INVITE_REASON=Текст на поканата
 service.gui.IS_CALLING={0} се обажда...
 service.gui.IS_NOW={0} вече е {1}
-service.gui.JITSI_WARNING=Скоро преименувахме СИП Комуникатор и го нарекохме Жици (Jitsi).<br/>Ако желаете да продължите да получавате известия за нови версии ще трябва да свалите Жици сега.<br/><br/>Съжаляваме ако това ви причинява неудобство!<br/><br/>Разработчиците на Жици
-service.gui.JITSI_WARNING_TITLE=СИП Комуникатор се прекръства на Жици
 service.gui.JOIN=&Влез
 service.gui.JOIN_AS=В&лез като
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Присъединяване към съществуваща видео-конференция
 service.gui.JOIN_VIDEO=Присъедини видео
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Затвори
 service.gui.JOB_TITLE=Длъжност
 service.gui.JOIN_CHAT_ROOM=&Влез в стая за разговори...
 service.gui.JOIN_CHAT_ROOM_TITLE=Влизане в стая за разговори
@@ -329,7 +315,6 @@ 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.LAST_NAME=Фамилия
 service.gui.LEAVE=&Напусни
 service.gui.LIMIT_REACHED_FOR_IP=Имате прекалено много регистрации от текущия ви адрес и сървърт на {0} не разрешава отварянето на нови.
@@ -349,7 +334,6 @@ service.gui.MESSAGE=Съобщение
 service.gui.MISSED_CALLS_TOOL_TIP=Пропуснати обаждания от:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= и {0} други
 service.gui.MODERATOR=модератор
-service.gui.MORE=Повече
 service.gui.MORE_LABEL=Повече
 service.gui.MOVE=Премести
 service.gui.MOVE_SUBCONTACT=Пре&мести подконтакт
@@ -358,7 +342,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Подконтактът вече се нам
 service.gui.MOVE_SUBCONTACT_QUESTION=Сигурни ли сте, че искате да преместите {0} в {1}?
 service.gui.MOVE_TO_GROUP=Пре&мести в група
 service.gui.MOVE_CONTACT=Пре&мести контакт
-service.gui.MOVE_CONTACT_ERROR=Контактът не може да бъде преместен
 service.gui.MSG_DELIVERY_FAILURE=Доставката на горното съобщение се провали
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Протоколът който използвате не позволява съобщенията към не включени потребители. Опитайте да се свържете с {0} чрез друг протокол или изчакайте да се включи.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Възникна грешка в програмата. Това най-вероятно е бъг. Ще ви бъдем благодарни ако ни уведомите: http://www.jitsi.org/index.php/Development/BugsAndIssues
@@ -372,7 +355,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Трябва да се свържете
 service.gui.MULTIPLE_LOGINS=Свързали сте се повече от веднъж с един и същ профил. Потребител {0} на сървър {1} ше бъде изключен.
 service.gui.MY_CHAT_ROOMS=Добави чат стая
 service.gui.MY_CHAT_ROOMS_TITLE=Добави чат стая
-service.gui.MUTE=Спри микрофона
 service.gui.MUTUALLY_ON_HOLD_STATUS=Взаимно се изчакваме
 service.gui.NAME=Име
 service.gui.NETWORK=Мрежа
@@ -404,7 +386,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Временни контакти
 service.gui.SD_QUALITY=Стандартно качество
 service.gui.OFFLINE=Изключен
 service.gui.OK=&ОК
-service.gui.OLDER_CALLS=Предишни обаждания
 service.gui.ONLINE=Включен
 service.gui.OPEN=Отвори
 service.gui.OPEN_FILE_FROM_IMAGE=Кликнете два пъти върху файла, за да го отворите.
@@ -416,7 +397,6 @@ service.gui.OPEN_ON_ACTIVITY=При активност
 service.gui.OPEN_ON_MESSAGE=Само на нови съобщения
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Само на важни съобщения
 service.gui.OR=или
-service.gui.OR_ENTER_PHONE_NUMBER=Или въведете телефонен номер тук...
 service.gui.ORGANIZATION=Организация
 service.gui.OTHER=Други
 service.gui.chat.role.OWNER=Собственик
@@ -442,7 +422,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' за предложения
 service.gui.PRESS_FOR_CALL_INFO=Информация за обаждането
 service.gui.PRESS_TO_OPEN_CRM=Повече информация от външен източник
 service.gui.PREVIOUS=На&зад
-service.gui.PREVIOUS_TOOLTIP=Разглеждане на по-ранни разговори
 service.gui.PRINT=&Печат
 service.gui.PROACTIVE_NOTIFICATION=ви пише
 service.gui.PROBLEMS_ENCOUNTERED=Намерени са проблеми
@@ -458,7 +437,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Осъществихте няколко
 service.gui.RE_REQUEST_AUTHORIZATION=Ново искане на оторизация
 service.gui.REFERRED_STATUS=Препратен
 service.gui.REJECT=&Отказ
-service.gui.REMIND_ME_LATER=Напомни ми по-късно
 service.gui.REMEMBER_PASSWORD=Запомни паролата
 service.gui.REMOVE=&Премахни
 service.gui.REMOVE_ACCOUNT=&Изтриване на профила
@@ -484,9 +462,7 @@ service.gui.REVOKE_ADMIN=Отнеми администраторските пр�
 service.gui.REVOKE_MODERATOR=Отнеми модераторските права
 service.gui.REVOKE_MEMBERSHIP=Отнеми членството
 service.gui.REVOKE_VOICE=Отнеми правото на изказване
-service.gui.ROOT_GROUP=Група корен
 service.gui.SAVE=&Запази
-service.gui.SAVE_AS_DEFAULT=Запиши по подразбиране
 service.gui.SEARCH=&Търси
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Използвайе бутона за да видите всички стаи от избрания сървър и с бутона Влез, изберете тази, в която искате да влезете.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Търсен контакт
@@ -494,19 +470,13 @@ service.gui.SECURITY=Сигурност
 service.gui.SELECT_ACCOUNT=Изберете потребител
 service.gui.SELECT_COLOR=Изберете цвят
 service.gui.SELECT_GROUP=Изберете група
-service.gui.SELECT_GROUP_WIZARD_MSG=Списъкът по-долу съдържа всички групи от вашата контакт листа. Изберете тази, в която искате да добавите новия контакт.
 service.gui.SELECT_NO_GROUP=Без група
-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.SELECT_VIDEO_CONFERENCE=Избери видео конференция
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Изберете чат стая от списъка и натиснете ОК да я добавите.
 service.gui.SEND=&Изпрати
 service.gui.SEND_FILE=Изпрати &файл
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Няма информация за този контакт.
 service.gui.SEND_MESSAGE=&Изпрати съобщение
-service.gui.SEND_AS_SMS=Изпратете като SMS
 service.gui.SEND_PRIVATE_MESSAGE=Изпрати поверително съобщение
 service.gui.SEND_SMS=И&зпрати SMS
 service.gui.SEND_SMS_DETAILS=Не забравяйте да въведете и международния телефонен код. За български номера например започнете с +359
@@ -545,7 +515,6 @@ service.gui.STREET=Улица
 service.gui.SUBJECT=Тема
 service.gui.SUMMARY=Обобщение
 service.gui.TELEPHONY=Телефония
-service.gui.TODAY=Днес
 service.gui.TOOLS=&Инструменти
 service.gui.TRANSFER=Трансфер
 service.gui.TO=На:
@@ -555,7 +524,6 @@ service.gui.TRANSFER_CALL_TO=Прехвърли към:
 service.gui.TRANSPARENCY_NOT_ENABLED=Прозрачността не се поддържа от текущата ви конфигурация.
 service.gui.TYPE_YOUR_REQUEST=Въведете молбата си тук
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Не успяхме да променим видео качеството на обаждането.
-service.gui.UNMUTE=Активирай микрофона
 service.gui.USER_IDENTIFIER=Номер:
 service.gui.USER_EXISTS_ERROR=Потребителят вече съществува на избраната мрежа. Моля изберете друг потребител или друга мрежа.
 service.gui.USERNAME_NULL=Моля въведете име и парола.
@@ -568,7 +536,6 @@ service.gui.USE_PROVISIONING=Конфигуриране от мрежата (З�
 service.gui.VALUE=Стойност
 service.gui.VIDEO_CALL=&Видео обаждане
 service.gui.VIA=през
-service.gui.VIA_SMS=По СМС
 service.gui.VIEW=&Преглед
 service.gui.VIEW_HISTORY=Преглед на &историята
 service.gui.VIEW_SMILEYS=Показвай &усмивките
@@ -588,9 +555,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Нагласяване силата на з�
 service.gui.WAITING_AUTHORIZATION=Чакаме на оторизация
 service.gui.WARNING=Предупреждение
 service.gui.YES=Да
-service.gui.YESTERDAY=Вчера
-service.gui.EXISTING_ACCOUNT_ERROR=Въведеният профил е вече инсталиран.
-service.gui.NEW_MAIL=<b>Имате един нов мейл!</b><br/><b>От:</b> {0} {1} <br/><b>Заглавие:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Получихте ново писмо във вашата {0}  <a href="{1}">кутия</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Получихте {2} нови писма във вашата {0} <a href="{1}">кутия</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=Остава оше един непрочетен разговор във вашата <a href="{0}">кутия</a>.<br/>
@@ -614,7 +578,6 @@ service.gui.SECURITY_ERROR=Грешка в сигурността
 service.gui.SPEED=Скорост:
 service.gui.SILENT_MEMBER=тих член
 service.gui.NON_SECURE_CONNECTION=Невъзможно е да се установи сигурна връзка за профил {0}. Ако искате да се свържете по незащитен начин, моля отметнете полето "Разреши незащитено свързване" в настройките на профила си.
-service.gui.UPDATE=Обновяване
 service.gui.MOBILE_PHONE=Мобилен
 service.gui.VIDEO_PHONE=Видео
 service.gui.WORK_PHONE=Работен
@@ -649,12 +612,10 @@ service.gui.callinfo.CALL_INFORMATION=Информация за обаждане
 service.gui.callinfo.CALL_IDENTITY=Самоличност
 service.gui.callinfo.PEER_COUNT=Брой участници
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Конферентен фокус
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Активирано криптиране
 service.gui.callinfo.CALL_TRANSPORT=Сигнализационен транспорт
 service.gui.callinfo.CALL_DURATION=Продължителност
 service.gui.callinfo.TLS_PROTOCOL=TLS протокол
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS шифър
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=верига на сървърния TLS сертификат
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Следва съдържанието на сървърния TLS сертификат:
 service.gui.callinfo.VIEW_CERTIFICATE=Преглед на сертификат
 service.gui.callinfo.CODEC=Кодек / Честота
@@ -664,7 +625,6 @@ service.gui.callinfo.AUDIO_INFO=Аудио инфо
 service.gui.callinfo.VIDEO_INFO=Видео инфо
 service.gui.callinfo.LOCAL_IP=Локален IP / Порт
 service.gui.callinfo.REMOTE_IP=Отсрещен IP / Порт
-service.gui.callinfo.BANDWITH=Дебит
 service.gui.callinfo.LOSS_RATE=% Загуба
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Джитър
@@ -674,10 +634,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Обмяна на ключове
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE кандидати
 service.gui.callinfo.ICE_STATE=ICE състояние
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Събиране на кандидати
 service.gui.callinfo.ICE_STATE.RUNNING=Connectivity checks
 service.gui.callinfo.ICE_STATE.COMPLETED=Завършен
 service.gui.callinfo.ICE_STATE.FAILED=Провал
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Локален IP / Порт
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Продължителност на жътвата
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Локален пренасочван IP / Порт
@@ -698,11 +661,12 @@ service.gui.ALWAYS_TRUST=Занапред винаги се доверявай �
 service.gui.CERT_DIALOG_TITLE=Проверка на сертификата
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} не можа да провери самоличността на сървър<br><b>{1}</b>.<br><br>.Сървърът използва непознат или недоверен сертификат, което означава, че самоличността на сървъра не може да бъде автоматично потвърдена.<br><br> Желаете ли да се свържете въпреки това?<br>За повече информация натиснете "Покажи сертификата"</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} не можа да провери самоличността на сървъра.<br><br>Сървърът използва непознат или недоверен сертификат, което означава, че самоличността на сървъра не може да бъде автоматично потвърдена. Желаете ли да се свържете въпреки това?<br><br>За повече информация натиснете "Покажи сертификата"</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} не можа да провери самоличността на клиента {1}:{2}.<br><br>Събеседникът ви използва непознат или недоверен сертификат, което означава, че самоличността му не може да бъде автоматично потвърдена. Желаете ли да се свържете въпреки това?<br><br>За повече информация натиснете "Покажи сертификата"</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} не можа да провери самоличността на събеседника {1}.<br><br> Сертификатът е недоверен или непознат , което пречи проверката да бъде<br> извършена автоматично. Желаете ли да се свържете въпреки това?<br><br> За повече информация натиснете "Покажи сертификата".</html>
 service.gui.CONTINUE_ANYWAY=Продължавам въпреки това
 service.gui.CERT_INFO_CHAIN=Верига от сертификати:
 service.gui.CERT_INFO_ISSUED_TO=Издаден за
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Обичайно име:
 service.gui.CERT_INFO_O=Организация:
 service.gui.CERT_INFO_C=Държава:
@@ -721,12 +685,10 @@ service.gui.CERT_INFO_SIGN_ALG=Алгоритъм на подписа:
 service.gui.CERT_INFO_PUB_KEY_INFO=Информация за публичен ключ
 service.gui.CERT_INFO_ALG=Алгоритъм:
 service.gui.CERT_INFO_PUB_KEY=Публичен ключ:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} байтове: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} битове
 service.gui.CERT_INFO_EXP=Експонента:
 service.gui.CERT_INFO_KEY_SIZE=Размер на ключа:
 service.gui.CERT_INFO_SIGN=Подпис:
-service.gui.CONTINUE=Продължи
 service.gui.SHOW_CERT=Покажи сертификата
 service.gui.HIDE_CERT=Скрий сертификата
 
@@ -749,12 +711,9 @@ service.gui.security.SECURE_AUDIO=Защитено аудио
 service.gui.security.AUDIO_NOT_SECURED=Незащитено аудио
 service.gui.security.SECURE_VIDEO=Защитено видео
 service.gui.security.VIDEO_NOT_SECURED=Незащитено видео
-service.gui.security.NO_VIDEO=Няма видео
-service.gui.security.CIPHER=Шифър: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Защитено обаждане. За повече информация натиснете тук.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Незащитено обаждане.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Натиснете тук за да сравните тайната парола с партньора си.
-service.gui.security.COMPARE_WITH_PARTNER=Сравнете със събеседника си и натиснете катинарчето ако съвпадат.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Сравнете със събеседника си:
 service.gui.security.STRING_COMPARED=Паролата е сравнена!
@@ -772,20 +731,14 @@ service.gui.avatar.imagepicker.CLICK=Натисни и се усмихни
 service.gui.avatar.imagepicker.IMAGE_FILES=Файлове
 service.gui.avatar.imagepicker.IMAGE_PICKER=Картинка
 service.gui.avatar.imagepicker.IMAGE_SIZE=Размер на картинката
-service.gui.avatar.imagepicker.INITIALIZING=Инициализиране
 service.gui.avatar.imagepicker.RESET=Реинициализация
 service.gui.avatar.imagepicker.SET=Сложи
 service.gui.avatar.imagepicker.TAKE_PHOTO=Направи снимка
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Проблем с камерката
 
 service.gui.security.encryption.required=Изисква се криптиране!
 
 service.protocol.ICE_FAILED=Не може да се осъществи връзка (неуспешен ICE, не е намерено реле)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Грешка при съхраняване на СИП списъка с контакти
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Не можем да прочетем ресурс {0}. За {1}
@@ -815,9 +768,7 @@ impl.ldap.QUERY_CUSTOM=Персонализиране на заявката
 impl.ldap.QUERY_CUSTOM_HINT=Използвайте <query> като заместител на търсения текст.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Автоматично разширяване на заявката до всички подобни резултати
 impl.ldap.QUERY_PHOTO_INLINE=Изтегляне на снимката заедно с атрибутите
-impl.ldap.NEW=&Нов
 impl.ldap.EDIT=промени
-impl.ldap.REMOVE=Премахни
 impl.ldap.ENABLED=Активиран
 impl.ldap.SERVER_NAME=Име
 impl.ldap.SERVER_NAME_EXAMPLE=Моят LDAP указател
@@ -850,6 +801,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 impl.ldap.PHONE_PREFIX=Телефонен префикс
 impl.ldap.PHONE_PREFIX_EXAMPLE=Пр.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Адресник
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Активирай търсенето в адресника на Mac OS X
@@ -864,9 +819,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Outlook приложение п
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google Контакти
-impl.googlecontacts.NEW=Нов
 impl.googlecontacts.EDIT=промени
-impl.googlecontacts.REMOVE=Премахни
 impl.googlecontacts.ENABLED=Активиран
 impl.googlecontacts.ACCOUNT_NAME=Име на профил
 impl.googlecontacts.SAVE=Запази
@@ -905,11 +858,8 @@ plugin.accountinfo.ORGANIZATION=Организация:
 plugin.accountinfo.JOB_TITLE=Длъжност:
 plugin.accountinfo.ABOUT_ME=За мен:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Снимки:
 plugin.accountinfo.GLOBAL_ICON=Използвай глобална иконка
 plugin.accountinfo.LOCAL_ICON=Използвай тази иконка:
-plugin.accountinfo.CHANGE=Промени
-plugin.accountinfo.ONLY_MESSAGE=Само съобщения
 
 # connection info
 plugin.connectioninfo.TITLE=Информация за връзката
@@ -929,49 +879,12 @@ plugin.aimaccregwizz.USERNAME=АИМ потребилско име:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Потребителско име и парола
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Регистриране на нов профил
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Ако нямата профил при АИМ, натиснете тук за да се регистрирате.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Използвай ръчни настройки
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Относно {0}
 plugin.branding.LOGO_MESSAGE=Телефония и съобщения с отворен код
-plugin.branding.LOADING=Зареждане
 plugin.branding.ABOUT_MENU_ENTRY=Относно
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1} е в процес на интензивна разработка. Версията която ползвате е експериментална и е ВЪЗМОЖНО ДА НЕ РАБОТИ както бихте очаквали. Моля обърнете се към {2} за повече информация.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Всички права запазени. Посетете <a href="http://jitsi.org">http://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>The <b>Жици</b> се  разпространява под лиценз LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Речници
-plugin.dictaccregwizz.ANY_DICTIONARY=Всички речници
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Всички речници от {0}
-plugin.dictaccregwizz.FIRST_MATCH=Първи резултат
-plugin.dictaccregwizz.NO_MATCH=Няма резултати
-plugin.dictaccregwizz.MATCH_RESULT=Не са намерени дефиниции за "{0}", може би имахте предвид:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Текущия речник "{0}" вече не съществува на сървъра.
-plugin.dictaccregwizz.INVALID_STRATEGY=Текущата стратегия не се поддържа от сървъра.
-plugin.dictaccregwizz.PROTOCOL_NAME=Речник
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Протокол за достъп до он-лайн речници
-plugin.dictaccregwizz.HOST=Адрес
-plugin.dictaccregwizz.SERVER_INFO=Информация от сървъра
-plugin.dictaccregwizz.STRATEGY_SELECTION=Избор на стратегия
-plugin.dictaccregwizz.STRATEGY_LIST=Списък със стратегиите:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Стратегии на търсене
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Стратегиите се използват при търсене на подобни думи. Това е необходимо когато зададена от вас дума не е намерена във вида, в който е зададена и е нужно да се разшири търсенето. Стратегия "Префикс" например ще търси сред всички думи, които започват със зададената от вас дума.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Информация за Речник профила ви
-plugin.dictaccregwizz.FIRST_ACCOUNT=Този асистент ще създаде профил свързан към dict.org.\n\nВ последствие ще можете да добавите нови профили и сървъри. Попълнете полето "Адрес" с речника който искате да добавите.
-plugin.dictaccregwizz.THREAD_CONNECT=Свъзване към сървъра
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Неуспешен опит за свързване. Сървърът не съществува или не поддържа протокол Речник
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Изтегляне на стратегиите
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Не са намерени стратегии на сървъра
-plugin.dictaccregwizz.POPULATE_LIST=Зареждане на списъка
-plugin.dictaccregwizz.CLOSING_CONNECTION=Затваряне на връзката
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Преди да можете да използвате Фейсбук Чат, трябва да създадете "Потребителско име" (Username) <br>чрез вашата Фейсбук страница ("Account Settings").</a><br><br>Моля имайте предвид,че след като създадете Потребителското си име ще трябва да излезате от страницата. В някой случаи е възможно да се наложи да изчакате.</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Фейсбук чат протокол
-plugin.facebookaccregwizz.PROTOCOL_NAME=Фейсбук
-plugin.facebookaccregwizz.USERNAME=Потребителско име:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Потребителско име и парола
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Автоматично стартиране на {0} след включване на компютъра
@@ -982,9 +895,6 @@ plugin.generalconfig.SHOW_HISTORY=Покажи
 plugin.generalconfig.HISTORY_SIZE=Скорошни съобщения в нови разговори
 plugin.generalconfig.SEND_MESSAGES_WITH=Изпращане на съобщенията с:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Отваряне на чат прозореца на преден план
-plugin.generalconfig.ERROR_PERMISSION=Нямате привилегиите нужни за премахването на автоматичното стартиране
-plugin.generalconfig.TRANSPARENCY=Прозрачност
-plugin.generalconfig.ENABLE_TRANSPARENCY=Активиране на прозрачността
 plugin.generalconfig.DEFAULT_LANGUAGE=Език
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Промените ви ще бъдат отчетени след рестартиране на приложението.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% преведени
@@ -1065,13 +975,10 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Коментар
 plugin.jabberaccregwizz.RESOURCE=Ресурс
 plugin.jabberaccregwizz.AUTORESOURCE=Автоматично генериране на ресурс
 plugin.jabberaccregwizz.PRIORITY=Приоритет
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP грешка
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Непозната XMPP грешка ({0}). Проверете, че името на сървъра е правилно.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Паролата ви не съответства.
 plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Изрично въвеждане на сървърни параметри
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Разширени настройки
 plugin.jabberaccregwizz.USE_ICE=Използване на ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Използване на ICE и Jingle от Google (тестово)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Автоматично откриване на STUN и TURN сървъри
 plugin.jabberaccregwizz.SUPPORT_TURN=Поддържа TURN
 plugin.jabberaccregwizz.TURN_USERNAME=TURN потребителско име
@@ -1099,11 +1006,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Изключване на копие на
 plugin.jabberaccregwizz.DTMF_AUTO=Автоматично: Избор между RTP и Inband 
 plugin.jabberaccregwizz.SERVER_OPTIONS=Настройки на сървъра
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Смени паролата на сметката
-plugin.jabberaccregwizz.NEW_PASSWORD=Нова парола
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Потвърждаване на паролата
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Моля въведете валиден номер на порт за да продължите.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Сметката трябва да е включена, за да промените паролата.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Полето за парола е празно.
 plugin.jabberaccregwizz.TLS_REQUIRED=Конекцията не използва TLS, смяната на паролата няма да се осъществи.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Паролата беше сменена успешно
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Вашият XMPP сървър не позволява смяна на паролата.
@@ -1117,21 +1021,6 @@ plugin.jabberaccregwizz.RESET=Реинициализация
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Реинициализирай глобалните настройки
 plugin.jabberaccregwizz.DISABLE_JINGLE=Изключи Jingle (аудио и видео разговори с XMPP)
 
-# mailbox
-plugin.mailbox.OUTGOING=Изходящо съобщение
-plugin.mailbox.INCOMING=Входящи съобщения:
-plugin.mailbox.WAIT_TIME=Забавяне преди активиране на гласовата поща
-plugin.mailbox.MAX_MESSAGE_TIME=Максимална продължителност на съобщенията
-plugin.mailbox.CONFIRM=Потвърди
-plugin.mailbox.DEFAULTS=По подразбиране
-plugin.mailbox.MAILBOX=Гласова поща
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Протокол за връзка с MSN услугата
-plugin.msnaccregwizz.USERNAME=Е-мейл:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Име и парола
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Инсталиране
 plugin.pluginmanager.UNINSTALL=Дезинсталация
@@ -1160,7 +1049,6 @@ plugin.sipaccregwizz.SERVER_PORT=Порт на сървъра
 plugin.sipaccregwizz.PROXY=Прокси
 plugin.sipaccregwizz.PROXY_PORT=Порт за проксито
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Предпочитан транспортен протокол
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Разширени настройки
 plugin.sipaccregwizz.PROXY_OPTIONS=Настройки на проксито
 plugin.sipaccregwizz.PROXY_AUTO=Автоматично настройване на проксито
 plugin.sipaccregwizz.ENABLE_PRESENCE=Активирай чат и статуси на присъствие (SIMPLE)
@@ -1180,8 +1068,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Автоматично: Избор между RTP
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband (в аудио потока)
-plugin.sipaccregwizz.REGISTER=Регистрационни съобщения (REGISTER)
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Изрично задаване на сървърни настройки
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Активирай поддръжката за кодирани разговори
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Обявявай ZRTP поддръжката в сигнализационния протокол 
 plugin.sipaccregwizz.AUTH_NAME=Име за оторизация
@@ -1202,10 +1088,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Адрес за проверка на �
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Паролата ви не съответства.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none> (използване на регулярен израз)
 plugin.sipaccregwizz.SAVP_OPTION=Обявяване на RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Изключено (обявяване само на RTP/AVP)
 plugin.sipaccregwizz.SAVP_OPTION_1=Задължително (предлагане и приемане само на RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Незадължително (предлагане на 1. RTP/SAVP и 2. RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Активиране на S-Descriptor (също известно като SDES или SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Избери активните протоколи за криптиране и техния приоритет (най-предпочитания най-отгоре)
 plugin.sipaccregwizz.CIPHER_SUITES=Активирани шифри:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} ще се опита автоматично да защити всичките ви разговори със ZRTP и ще ви уведоми звуково и визуално при установяването на сигурна връзка. Препоръчваме ви да променяте настройките по-долу само ако знаете какво точно правите.</div></html>
@@ -1219,15 +1105,6 @@ plugin.skinmanager.DEFAULT_SKIN=Скин по подразбиране
 plugin.skinmanager.ADD_NEW_SKIN=Добавяне на нов скин ...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Скин по подразбиране
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Модул за свързване към SSH машини
-plugin.sshaccregwizz.USERNAME=Потребител:
-plugin.sshaccregwizz.IDENTITY_FILE=Файл със самоличност:
-plugin.sshaccregwizz.KNOWN_HOSTS=Познати машини:
-plugin.sshaccregwizz.OPTIONAL=По избор
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Настройки на профила
-
 # status update
 plugin.autoaway.AUTO_STATUS=Автоматично преминаване в режим Далече
 plugin.autoaway.ENABLE_CHANGE_STATUS=Промяна на статуса докато сте далече
@@ -1275,22 +1152,6 @@ plugin.whiteboard.DESELECT=Отмени избор
 plugin.whiteboard.DELETE=Изтрий
 plugin.whiteboard.PROPERTIES=Свойства
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Протокол за чат на Yahoo!
-plugin.yahooaccregwizz.USERNAME=Потребител:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Име и парола:
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Протокол Zeroconf (Бонжур)
-plugin.zeroaccregwizz.FIRST_NAME=Име:
-plugin.zeroaccregwizz.LAST_NAME=Фамилия:
-plugin.zeroaccregwizz.EMAIL=Е-мейл:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Запазване на бонжур контактите?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=Име и парола
-plugin.zeroaccregwizz.USERID=Потребител
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Протокол за връзка с услугата Гугъл Толк
@@ -1304,19 +1165,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, Портал за Инт�
 plugin.iptelaccregwizz.USERNAME=Потребител
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Регистрация в iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=Интернет телефония  и чат
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Потребител
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Напишете отново
 plugin.sip2sipaccregwizz.EMAIL=Адрес на ел. поща
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=За помощ по тази услуга отидете на <br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Електронния адрес се използва при получаване на гласова поща, <br>пропуснати повиквания и възстановяване на загубена парола</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>За помощ по тази услуга отидете на <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Съществуващ sip2sip.info потребител
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Създайте безплатно нов sip2sip.info потребител
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=Интернет телефония и чат
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=За помощ по тази услуга отидете на <br>http://ippi.fr
@@ -1325,6 +1178,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Съществуващ ippi профил
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Създаване на безплатен ippi профил
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Затваряне на чат прозореца
 plugin.keybindings.CHAT_COPY=&Копирай
 plugin.keybindings.CHAT_CUT=О&трежи
@@ -1347,10 +1201,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Име
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Основна комбинация
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Втора комбинация
 plugin.keybindings.globalchooser.PRESS_BTN=Натиснете за да настроите
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Изчакване
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Натисни за да говориш (режим радио станция)
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Засичане на специални клавиши
 plugin.keybindings.PLUGIN_NAME=Клавишни комбинации
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Чат
 plugin.keybindings.MAIN=Основни
 plugin.keybindings.GLOBAL=Глобални комбинации
@@ -1378,6 +1232,7 @@ plugin.notificationconfig.tableheader.SOUND=Възпроизвеждане на
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Възпроизвеждане на звук през устройството за playback
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Възпроизвеждане на звук през говорителите
 plugin.notificationconfig.tableheader.DESCRIPTION=Описание на събитие
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Входящо обаждане
 plugin.notificationconfig.event.SecurityMessage=Сигурност
 plugin.notificationconfig.event.IncomingFile=Входящ файл
@@ -1479,6 +1334,7 @@ impl.neomedia.configform.VIDEO=Видео
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Периодично вътрешно опресняване
 impl.neomedia.configform.H264.defaultProfile=Подразбиращ се профил на кодиране:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Базов (Baseline)
 impl.neomedia.configform.H264.defaultProfile.high=Висококачествен (High)
 impl.neomedia.configform.H264.defaultProfile.main=Главен (Main)
@@ -1509,7 +1365,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Настояща паро�
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Въведете нова парола: 
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Въведете отново: 
 plugin.securityconfig.masterpassword.MP_TITLE=Главна парола
-plugin.securityconfig.masterpassword.MP_NOT_SET=(невъведена)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Въведохте грешна главна парола. Опитайте отново!
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Грешна главна парола!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Неуспешна смяна на паролата
@@ -1621,7 +1476,6 @@ plugin.globalproxy.PROXY_PORT=Прокси порт
 plugin.globalproxy.PROXY_USERNAME=Потребител за проксито
 plugin.globalproxy.PROXY_PASSWORD=Парола за проксито
 plugin.globalproxy.DESCRIPTION={0} ще използва прокси настройките за всички мрежи към които се свързва отсега нататък.\nПоддръжката на прокси сървъри в момента е експериментална. За справки таблицата по-долу:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Посредничи също и DNS
 plugin.globalproxy.FWD_DNS_NOTE=Полезно с Тор. Помага за избягване на DNS утечки чрез препредаване на целия DNS трафик към Тор проксито. Изисква рестарт.
@@ -1659,7 +1513,6 @@ plugin.provisioning.RESTART_WARNING=Промените ви ще се отраз
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Копиране на уникалния идентификатор
 plugin.provisioning.CLIPBOARD_FAILED=Грешка при копирането
-plugin.provisioning.EXIT_ON_FAIL=Излезте от приложението ако мрежовото настройване се провали
 plugin.provisioning.CREDENTIALS=Последно запаметена парола за настройването
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Сигурни ли сте, че искате да изтриете паролата за мрежово настройване?
 plugin.provisioning.PROV_FAILED=Захранването пропадна
@@ -1726,8 +1579,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} се опита да се в�
 #plugin spellcheck
 plugin.spellcheck.TITLE=Правопис и граматика
 plugin.spellcheck.MENU=Покажи правописа и граматиката
-plugin.spellcheck.LANG=Език
-plugin.spellcheck.EDIT_PERSONAL_DICT=Редактирай
 plugin.spellcheck.ENABLE_SPELL_CHECK=Активирай проверката на правописа
 plugin.spellcheck.dialog.FIND=Намери отново
 plugin.spellcheck.dialog.REPLACE=Замени   
diff --git a/resources/languages/resources_cs.properties b/resources/languages/resources_cs.properties
index 1a3390f..b2c4347 100644
--- a/resources/languages/resources_cs.properties
+++ b/resources/languages/resources_cs.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Já
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Průvodce registrací účtu
 service.gui.ACCOUNTS=Účty
 service.gui.ADD=&Přidat
-service.gui.ADD_ACCOUNT=Přidat účet
 service.gui.ADD_CONTACT=&Přidat kontakt
 service.gui.ADD_AUTHORIZED_CONTACT=Přidat {0} do seznamu kontaktů
 service.gui.ADD_CONTACT_TO=&Přidat kontakt do
@@ -41,20 +51,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Chyba při přidávání kontaktu
 service.gui.ADD_CONTACT_EXIST_ERROR=Kontakt {0} již existuje ve vašem seznamu kontaktů.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Server neodpověděl na požadavek o přidání kontaktu s id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Neúspěšné přidání kontaktu s id: {0}. Operace není podporována.
-service.gui.ADD_CONTACT_IDENTIFIER=Do pole níže zadejte identifikátor kontaktu, který chcete přidat.
-service.gui.ADD_CONTACT_WIZARD=Průvodce přidáním kontaktu
 service.gui.ADD_CONTACT_NOT_CONNECTED=Pro přidání kontaktu musíte být připojeni. Přihlašte se prosím k vybranému poskytovateli a opakujte akci.
 service.gui.ADD_GROUP_LOCAL_ERROR=Nepodařilo se přidat skupinu se jménem: {0}. Chyba při lokální IO operaci.
 service.gui.ADD_GROUP_EXIST_ERROR=Skupina jménem {0} již existuje ve vašem seznamu kontaktů. Zvolte prosím jiný název.
 service.gui.ADD_GROUP_NET_ERROR=Nepodařilo se přidat skupinu: {0}. Problém byl způsoben chybou sítě. Zkontrolujte prosím síťové připojení a opakujte akci.
 service.gui.ADD_GROUP_ERROR=Nepodařilo se přidat skupinu s jménem {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Jméno skupiny musí být zadáno
-service.gui.ADD_GROUP=Přidat skupinu
-service.gui.ADD_SUBCONTACT=&Přidat subkontakt
 service.gui.ADDRESS=Adresa
 service.gui.ADMINISTRATOR=administrátor
 service.gui.ADVANCED=&Pokročilé
-service.gui.ALL=&Vše
 service.gui.ALL_CONTACTS=&Všechny kontakty
 service.gui.APPLY=&Použij
 service.gui.ARE_CALLING={0} volá...
@@ -63,7 +68,6 @@ service.gui.AT=at
 service.gui.AUTHORIZE=Autorizovat
 service.gui.AUTHORIZATION_ACCEPTED={0} přijal požadavek na autorizaci.
 service.gui.AUTHENTICATION_FAILED=Neúspěšné přihlášení ({0}). Zadali jste nesprávné heslo.
-service.gui.AUTHENTICATION_REQUESTED=Požadavek na přihlášení
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Server {0} vyžaduje vaši autentifikaci.
 service.gui.AUTHENTICATION_REJECTED={0} odmítl váš požadavek na autorizaci.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autorizace
@@ -103,7 +107,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Do políčka níže zadejte novou přezdívku.
 service.gui.CHANGE_NICKNAME_ERROR=Chyba při změně jména
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Přezdívka již existuje
 service.gui.CHANGE_VIDEO_QUALITY=Změnit kvalitu vzdáleného videa
-service.gui.CHAT_CONFERENCE_LABEL=Konference
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0} konferencí
 service.gui.CHAT_ROOM_ALREADY_JOINED=Místnost {0} je již připojena.
 service.gui.CHAT_ROOM_CONFIGURATION=Konfigurace místnosti {0}
@@ -114,18 +117,14 @@ service.gui.CHAT_ROOM_USER_JOINED=se připojil(a) do {0}
 service.gui.CHAT_ROOM_USER_LEFT=opustil(a) {0}
 service.gui.CHAT_ROOM_USER_KICKED=byl(a) vyhozen(a) od {0}
 service.gui.CHAT_ROOM_USER_QUIT=ukončil(a) {0}
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Uloží místnost pro budoucí použití
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Odstranit zvolenou místnost ze seznamu uložených místností
 service.gui.CHAT_ROOM_NAME=Jméno místnosti
 service.gui.CLEAR_CUSTOM_MESSAGES=Vymazat vlastní zprávy
 service.gui.ROOM_NAME=Místnost
-service.gui.AUTOJOIN=Automatické připojení
 service.gui.CHANGE_PASSWORD=Změnit heslo
 service.gui.CHAT_ROOM_NAME_INFO=Do pole níže zadejte jmého místnosti kterou chcete vytvořit.
 service.gui.CHAT_ROOM_NOT_EXIST=Místnost {0} nebyla nalezena na serveru {1}. Přesvědčte se jestli jste zadali správné jméno.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Pro připojení k místnosti {0} musíte být přihlášeni.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Pro opuštění místnosti k ní musíte být přihlášeni.
-service.gui.CHAT_ROOM_NOT_JOINED=Pro provádění akcí v místnosti k ní musíty být přihlášeni.
 service.gui.CHAT_ROOM_OPTIONS=Možnosti místnosti
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Místnost {0} vyžaduje abyste se před připojením registrovali.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Místnost {0} požaduje heslo.
@@ -142,22 +141,18 @@ service.gui.CLEAR=Vymazat
 service.gui.CLOSE=&Zavřít
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Před méně než 2 ma sekundami jste přijali novou zprávu. Opravdu chcete zavřít chat?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Právě probíhá přenos souboru. Přejete si jej přerušit?
-service.gui.CONFIRM=Potvrdit
 service.gui.CONNECTED_STATUS=Spojeno
 service.gui.CONNECTING=Připojuji...
 service.gui.CONNECTING_STATUS=Připojuji
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Připojuji...
 service.gui.CONNECTION=Spojení
-service.gui.CONNECTION_FAILED_MSG=Nepodařilo se připojit účet {0} k serveru {1}. Zkontrolujte nastavení síťového spojení nebo kontaktujte správce sítě.
 service.gui.CONNECTION_EXPIRED_MSG=Nyní jste odpojeni od serveru {0}.
 service.gui.CONTACT_NAME=ID nebo Číslo
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Zvolený kontakt {0} nepodporuje telefonování.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Zvolený kontakt {0} nepodporuje konferenční chat.
 service.gui.CONTACT_PAUSED_TYPING={0} přestal(a) psát...
 service.gui.CONTACT_TYPING={0} píše zprávu...
 service.gui.CONTACT_TYPING_SEND_FAILED=nemohli jsme {0} informovat že jste mu psali
 service.gui.CONTACT_INFO=&Informace o kontaktech
-service.gui.CONTACTLIST=Seznam kontaktů
 service.gui.CONTACTS=Kontakty
 service.gui.COPY=&Kopírovat
 service.gui.COPY_LINK=Kopírovat &odkaz
@@ -167,16 +162,13 @@ service.gui.CREATE_CHAT_ROOM=&Vytvořit místnost...
 service.gui.CREATE_CHAT_ROOM_ERROR=Chyba při vytváření místnosti {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Průvodce vytvořením místnosti
 service.gui.CREATE_CONFERENCE_CALL=&Vytvořit konferenční hovor...
-service.gui.CREATE_CONFERENCE_CHAT=&ytvořit konferenční chat...
 service.gui.CREATE_GROUP=&Vytvořit skupinu
 service.gui.CREATE_GROUP_NAME=Do políčka níže zadejte název skupiny kterou chcete vytvořit.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Váš seznam kontaktů neobsahuje žádnou skupinu. Prosím nejprve skupinu vytvořte (Soubor/Vytvořit skupinu).
 service.gui.CREATE_VIDEO_BRIDGE=Vytvořit &video bridge...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Vytvořit &video bridge
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Vytvořit / Připojit se do video konference
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Tento kontakt nepodporuje informace z webu
 service.gui.CUT=&Vyjmout
-service.gui.DATE=Datum
 service.gui.DELETE=Smazat
 service.gui.DENY=&Odmítnout
 service.gui.DESKTOP_SHARING_WARNING=<b>Opravdu si přejete sdílet obrazovku?</b><br>Stlačením OK dovolíte ostatním vidět vaši obrazovku
@@ -186,7 +178,6 @@ service.gui.DISCONNECTED_STATUS=Odpojeno
 service.gui.DND_STATUS=Nerušit
 service.gui.DO_NOT_ASK_AGAIN=Příště se neptat
 service.gui.DO_NOT_SHOW_AGAIN=Tuto zprávu víckrát nezobrazovat
-service.gui.DOWNLOAD_NOW=&Stáhnout nyní
 service.gui.DRAG_FOR_SHARING=Přetáhněte sem objekty ke sdílení...
 service.gui.DURATION=Doba trvání
 service.gui.EDIT=&Editovat
@@ -205,7 +196,6 @@ service.gui.ERROR_RECEIVED_FROM=Nelze přijmout zprávu od {0}
 service.gui.ESTIMATED_TIME=Odhadovaný čas:
 service.gui.EVENTS=Notifikace
 service.gui.EXIT=U&končit
-service.gui.EXTENDED_CRITERIA=Rozšířené hledání
 service.gui.GENERAL=Obecné
 service.gui.GENERAL_ERROR=Obecná chyba
 service.gui.GROUP_NAME=Jméno skupiny
@@ -247,7 +237,6 @@ service.gui.FONT_ITALIC=Kurzíva
 service.gui.FONT_SIZE=Velikost
 service.gui.FONT_STYLE=Styl
 service.gui.FONT_UNDERLINE=Podtržené
-service.gui.FROM={0} z {1}
 service.gui.GRANT_OWNERSHIP=Přidělit vlastnictví...
 service.gui.GRANT_ADMIN=Přidělit práva administrátora...
 service.gui.GRANT_MODERATOR=Přidělit práva moderátora
@@ -273,12 +262,12 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Jste si jisti, že chcete trvale odstrani
 service.gui.HISTORY_REMOVE_ERROR=Chyba při odstraňování lokálně uložených zpráv.
 service.gui.HOME=Domov
 service.gui.HOME_PAGE=Domovská stránka
-service.gui.HOUR=Hodin(a)
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifikátor
 service.gui.IGNORE=&Ignorovat
 service.gui.INSERT_SMILEY=Vložit smajlíka
 service.gui.INCOMING_CALL=Příchozí hovor od: {0}
+service.gui.INCOMING_SCREEN_SHARE=Příchozí hovor od: {0}
 service.gui.INCOMING_CALL_STATUS=Příchozí hovor
 service.gui.INSTANT_MESSAGINGS=IM
 service.gui.INITIATING_CALL_STATUS=Inicializace spojení
@@ -294,12 +283,9 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Pozvat kontakty do video bridge
 service.gui.INVITE_REASON=Důvod pozvání
 service.gui.IS_CALLING={0} volá...
 service.gui.IS_NOW={0} je nyní {1}
-service.gui.JITSI_WARNING=SIP Communicator byl před časem přejmenovaný na Jitsi.<br/>Jestliže si přejete aby vaše verze zůstala aktuální, potom prosím stáhněte aplikaci Jitsi.<br/><br/>Omlouváme se za jakékoli způsobené nepřijemnosti.<br/><br/>Vývojový tým Jitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator se přejmenuje na Jitsi
 service.gui.JOIN=&Připojit
 service.gui.JOIN_AS=Př&ipojen jako
 service.gui.JOIN_VIDEO=Připojit video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Zavřít
 service.gui.JOB_TITLE=Pozice
 service.gui.JOIN_CHAT_ROOM=&Připojit místnost...
 service.gui.JOIN_CHAT_ROOM_TITLE=Připojit místnost
@@ -312,7 +298,6 @@ service.gui.KICK_FAILED=Vyhození selhalo
 service.gui.KICK_FAILED_GENERAL_ERROR=Nepodařilo se vyhodit uživatele {0}. Nastala obecná chyba serveru.
 service.gui.KICK_FAILED_NOT_ALLOWED=Nepodařilo se vyhodit uživatele {0}. Vlastník ani správce místnosti nemůžou být vyhozeni.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Nepodařilo se vyhodit uživatele {0}. Nemáte dostatečná oprávnění.
-service.gui.LAST=Poslední
 service.gui.LAST_NAME=Příjmení
 service.gui.LEAVE=&Odejít
 service.gui.LIMIT_REACHED_FOR_IP=Máte otevřeno příliš mnoho spojení z lokální IP adresy a server {0} odmítl z této adresy otevřít další spojení.
@@ -332,7 +317,6 @@ service.gui.MESSAGE=Zprávy
 service.gui.MISSED_CALLS_TOOL_TIP=Ztracená volání od:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= a {0} další(ch)
 service.gui.MODERATOR=moderátor
-service.gui.MORE=Více (See more)
 service.gui.MORE_LABEL=Více
 service.gui.MOVE=Přesunout
 service.gui.MOVE_SUBCONTACT=Pře&místit kontakt
@@ -341,7 +325,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Vybraný kontakt je stejný jako ten,\nkterý
 service.gui.MOVE_SUBCONTACT_QUESTION=Opravdu si přejete přesunout kontakt {0} do {1}?
 service.gui.MOVE_TO_GROUP=&Přesunout do skupiny
 service.gui.MOVE_CONTACT=Přesunout kontakt
-service.gui.MOVE_CONTACT_ERROR=&Kontakt nelze přesunout
 service.gui.MSG_DELIVERY_FAILURE=Zprávu nelze doručit
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Protokol nepodporuje offline doručování zpráv. Můžete se zkusit s {0} spojit pomocí jiného protokolu, nebo počkat až bude kontakt online.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Vnitřní chyba programu. Prosím oznamte chybu zde: https://jitsi.org/Development/BugsAndIssues.
@@ -354,7 +337,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Abyste mohli zprávu odeslat, musít bá
 service.gui.MULTIPLE_LOGINS=Jste přihlášeni víckrát pod stejným účtem. Tento účet: Jméno: {0}, server: {1} je nyní odpojen.
 service.gui.MY_CHAT_ROOMS=Přidat chatovací místnost
 service.gui.MY_CHAT_ROOMS_TITLE=Přidat chatovací místnost
-service.gui.MUTE=Ztlumit
 service.gui.MUTUALLY_ON_HOLD_STATUS=Navzájem drženo
 service.gui.NAME=Jméno
 service.gui.NETWORK=Síť
@@ -365,6 +347,7 @@ service.gui.NEW_MESSAGE=Nová zpráva
 service.gui.NEW_NAME=Moje jméno
 service.gui.NEW_STATUS_MESSAGE=Nová stavová zpráva
 service.gui.NEW_STATUS_MESSAGE_SAVE=Uložit jako vlastní zprávu
+service.gui.NICKNAME=Přezdívka
 service.gui.NO=Ne
 service.gui.NONE=Žádný
 service.gui.NO_CAMERA_AVAILABLE=Kamera není k dispozici
@@ -385,7 +368,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Není v seznamu kontaktů
 service.gui.SD_QUALITY=Standardní kvalita
 service.gui.OFFLINE=Odpojen
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Starší volání
 service.gui.ONLINE=Připojen
 service.gui.OPEN=Otevřít
 service.gui.OPEN_FILE_FROM_IMAGE=Dvojklikněte pro otevření souboru.
@@ -393,9 +375,12 @@ service.gui.OPEN_FOLDER=Otevřít složku
 service.gui.OPEN_IN_BROWSER=Otevřít v &prohlížeči
 service.gui.OPTIONS=Volby
 service.gui.OR=nebo
-service.gui.OR_ENTER_PHONE_NUMBER=Nebo zde zadejte telefonní číslo...
 service.gui.ORGANIZATION=Organizace
 service.gui.OTHER=Ostatní
+service.gui.chat.role.ADMINISTRATOR=administrátor
+service.gui.chat.role.MODERATOR=moderátor
+service.gui.chat.role.MEMBER=člen
+service.gui.chat.role.SILENT_MEMBER=tichý společník
 service.gui.OWNER=vlastník místnosti
 service.gui.ON_MOBILE_TOOLTIP=(Na mobilu)
 service.gui.PASSWORD=Heslo
@@ -411,7 +396,6 @@ service.gui.PRESENCE=Přítomnost
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' pro návrhy
 service.gui.PRESS_FOR_CALL_INFO=Zobrazit detaily o hovoru
 service.gui.PREVIOUS=Předchozí
-service.gui.PREVIOUS_TOOLTIP=Procházet starší konverzaci
 service.gui.PRINT=&Tisk
 service.gui.PROACTIVE_NOTIFICATION=píše zprávu
 service.gui.PROBLEMS_ENCOUNTERED=Nalezeny problémy
@@ -420,13 +404,13 @@ service.gui.PUT_OFF_HOLD=Uvolnit (Put off hold)
 service.gui.PUT_ON_HOLD=Podržet (Put on hold)
 service.gui.QUIT=&Ukončit
 service.gui.READY=Připraven
+service.gui.RECENT_MESSAGES=Poslední konverzace
 service.gui.REASON=Důvod
 service.gui.RECEIVED={0} přijatých zpráv
 service.gui.RECONNECTION_LIMIT_EXCEEDED=Odpojili a znovu připojili jste se k serveru příliš rychle. Účet {0} na serveru {1} je dočasně zakázaný. Před dalším přihlášením budete muset chvíli počkat.
 service.gui.RE_REQUEST_AUTHORIZATION=Znovu požádat o autorizaci
 service.gui.REFERRED_STATUS=Odkazováno
 service.gui.REJECT=&Zamítnout
-service.gui.REMIND_ME_LATER=Připomenout později
 service.gui.REMEMBER_PASSWORD=Zapamatovat si heslo
 service.gui.REMOVE=&Odebrat
 service.gui.REMOVE_ACCOUNT=&Odebrat účet
@@ -452,29 +436,20 @@ service.gui.REVOKE_ADMIN=Zrušit práva admina
 service.gui.REVOKE_MODERATOR=Odejmout moderování
 service.gui.REVOKE_MEMBERSHIP=Zrušit členství
 service.gui.REVOKE_VOICE=Odebrat hlas
-service.gui.ROOT_GROUP=Hlavní skupina (Root group)
 service.gui.SAVE=&Uložit
-service.gui.SAVE_AS_DEFAULT=Uložit jako výchozí
 service.gui.SEARCH=&Hledat
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Pro zobrazení všech místností na vybraném serveru klikněte na tlačítko. Pak vyberte místnost ke které se chcete připojit a klikněte na Připojit.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Hledaný kontakt
 service.gui.SECURITY=Zabezpečení
-service.gui.SELECT_ACCOUNT=Vybrat účet
 service.gui.SELECT_COLOR=Volba barvy
 service.gui.SELECT_GROUP=Vybrat skupinu
-service.gui.SELECT_GROUP_WIZARD_MSG=seznam níže obsahuje všechny skupiny vašeho seznamu kontaktú. Vyberte skupinu do které chcete přidat kontakt.
 service.gui.SELECT_NO_GROUP=Žádná skupina
-service.gui.SELECT_GROUP_WIZARD=Zadejte skupinu
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Seznam níže obsahuje všechny účty které podporují víceuživatelský chat. Vyberte účet který chcete použít pro vytvoření chatovací místnosti.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Seznam níže obsahuje všechny registrované účty. Vyberte účet který chcete použít pro komunikaci s novým kontaktem.
-service.gui.SELECT_PROVIDERS_WIZARD=Výběr účtu
 service.gui.SELECT_VIDEO_CONFERENCE=Zvolte video hovor
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Vyberte chatovací místnost ze seznamu a klikněte na tlačítko OK pro přidání.
 service.gui.SEND=&Odeslat
 service.gui.SEND_FILE=Odeslat &soubor
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=K tomuto kontaktu neexistují žádné informace.
 service.gui.SEND_MESSAGE=&Odeslat zprávu
-service.gui.SEND_AS_SMS=Odeslat jako SMS
 service.gui.SEND_PRIVATE_MESSAGE=Odeslat soukromou zprávu
 service.gui.SEND_SMS=O&deslat SMS
 service.gui.SEND_SMS_DETAILS=Nezapomeňte, že musíte zadat číslo v mezinárodním formátu t.j. začínající na +420 v Česku a +421 na Slovensku - např. +420777000000
@@ -482,6 +457,7 @@ service.gui.SEND_SMS_NOT_SUPPORTED=Zvolený protokol nepodporuje SMS zprávy.
 service.gui.SMS=SMS
 service.gui.SEND_VIA=Odeslat přes
 service.gui.SENT=odesláno
+service.gui.SERVER_CHAT_ROOMS=Serverové chatovací místnosti
 service.gui.SET_GLOBAL_STATUS=Nastavit globální stav
 service.gui.SET_STATUS_MESSAGE=Nastavit stavovou zprávu
 service.gui.SET_SUBJECT=Nastavit předmět
@@ -512,7 +488,6 @@ service.gui.STREET=Ulice
 service.gui.SUBJECT=Předmět
 service.gui.SUMMARY=Základní
 service.gui.TELEPHONY=Telefonování
-service.gui.TODAY=Dnes
 service.gui.TOOLS=&Nástroje
 service.gui.TRANSFER=&Přenos
 service.gui.TO=&Komu:
@@ -522,7 +497,6 @@ service.gui.TRANSFER_CALL_TO=Kam přenést:
 service.gui.TRANSPARENCY_NOT_ENABLED=Vaše současná konfigurace nepodporuje průhlednost.
 service.gui.TYPE_YOUR_REQUEST=Zadejte váš požadavek
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Kvalita videa tohoto hovoru nemůže být změněna.
-service.gui.UNMUTE=Zapnout zvuk
 service.gui.USER_IDENTIFIER=Uživatelská identifikace:
 service.gui.USER_EXISTS_ERROR=Tento uživatel již existuje ve zvolené síti. Vyberte prosím vyberte jiného uživatele nebo síť.
 service.gui.USERNAME_NULL=Prosím zadejte jméno a heslo.
@@ -535,7 +509,6 @@ service.gui.USE_PROVISIONING=Použít online autokonfiguraci
 service.gui.VALUE=Hodnota
 service.gui.VIDEO_CALL=Videohovor
 service.gui.VIA=přes
-service.gui.VIA_SMS=Přes SMS
 service.gui.VIEW=&Prohlížet (View)
 service.gui.VIEW_HISTORY=Zobrazit &historii
 service.gui.VIEW_SMILEYS=Prohlížet &smajlíky
@@ -555,9 +528,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Nastavení hlasitosti
 service.gui.WAITING_AUTHORIZATION=Čeká se na autorizaci
 service.gui.WARNING=Varování
 service.gui.YES=Ano
-service.gui.YESTERDAY=Včera
-service.gui.EXISTING_ACCOUNT_ERROR=Účet který jste zadali již existuje.
-service.gui.NEW_MAIL=<b>Máte novou poštu!</b><br/><b>Od:</b> {0} {1} <br/><b>Subject:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Máte novou poštu ve vaší <a href="{1}">schránce</a> {0}:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Máte {2} nových mailových zpráv ve vaší <a href="{1}">schránce</a> {0}:<br/>
 service.gui.NEW_GMAIL_FOOTER=jedna nebo více nepřečtených konverzací ve vaší <a href="{0}">schránce</a>.<br/>
@@ -580,7 +550,6 @@ service.gui.SECURITY_ERROR=Chyba zabezpečení
 service.gui.SPEED=Rychlost:
 service.gui.SILENT_MEMBER=tichý společník
 service.gui.NON_SECURE_CONNECTION=Pro účet {0} není možné vytvořit bezpečné připojení. Pokud se chceš připojit k nezabezpečenému serveru, prosím odklikni "Povolit nezabezpečené připojení" v nastavení účtu
-service.gui.UPDATE=Aktualizovat
 service.gui.MOBILE_PHONE=Mobil
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Práce
@@ -588,6 +557,7 @@ service.gui.PHONE=Telefonní číslo
 service.gui.PHONES=Telefony
 service.gui.EDIT_NOT_SUPPORTED=Upravování tohoto účtu není podporováno
 service.gui.SHOW_PREVIEW=(Zobrazit náhled)
+service.gui.SHOW_PREVIEW_DIALOG_TITLE=Zobrazit náhled obrázku / videa
 
 service.gui.ZID_NAME_SET=Identifikátor jména ZRTP:
 service.gui.ZID_NAME_NOT_SET=Identifikátor jména ZRTP není nastaven.
@@ -613,7 +583,6 @@ service.gui.callinfo.CALL_INFORMATION=Informace o hovoru
 service.gui.callinfo.CALL_IDENTITY=Identita
 service.gui.callinfo.PEER_COUNT=Počet účastníků
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Téma rozhovoru
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Šifrování zapnuto
 service.gui.callinfo.CALL_TRANSPORT=Signalizace průběhu hovoru
 service.gui.callinfo.CALL_DURATION=Doba hovoru
 service.gui.callinfo.VIEW_CERTIFICATE=Zobrazit certifikát
@@ -634,10 +603,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Klíčový protokol o výměně
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE kandidát rozšířeného typu
 service.gui.callinfo.ICE_STATE=ICE Zpracování Stavu
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Shromáždění kandidáti
 service.gui.callinfo.ICE_STATE.RUNNING=Ověření připojení
 service.gui.callinfo.ICE_STATE.COMPLETED=Hotovo
 service.gui.callinfo.ICE_STATE.FAILED=Selhalo
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Lokální IP hostitele / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Místní reflexivní IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Místní "relayed" IP / Port
@@ -658,9 +630,10 @@ service.gui.ALWAYS_TRUST=Přijmout certifikát trvale
 service.gui.CERT_DIALOG_TITLE=Ověřit certifikát
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} nemůže ověřit identitu serveru při připojování k<br><b>{1}</b>.<br><br>Certifikát serveru není podepsán důvěryhodnou autoritou, identita serveru proto nemůže být automaticky ověřena. <br><br> Chcete pokračovat v připojování?<br>Pro více informací klikněte na "Zobrazit certifikát".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} nemůže ověřit certifikát serveru.<br><br>Certifikát není podepsán důvěryhodnou autoritou, identita serveru proto nemůže být automaticky ověřena. <br><br> Chcete pokračovat v připojování?<br>Pro více informací klikněte na "Zobrazit certifikát".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} nemůže ověřit identitu připojovaného klienta.<br><br>Certifikát není podepsán důvěryhodnou autoritou, identita klienta proto nemůže být<br> automaticky ověřena. Chcete pokračovat v připojování?<br><br>Pro více informací klikněte na "Zobrazit certifikát".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} nemůže ověřit identitu uživatele <b>{1}</b>.<br><br> Certifikát není podepsán důvěryhodnou autoritou, identita uživatele proto nemůže být automaticky ověřena.<br><br> Chcete pokračovat v připojování?<br><br> Pro více informací, klikněte na "Zobrazit certifikát".</html>
 service.gui.CONTINUE_ANYWAY=Přesto pokračovat
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Jméno nositele:
 service.gui.CERT_INFO_O=Organizace:
 service.gui.CERT_INFO_C=Země:
@@ -669,17 +642,16 @@ service.gui.CERT_INFO_L=Lokalita:
 service.gui.CERT_INFO_OU=Organizační jednotka
 service.gui.CERT_INFO_ISSUED_ON=Vydán dne:
 service.gui.CERT_INFO_EXPIRES_ON=Expiruje dne:
+service.gui.CERT_INFO_FINGERPRINTS=Otisk
 service.gui.CERT_INFO_SER_NUM=Seriové číslo:
 service.gui.CERT_INFO_VER=Verze:
 service.gui.CERT_INFO_SIGN_ALG=Algorytmus podpisu:
 service.gui.CERT_INFO_ALG=Algorytmus:
 service.gui.CERT_INFO_PUB_KEY=Veřejný klíč:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytů: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bitů
 service.gui.CERT_INFO_EXP=Exponent:
 service.gui.CERT_INFO_KEY_SIZE=Velikost klíče
 service.gui.CERT_INFO_SIGN=Podpis:
-service.gui.CONTINUE=Pokračovat
 service.gui.SHOW_CERT=Zobrazit certifikát
 service.gui.HIDE_CERT=Skrýt certifikát
 
@@ -702,11 +674,9 @@ service.gui.security.SECURE_AUDIO=Zabezpečený zvuk
 service.gui.security.AUDIO_NOT_SECURED=Nezabezpečený zvuk
 service.gui.security.SECURE_VIDEO=Zabezpečené video
 service.gui.security.VIDEO_NOT_SECURED=Nezabezpečené video
-service.gui.security.NO_VIDEO=Bez videa
-service.gui.security.CIPHER=Šifra: {0}
+service.gui.security.CALL_SECURED_TOOLTIP=Hovor je zabezpečen. Pro více informací klikni zde.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Nezabezpečený hovor.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Pro sdílení bezpečnostního kódu se svým protějškem, klikni zde.
-service.gui.security.COMPARE_WITH_PARTNER=Prověřte s údaji od partnera a pak klikněte na "zámek" pro potvrzení.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Porovnání s partnerem:
 service.gui.security.STRING_COMPARED=Řetězce porovnány!
@@ -724,19 +694,13 @@ service.gui.avatar.imagepicker.CLICK=Klik a úsměv
 service.gui.avatar.imagepicker.IMAGE_FILES=Soubor s obrázkem
 service.gui.avatar.imagepicker.IMAGE_PICKER=Obrázek
 service.gui.avatar.imagepicker.IMAGE_SIZE=Velikost obrázku
-service.gui.avatar.imagepicker.INITIALIZING=Inicializuji
 service.gui.avatar.imagepicker.RESET=Resetovat
 service.gui.avatar.imagepicker.SET=Nastavení
 service.gui.avatar.imagepicker.TAKE_PHOTO=Vyfotit
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Chyba webkamery
 
 service.gui.security.encryption.required=Je nutné šifrování!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Chyba SIP v seznamu kontaktů
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Nezle přečíst zdroj {0}. Pro {1}
@@ -759,9 +723,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=výběr sítě
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=LDAP
 impl.ldap.GENERAL=Obecné
-impl.ldap.NEW=Nový
 impl.ldap.EDIT=upravit
-impl.ldap.REMOVE=Odstranit
 impl.ldap.ENABLED=Povoleno
 impl.ldap.SERVER_NAME=Název připojení
 impl.ldap.SERVER_NAME_EXAMPLE=Můj LDAP server
@@ -794,6 +756,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=Pevná Linka
 impl.ldap.PHONE_PREFIX=Prefix telefonů
 impl.ldap.PHONE_PREFIX_EXAMPLE=Např. 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Adresář
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Povolit prohledávání v adresáři Mac OS X
@@ -804,9 +770,7 @@ plugin.addrbook.PREFIX_EXAMPLE=Např.: 00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google kontakty
-impl.googlecontacts.NEW=Nový
 impl.googlecontacts.EDIT=upravit
-impl.googlecontacts.REMOVE=Odebrat
 impl.googlecontacts.ENABLED=Povoleno
 impl.googlecontacts.ACCOUNT_NAME=Název účtu
 impl.googlecontacts.SAVE=Uložit
@@ -845,13 +809,11 @@ plugin.accountinfo.ORGANIZATION=Organizace:
 plugin.accountinfo.JOB_TITLE=Pracovní zařazení:
 plugin.accountinfo.ABOUT_ME=O mě:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Obrázek
 plugin.accountinfo.GLOBAL_ICON=Použít obrázek účtu
 plugin.accountinfo.LOCAL_ICON=Použít tuto ikonu:
-plugin.accountinfo.CHANGE=Změnit
-plugin.accountinfo.ONLY_MESSAGE=Pouze zprávy
 
 # connection info
+plugin.connectioninfo.TITLE=Informace o spojení
 
 # contact info
 plugin.contactinfo.TITLE=Detaily kontaktu
@@ -868,49 +830,12 @@ plugin.aimaccregwizz.USERNAME=Jméno obrazovky AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Jméno obrazovky a heslo
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Zaregistrovat nový účet
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Pokud nemáte založen AIM účet, klikněte na toto tlačítko a účet založte.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Změnit výchozí nastavení serveru
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=O {0}
 plugin.branding.LOGO_MESSAGE=Open Source VoIP a Rýchle správy
-plugin.branding.LOADING=Načítám
 plugin.branding.ABOUT_MENU_ENTRY=&O programu
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} je nyní intenzívně vyvíjen. Verze kterou máte spuštěnu je experimentální a NEMUSÍ PRACOVAT podle očekávání. Pro další informace prosím prohlédněte {2}.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Všechna práva vyhrazena. Více na <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>The <b>Jitsi</b> je šířen pod LGPL licencí (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Slovníky
-plugin.dictaccregwizz.ANY_DICTIONARY=Libovolný slovník
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Libovolný slovník z {0}
-plugin.dictaccregwizz.FIRST_MATCH=První výskyt
-plugin.dictaccregwizz.NO_MATCH=Nenalezeno
-plugin.dictaccregwizz.MATCH_RESULT=Definice "{0}" nebyla nalezena, neměli jste na mysli:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Slovník "{0}" již na serveru neexistuje.
-plugin.dictaccregwizz.INVALID_STRATEGY=Současná strategie není na serveru dostupná.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Protokol služby
-plugin.dictaccregwizz.HOST=Hostitel
-plugin.dictaccregwizz.SERVER_INFO=Informace serveru
-plugin.dictaccregwizz.STRATEGY_SELECTION=Výběr strategie
-plugin.dictaccregwizz.STRATEGY_LIST=Seznam strategií:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Hledat strategii
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategie, díky rozdílnému přístupu, hledají podobná slova, pokud není nalezen přesný překlad. Například Prefix strategie bude hledatslova která začínají stejně jako slovo překládané.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informace o Dict účtu
-plugin.dictaccregwizz.FIRST_ACCOUNT=Průvodce vytvoří váš první Dict účet na dict.org.\n\nPřechodem na "Průvodce registrací účtu" můžete přidat nový slovník. Do pole "host" vyplňte slovník, který chcete přidat.
-plugin.dictaccregwizz.THREAD_CONNECT=Pokouším se připojit k serveru
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Pokus o spojení selhal, toto není Dict server nebo je offline
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Zjišťuji dostupné strategie
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Na serveru nebyla nalezena žádná strategie
-plugin.dictaccregwizz.POPULATE_LIST=Zveřejňuji seznam
-plugin.dictaccregwizz.CLOSING_CONNECTION=Zavírám spojení
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Pokud se chcete připojit  k chatu na Facebook, musíte vytvořit/zadat "Uživatelské jméno" <br> na stránce  "Účet", "Nastavení účtu" na Facebooku.</a><br><br>Poznámka: Po zadání uživatelského jména  se musíte odhlásit z webovské stránky. <br>and Může to nějakou dobu trvat, než se budete moci přihlísit pod nuvým uživatelským jménem!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Protokol chatu Facebooku
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Jméno uživatele:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Jméno uživatele a heslo
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Automaticky spouštět {0} při spuštění PC
@@ -921,9 +846,6 @@ plugin.generalconfig.SHOW_HISTORY=Zobrazit
 plugin.generalconfig.HISTORY_SIZE=posledních zpráv u nových konverzací
 plugin.generalconfig.SEND_MESSAGES_WITH=Odesílat zprávy pomocí stisku:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Přenést okno do popředí
-plugin.generalconfig.ERROR_PERMISSION=Nemáte oprávnění zakázat automatické spouštění
-plugin.generalconfig.TRANSPARENCY=Průhlednost
-plugin.generalconfig.ENABLE_TRANSPARENCY=Povolit průhlednost
 plugin.generalconfig.DEFAULT_LANGUAGE=Jazyk uživatelského rozhraní
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Změny se projeví po restartu aplikace.
 plugin.generalconfig.SIP_CLIENT_PORT=Port SIP klienta
@@ -937,6 +859,7 @@ plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Odstranit speciální znaky p�
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Převést písmena na čísla
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=např. +420 800 VOLANI -> +420 800 865264
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Vzorkovací frekvence:
 plugin.generalconfig.OPUS_BITRATE=Průměrný datový tok enkodéru (v kbs):
@@ -968,19 +891,21 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Zaregistrovat nový účet
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC protocol.
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN a heslo
+plugin.ircaccregwizz.USERNAME=Přezdívka
 plugin.ircaccregwizz.INFO_PASSWORD=Většina IRC serverů nevyžaduje heslo.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=Automaticky změnit přezdívku, pokud je již použita
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Použít výchozí port
 plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=Moje přezdívka nevyžaduje identifikaci
 plugin.ircaccregwizz.HOST=Jméno serveru:
 plugin.ircaccregwizz.IRC_SERVER=Server
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} autorizace
+plugin.ircaccregwizz.SASL_USERNAME=Uživatelské Jméno
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Protokol XMPP
 plugin.jabberaccregwizz.USERNAME=Uživatelské jméno pro XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Heslo pro kontrolu
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID a heslo
 plugin.jabberaccregwizz.CSERVER=Server
 plugin.jabberaccregwizz.SERVER=Připojit server
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Povolit udržování sppojení
@@ -996,13 +921,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Poznámka
 plugin.jabberaccregwizz.RESOURCE=Zdroj
 plugin.jabberaccregwizz.AUTORESOURCE=Automaticky vygenerované prostředky
 plugin.jabberaccregwizz.PRIORITY=Priorita
-plugin.jabberaccregwizz.XMPP_ERROR=Chyba XMPP protokolu
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Neznámá chyba v XMPP ({0}). Ověřte jestli jste zadali správné jméno serveru.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Hesla se neshodují.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Změnit výchozí nastavení serveru
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Pokročilé možnosti
 plugin.jabberaccregwizz.USE_ICE=Použít ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Použít technologii Google Jingle/ICE (Experimentální)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Automaticky nalézt  STUN/TURN servery
 plugin.jabberaccregwizz.SUPPORT_TURN=Podpora TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Zvolte si uživatelské jméno
@@ -1029,11 +950,8 @@ plugin.jabberaccregwizz.ALLOW_NON_SECURE=Povolit nezabezpečené připojení
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Automatický výběr mezi RTP a Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Volby serveru
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Změnit heslo účtu
-plugin.jabberaccregwizz.NEW_PASSWORD=Nové heslo
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Potvrzení hesla
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Vyplňte prosím správné číslo portu, aby jste mohl pokračovat.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Účet musí být přihlášen, před změnou hesla.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Není vyplněno heslo.
 plugin.jabberaccregwizz.TLS_REQUIRED=Připojení nepoužívá protokol TLS, proto nelze změnit vaše heslo.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Heslo bylo úspěšně změněno
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Váš XMPP server nepodporuje změnu vašeho hesla.
@@ -1047,25 +965,9 @@ plugin.jabberaccregwizz.RESET=Vymazat
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Obnovit globální nastavení
 plugin.jabberaccregwizz.DISABLE_JINGLE=Vypnout Jingle (hovory a video hovory s XMPP protokolem).
 
-# mailbox
-plugin.mailbox.OUTGOING=Odchozí zprávy:
-plugin.mailbox.INCOMING=Příchozí zprávy:
-plugin.mailbox.WAIT_TIME=Počkejte dokud nebude volání přesměrováno na hlasovou poštu
-plugin.mailbox.MAX_MESSAGE_TIME=Maximální doba trvání příchozí zprávy
-plugin.mailbox.CONFIRM=Potvrdit
-plugin.mailbox.DEFAULTS=Výchozí nastavení
-plugin.mailbox.MAILBOX=Poštovní schránka
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Protokol pro připojení ke službě MSN.
-plugin.msnaccregwizz.USERNAME=Email:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID a heslo
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Instalovat
 plugin.pluginmanager.UNINSTALL=Odinstalovat
-plugin.pluginmanager.UPDATE=Aktualizovat
 plugin.pluginmanager.PLUGINS=Zásuvné moduly
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.CHOOSE_FILE=Výběr souboru
@@ -1090,7 +992,6 @@ plugin.sipaccregwizz.SERVER_PORT=Port na serveru
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxy port
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Preferovaný transport
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Pokročilé možnosti
 plugin.sipaccregwizz.PROXY_OPTIONS=Nastavení proxy
 plugin.sipaccregwizz.PROXY_AUTO=Automatická konfigurace proxy serveru
 plugin.sipaccregwizz.ENABLE_PRESENCE=Povolit přítomnost (SIMPLE)
@@ -1110,8 +1011,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Automaticky: Zvolí automaticky mezi RTP a Inband
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP informace
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Změnit defaultní nastavení serveru
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Povolit podporu šifrovaného spojení
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Uveďte podporu ZRTP v protokolu zabezpečení
 plugin.sipaccregwizz.AUTH_NAME=Jméno pro autorizaci
@@ -1132,10 +1031,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=URI pro kontrolu hlasové schránky
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Hesla se neshodují.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none>(Použít běžné ověření.)
 plugin.sipaccregwizz.SAVP_OPTION=Indikace RTP / SVAP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Vypnout (pouze indikace RTP/AVP) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Povinné (nabídnout a přijmout jen RTP / SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Volitelně (první nabídnout RTP / SAVP, pak RTP / AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Povolit S-Descriptor (znám taky jako SDES nebo SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Zvolte povolené šifrování protokolů a jejich priority (horní protokol jako první):
 plugin.sipaccregwizz.CIPHER_SUITES=Povolené šifrování:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} se automaticky pokusí zabezpečit všechny své hovory pomocí ZRTP a oba uvidíte a uslyšíte oznámení jen jednou, že zabezpečené spojení bylo navázáno. Pokud jste si dobře vědomi toho, co děláte mohli byste změnit upřesňující nastavení níže.</div></html>
@@ -1149,15 +1048,6 @@ plugin.skinmanager.DEFAULT_SKIN=Výchozí skin
 plugin.skinmanager.ADD_NEW_SKIN=Přidat nový skin
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Výchozí skin aplikace
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Protokol k připojení vzdáleného počítače přes SSH.
-plugin.sshaccregwizz.USERNAME=ID účtu:
-plugin.sshaccregwizz.IDENTITY_FILE=Soubor s indentitou:
-plugin.sshaccregwizz.KNOWN_HOSTS=Známí hosté:
-plugin.sshaccregwizz.OPTIONAL=Volitelné
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Detaily účtu
-
 # status update
 plugin.autoaway.AUTO_STATUS=Automaticky pryč
 plugin.autoaway.ENABLE_CHANGE_STATUS=Nastavit stav při nepřítomnosti
@@ -1204,22 +1094,6 @@ plugin.whiteboard.DESELECT=Odznačit
 plugin.whiteboard.DELETE=Smazat
 plugin.whiteboard.PROPERTIES=Vlastnosti
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Protokol pro připojení ke službě Yahoo!.
-plugin.yahooaccregwizz.USERNAME=Jméno uživatele:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID a heslo
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Protokol služby Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Jméno:
-plugin.zeroaccregwizz.LAST_NAME=Příjmení:
-plugin.zeroaccregwizz.EMAIL=Email:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Zapamatovat si Bonjour kontakty?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID a heslo
-plugin.zeroaccregwizz.USERID=ID uživatele
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Protokol služby Google Talk
@@ -1233,19 +1107,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, portál o IP telefonii
 plugin.iptelaccregwizz.USERNAME=Jméno uživatele
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Zaregistrovat na iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP a Chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Uživatelské jméno
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Opakování hesla
 plugin.sip2sipaccregwizz.EMAIL=E-mailová adresa
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Pro nápovědu k této službě prosím navštivte <br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>e-mailová adresa pro odeslání hlasové zprávy, <br>informacím o nepřijatých voláních a pro obnovení zapomenutého hesla</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Pro nápovědu k této službě navštivte prosím  <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Existující "sip2sip.info" účet
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Vytvořit nový volný účet na "sip2sip.info"
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP a Rychlé zprávy
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Pro nápovědu k této službě prosím navštivte stránky:<br>http://www.ippi.com/
@@ -1254,6 +1120,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Existující IPPI účet
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Vytvořit zdarma nový IPPI účet
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Zavřít okno chatu
 plugin.keybindings.CHAT_COPY=Kopírovat
 plugin.keybindings.CHAT_CUT=Vyjmout
@@ -1276,15 +1143,16 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Akce
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primární zkratka
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Sekundární zkratka
 plugin.keybindings.globalchooser.PRESS_BTN=Stiskněte pro nastavení zkratky
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Čeká se
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Funkce Push to talk
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Povolit speciální detekci klávesy
 plugin.keybindings.PLUGIN_NAME=Klávesové zkratky
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Konverzace
 plugin.keybindings.MAIN=Hlavní
 plugin.keybindings.GLOBAL=Globální zkratky
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=Povolit
 plugin.notificationconfig.DESCRIPTION=Popis
 plugin.notificationconfig.TURN_ON_ALL=Všechno zapnout
 plugin.notificationconfig.TURN_OFF_ALL=Všechno vypnout
@@ -1306,6 +1174,7 @@ plugin.notificationconfig.tableheader.SOUND=Přehrát zvuk na výstupu pro notif
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Přehrát zvuk
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Přehrát zvuk na PC speakeru
 plugin.notificationconfig.tableheader.DESCRIPTION=Popis akce
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Příchozí hovor
 plugin.notificationconfig.event.SecurityMessage=Bezpečnostní zpráva
 plugin.notificationconfig.event.IncomingFile=Příchozí soubor
@@ -1407,6 +1276,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Pravidelné vnitřní načítání
 impl.neomedia.configform.H264.defaultProfile=Výchozí profil pro kódování do:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Základní osnova
 impl.neomedia.configform.H264.defaultProfile.high=Vysoká kvalita
 impl.neomedia.configform.H264.defaultProfile.main=Hlavní
@@ -1437,7 +1307,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Současné heslo:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Zadejte nové heslo:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Znovu zadejte heslo:
 plugin.securityconfig.masterpassword.MP_TITLE=Hlavní heslo
-plugin.securityconfig.masterpassword.MP_NOT_SET=(není nastaveno)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Nezadali jste správné (a platné) hlavní heslo. Zkuste to prosím znovu.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Hlavní heslo není správné!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Změna hesla se nezdařila
@@ -1453,7 +1322,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Heslo
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(neznámý)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(nelze dešifrovat)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Uložená hesla
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Odebrat
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Odebrat vše
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Opravdu si přejete odebrat všechna hesla?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Odebrání všech hesel
@@ -1466,6 +1334,7 @@ plugin.securityconfig.masterpassword.MP_INPUT=Prosím zadejte hlavní heslo:\n\n
 plugin.otr.menu.TITLE=Zabezpečený chat
 plugin.otr.menu.START_OTR=Zahájit soukromou komunikaci
 plugin.otr.menu.END_OTR=Ukončit soukromou komunikaci
+plugin.otr.menu.VERIFIED=Vaše soukromá konverzace je ověřena
 plugin.otr.menu.LOADING_OTR=Zahajuje se soukromá konverzace...
 plugin.otr.menu.TIMED_OUT=Čas pro zahájení konverzace vypršel.
 plugin.otr.menu.REFRESH_OTR=Občerstvit soukromou kominukaci
@@ -1519,7 +1388,6 @@ plugin.globalproxy.PROXY_PORT=Proxy port
 plugin.globalproxy.PROXY_USERNAME=Uživatelské jméno pro proxy
 plugin.globalproxy.PROXY_PASSWORD=Heslo pro proxy
 plugin.globalproxy.DESCRIPTION={0} bude používat toto nastavení proxy pro veškerá nová nebo obnovená spojení. \nPodpora proxy je experimentální a nemusí pracovat správně se všemi protokoly. Pro více detailů srovnejte s tabulkou níže.
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Autorizace </td><td> HTTP </td><td> HTTP+Autorizace </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Také proxy DNS
 plugin.globalproxy.FWD_DNS_NOTE=Použitelné u Tor. Pomáhá se vyhnout DNS netěsnostem při přesměrovávaní veškerého provozu DNS na Tor proxy. Vyžaduje restart.
@@ -1536,6 +1404,8 @@ plugin.reconnectplugin.NETWORK_DOWN=Síťové spojení bylo ztraceno!
 plugin.chatconfig.TITLE=Konverzace
 plugin.chatconfig.replacement.TITLE=Obrázek/Video
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Povolit v chatu smajlíky
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=Povolit výměnu obrázku/videa
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Povolit
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Zdroje:
 plugin.chatconfig.spellcheck.TITLE=Kontrola pravopisu
 
@@ -1552,7 +1422,6 @@ plugin.provisioning.RESTART_WARNING=Upozorňujeme, že změny se projeví až p�
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Kopírovat UUID do schránky
 plugin.provisioning.CLIPBOARD_FAILED=Kopírování UUID do schránky selhalo
-plugin.provisioning.EXIT_ON_FAIL=Vypnout aplikaci v případě chyby autokonfigurace
 plugin.provisioning.CREDENTIALS=Uložené přihlašovací údaje
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Skutečně si přejete z nastavení autokonfigurace vymazat uložené heslo?
 plugin.provisioning.PROV_FAILED=Autokonfigurace selhala
@@ -1619,8 +1488,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} se pokusil připojit k server
 #plugin spellcheck
 plugin.spellcheck.TITLE=Kontrola překlepů a gramatiky
 plugin.spellcheck.MENU=Zobrazit kontrolu pravopisu a gramatiky
-plugin.spellcheck.LANG=Jazyk
-plugin.spellcheck.EDIT_PERSONAL_DICT=Upravit
 plugin.spellcheck.ENABLE_SPELL_CHECK=Aktivovat kontrolu pravopisu
 plugin.spellcheck.dialog.FIND=Najít další
 plugin.spellcheck.dialog.REPLACE=Nahradit   
diff --git a/resources/languages/resources_de.properties b/resources/languages/resources_de.properties
index 362936e..afdc21b 100644
--- a/resources/languages/resources_de.properties
+++ b/resources/languages/resources_de.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Ich
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Kontoassistent
 service.gui.ACCOUNTS=Konten
 service.gui.ADD=&Hinzufügen
-service.gui.ADD_ACCOUNT=Konto hinzufügen
 service.gui.ADD_CONTACT=&Kontakt hinzufügen
 service.gui.ADD_AUTHORIZED_CONTACT={0} zu den Kontakten hinzufügen
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Kontakt zur Kontaktliste hinzufügen
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Fehler: Kontakt kann nicht hinzugefügt werd
 service.gui.ADD_CONTACT_EXIST_ERROR=Der Kontakt {0} existiert bereits.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Der Server reagierte nicht auf die Anfrage den Kontakt {0} hinzuzufügen.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Kontakt {0} konnte nicht hinzugefügt werden. Vorgang wird nicht unterstützt.
-service.gui.ADD_CONTACT_IDENTIFIER=Bitte geben Sie im folgenden Feld den Benutzernamen des hinzuzufügenden Kontakts ein.
-service.gui.ADD_CONTACT_WIZARD=Kontakt hinzufügen
 service.gui.ADD_CONTACT_NOT_CONNECTED=Sie müssen angemeldet sein, um einen Kontakt hinzufügen zu können. Bitte melden Sie sich beim gewählten Anbieter an und versuchen Sie es erneut.
 service.gui.ADD_GROUP_LOCAL_ERROR=Die Gruppe {0} kann nicht hinzugefügt werden. Das Problem ist bei einer lokalen Lese-/Schreiboperation aufgetreten.
 service.gui.ADD_GROUP_EXIST_ERROR=Die Gruppe {0} existiert bereits in Ihrer Kontaktliste. Bitte wählen Sie einen anderen Namen.
 service.gui.ADD_GROUP_NET_ERROR=Die Gruppe {0} kann nicht hinzugefügt werden. Überprüfen Sie Ihre Netzwerkverbindung und versuchen Sie es erneut.
 service.gui.ADD_GROUP_ERROR=Die Gruppe {0} kann nicht hinzugefügt werden.
 service.gui.ADD_GROUP_EMPTY_NAME=Der Gruppenname muss angegeben werden.
-service.gui.ADD_GROUP=Gruppe erstellen
-service.gui.ADD_SUBCONTACT=&Unterkontakt hinzufügen
 service.gui.ADDRESS=Adresse
 service.gui.ADMINISTRATOR=Administrator
 service.gui.ADVANCED=Erweitert
-service.gui.ALL=&Alle
 service.gui.ALL_CONTACTS=&Alle Kontakte
 service.gui.ALTERNATE_ADDRESS=Alternative Adresse
 service.gui.APPLY=&Anwenden
@@ -65,7 +70,6 @@ service.gui.AT=Wann
 service.gui.AUTHORIZE=&Autorisieren
 service.gui.AUTHORIZATION_ACCEPTED={0} hat die Autorisierungsanfrage akzeptiert.
 service.gui.AUTHENTICATION_FAILED=Anmeldung für {0} fehlgeschlagen. Die eingegebenen Anmeldedaten sind falsch.
-service.gui.AUTHENTICATION_REQUESTED=Anmeldung erforderlich
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Der {0} Server benötigt Ihre Zugangsdaten.
 service.gui.AUTHENTICATION_REJECTED={0} hat die Autorisierungsanfrage zurückgewiesen.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} Authentifizierung
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Im nachstehenden Feld können Sie Ihren neuen
 service.gui.CHANGE_NICKNAME_ERROR=Fehler beim Ändern des Nicknamens
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nickname existiert bereits
 service.gui.CHANGE_VIDEO_QUALITY=Videoqualität ändern
-service.gui.CHAT_CONFERENCE_LABEL=Konferenzen
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Konferenz von {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Sie sind bereits Mitglied des Chatraums {0}.
 service.gui.CHAT_ROOM_CONFIGURATION={0} Chatraum konfigurieren
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=hat den Chatraum verlassen {0}
 service.gui.CHAT_ROOM_USER_KICKED=ist von {0} hinausgeschmissen worden
 service.gui.CHAT_ROOM_USER_QUIT=hat {0} beendet
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Nachrichtenversand ist verboten (Stimme gesperrt)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Speichert den Chatraum für künftige Verwendungen
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Entfernt den markierten Chatraum von der Liste der gespeicherten Chaträume
 service.gui.CHAT_ROOM_NAME=Name des Chatraums
 service.gui.CLEAR_CUSTOM_MESSAGES=Benutzerdefinierte Nachrichten löschen
 service.gui.ROOM_NAME=Chatraum
-service.gui.AUTOJOIN=Automatisches beitreten
 service.gui.CHANGE_PASSWORD=Passwort ändern
 service.gui.CHAT_ROOM_NAME_INFO=Geben Sie im folgenden Feld den Namen des Chatraums ein, den Sie erstellen wollen.
 service.gui.CHAT_ROOM_NOT_EXIST=Der Chatraum {0} ist dem Server {1} unbekannt. Bitte überprüfen Sie den Namen des Chatraums.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Sie müssen angemeldet sein, um dem Chatraum {0} beitreten zu können.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Sie müssen verbunden sein, um einen Chatraum zu verlassen.
-service.gui.CHAT_ROOM_NOT_JOINED=Sie müssen dem Chatraum beigetreten sein, bevor Sie weitere Aktionen ausführen können.
 service.gui.CHAT_ROOM_OPTIONS=Chatraum-Einstellungen
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Der Chatraum {0} erfordert eine Registrierung um beizutreten.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Der Chatraum {0} benötigt ein Passwort.
@@ -157,16 +156,15 @@ service.gui.CONNECTING=Verbinde...
 service.gui.CONNECTING_STATUS=Verbinde
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Verbinde*
 service.gui.CONNECTION=Verbindung
-service.gui.CONNECTION_FAILED_MSG=Die Verbindung für {0} ({1}) ist fehlgeschlagen. Bitte überprüfen Sie Ihre Netzwerkverbindung oder kontaktieren Sie Ihren Netzwerkadministrator für weitere Informationen.
 service.gui.CONNECTION_EXPIRED_MSG=Sie sind nicht mit Server {0} verbunden.
 service.gui.CONTACT_NAME=ID oder Nummer
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Der gewählte {0} Kontakt unterstützt keine Telefonie.
+service.gui.CONTACT_NAME_PROMPT=irene.muster@example.com
+service.gui.CONTACT_NAME_INFO=Adresse für Chat-Dienst (z.B. lisa.mueller@example.com) oder VoIP-Nummer hinzufügen
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Der ausgewählte Kontakt {0} unterstützt die Gruppenkonferenz nicht.
 service.gui.CONTACT_PAUSED_TYPING={0} unterbricht das Schreiben
 service.gui.CONTACT_TYPING={0} schreibt eine Nachricht
 service.gui.CONTACT_TYPING_SEND_FAILED=Ups... wir konnten {0} die Schreibbenachrichtigung nicht senden
 service.gui.CONTACT_INFO=&Kontaktinformation
-service.gui.CONTACTLIST=Kontaktliste
 service.gui.CONTACTS=Kontakte
 service.gui.COPY=&Kopieren
 service.gui.COPY_LINK=&Link kopieren
@@ -176,28 +174,26 @@ service.gui.CREATE_CHAT_ROOM=&Chatraum erstellen...
 service.gui.CREATE_CHAT_ROOM_ERROR=Der Chatraum mit dem Namen {0} konnte nicht erstellt werden.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Assistent zum Erstellen eines Chatraums
 service.gui.CREATE_CONFERENCE_CALL=&Konferenz erstellen...
-service.gui.CREATE_CONFERENCE_CHAT=&Chatraum erstellen...
 service.gui.CREATE_GROUP=&Gruppe erstellen...
 service.gui.CREATE_GROUP_NAME=Bitte geben Sie im folgenden Feld den Namen der zu erstellenden Gruppe ein.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Ihre Kontaktliste enthält keine Gruppe. Bitte legen Sie zuerst eine Gruppe an (Datei/Gruppe erstellen).
 service.gui.CREATE_VIDEO_BRIDGE=&Videobrücke erstellen...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=&Videobrücke erstellen
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Videokonferenz erstellen/beitreten
 service.gui.CREATE_VIDEO_CONFERENCE=Videokonferenz erstellen
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Dieser Kontakt unterstützt keine Web-Informationen
 service.gui.CUT=&Ausschneiden
-service.gui.DATE=Datum
 service.gui.DELETE=Löschen
 service.gui.DENY=&Ablehnen
 service.gui.DESKTOP_SHARING_WARNING=<b>Soll die Bildschirmfreigabe wirklich eingeschaltet werden?</b><br>Die Freigabe zeigt den Bildschirm allen Teilnehmern dieses Anrufs.
 service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Ihr Bildschirm ist freigegeben
 service.gui.DIALPAD=Wähltastatur
 service.gui.DISPLAY_NAME=Anzeigename
+service.gui.DISPLAY_NAME_PROMPT=Lisa Mueller
+service.gui.DISPLAY_NAME_INFO=Name für diesen Kontakt. Ohne Angaben wird die Chat-Adresse oder VoIP-Nummer verwendet. (Optional)
 service.gui.DISCONNECTED_STATUS=Getrennt
 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.DOWNLOAD_NOW=Jetzt herunterla&den
 service.gui.DRAG_FOR_SHARING=Ziehe hier etwas hinein, das den anderen geschickt werden soll...
 service.gui.DURATION=Dauer
 service.gui.DESTROY_CHATROOM=Chatraum auflösen
@@ -218,7 +214,6 @@ service.gui.ERROR_RECEIVED_FROM=Fehler von {0} empfangen
 service.gui.ESTIMATED_TIME=Geschätzte Zeit:
 service.gui.EVENTS=Ereignisse
 service.gui.EXIT=&Verlassen
-service.gui.EXTENDED_CRITERIA=Erweiterte Kriterien
 service.gui.GENERAL=Allgemein
 service.gui.GENERAL_ERROR=Allgemeiner Fehler
 service.gui.GROUP_NAME=Gruppenname
@@ -260,7 +255,6 @@ service.gui.FONT_ITALIC=Kursiv
 service.gui.FONT_SIZE=Größe
 service.gui.FONT_STYLE=Stil
 service.gui.FONT_UNDERLINE=Unterstrichen
-service.gui.FROM={0} von {1}
 service.gui.GRANT_OWNERSHIP=Erlaube Eigentümer...
 service.gui.GRANT_ADMIN=Erlaube Administrator...
 service.gui.GRANT_MODERATOR=Erlaube Moderator
@@ -286,7 +280,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Sind Sie sicher, dass Sie alle lokal gesp
 service.gui.HISTORY_REMOVE_ERROR=Fehler beim Löschen der lokal gespeicherten Nachrichten.
 service.gui.HOME=Privat
 service.gui.HOME_PAGE=Homepage
-service.gui.HOUR=Stunde
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifikation
 service.gui.IGNORE=&Ignorieren
@@ -310,13 +303,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Kontakte zur Videobrücke einladen
 service.gui.INVITE_REASON=Grund der Einladung
 service.gui.IS_CALLING={0} ruft an...
 service.gui.IS_NOW={0} ist nun {1}
-service.gui.JITSI_WARNING=SIP Communicator wurde in Jitsi umbenannt<br/>. Wenn die Installation aktuell gehalten werden soll, laden Sie Jitsi bitte jetzt herunter.<br/><br/>Das Jitsi Entwickler-Team entschuldigt sich für die entstehenden Umstände.
-service.gui.JITSI_WARNING_TITLE=SIP Communicator wird zu Jitsi
 service.gui.JOIN=&Teilnehmen
 service.gui.JOIN_AS=T&eilnehmen als
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Videokonferenz beitreten
 service.gui.JOIN_VIDEO=Mit Video beitreten
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Schließen
 service.gui.JOB_TITLE=Beruf
 service.gui.JOIN_CHAT_ROOM=Chatraum bei&treten...
 service.gui.JOIN_CHAT_ROOM_TITLE=Chatraum beitreten
@@ -329,7 +319,6 @@ service.gui.KICK_FAILED=Rauswurf fehlgeschlagen
 service.gui.KICK_FAILED_GENERAL_ERROR=Rauswurf von {0} fehlgeschlagen. Der Server meldete einen allgemeinen Fehler.
 service.gui.KICK_FAILED_NOT_ALLOWED=Teilnehmer {0} kann nicht rausgeworfen werden. Der Eigentümer und der Administrator des Raums können nicht rausgeworfen werden.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Rauswurf von {0} gescheitert. Sie haben nicht die erforderlichen Rechte.
-service.gui.LAST=Letzter
 service.gui.LAST_NAME=Nachname
 service.gui.LEAVE=&Verlassen
 service.gui.LIMIT_REACHED_FOR_IP=Sie haben schon zu viele Verbindungen von Ihrer IP-Adresse und der Server {0} erlaubt keine weiteren.
@@ -349,7 +338,6 @@ service.gui.MESSAGE=Nachricht
 service.gui.MISSED_CALLS_TOOL_TIP=Verpasste Anrufe von:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= und {0} mehr
 service.gui.MODERATOR=Moderator
-service.gui.MORE=Mehr
 service.gui.MORE_LABEL=Mehr
 service.gui.MOVE=Verschieben
 service.gui.MOVE_SUBCONTACT=Kontakt &verschieben
@@ -358,7 +346,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Der Zielkontakt ist derselbe wie der Ausgangs
 service.gui.MOVE_SUBCONTACT_QUESTION=Sind Sie sicher, dass Sie {0} nach {1} verschieben wollen?
 service.gui.MOVE_TO_GROUP=&Verschiebe in Gruppe
 service.gui.MOVE_CONTACT=Verschiebe Kontakt
-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 verwendete Protokoll kann Nachrichten nur zustellen, wenn Benutzer angemeldet sind. Warten Sie bis {0} wieder angemeldet ist, oder verwenden Sie ein anderes Protokoll.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Ein internes Problem ist aufgetreten. Dies ist wahrscheinlich ein Programmfehler. Bitte melden Sie ihn unter https://jitsi.org/Development/BugsAndIssues.
@@ -372,7 +359,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Damit Sie Nachrichten senden können, m�
 service.gui.MULTIPLE_LOGINS=Sie haben mehrere Verbindungen zum selben Konto. Das Konto {0} auf Server {1} ist derzeit nicht verbunden.
 service.gui.MY_CHAT_ROOMS=Chatraum hinzufügen
 service.gui.MY_CHAT_ROOMS_TITLE=Chatraum hinzufügen
-service.gui.MUTE=Ton aus
 service.gui.MUTUALLY_ON_HOLD_STATUS=Gegenseitig gehalten
 service.gui.NAME=Name
 service.gui.NETWORK=Netzwerk
@@ -404,7 +390,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Nicht in Kontaktliste
 service.gui.SD_QUALITY=Standardqualität
 service.gui.OFFLINE=Offline
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Ältere Anrufe
 service.gui.ONLINE=Online
 service.gui.OPEN=Öffnen
 service.gui.OPEN_FILE_FROM_IMAGE=Doppelklicken, um die Datei zu öffnen.
@@ -416,7 +401,6 @@ service.gui.OPEN_ON_ACTIVITY=Bei Aktivität
 service.gui.OPEN_ON_MESSAGE=Bei neuen Nachrichten
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Bei wichtigen Nachrichten
 service.gui.OR=oder
-service.gui.OR_ENTER_PHONE_NUMBER=Oder geben Sie eine Telefonnummer hier ein...
 service.gui.ORGANIZATION=Firma
 service.gui.OTHER=Andere
 service.gui.chat.role.OWNER=Besitzer
@@ -442,7 +426,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS=''Enter'' für Vorschläge
 service.gui.PRESS_FOR_CALL_INFO=Anrufdetails
 service.gui.PRESS_TO_OPEN_CRM=Klicken um die CRM Applikation zu öffnen
 service.gui.PREVIOUS=Zurück
-service.gui.PREVIOUS_TOOLTIP=Suche ältere Gespräche
 service.gui.PRINT=&Drucken
 service.gui.PROACTIVE_NOTIFICATION=schreibt eine Mitteilung
 service.gui.PROBLEMS_ENCOUNTERED=Aufgetretene Probleme
@@ -458,7 +441,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Sie haben die Verbindung zu oft vom Serv
 service.gui.RE_REQUEST_AUTHORIZATION=Autorisierung erneut anfragen
 service.gui.REFERRED_STATUS=Weitergeleitet
 service.gui.REJECT=&Zurückweisen
-service.gui.REMIND_ME_LATER=Später erinnern
 service.gui.REMEMBER_PASSWORD=Passwort speichern
 service.gui.REMOVE=&Entfernen
 service.gui.REMOVE_ACCOUNT=&Konto entfernen
@@ -484,29 +466,23 @@ service.gui.REVOKE_ADMIN=Admin widerrufen
 service.gui.REVOKE_MODERATOR=Moderator widerrufen
 service.gui.REVOKE_MEMBERSHIP=Mitgliedschaft widerrufen
 service.gui.REVOKE_VOICE=Sprecherlaubnis widerrufen
-service.gui.ROOT_GROUP=Hauptgruppe
 service.gui.SAVE=&Speichern
-service.gui.SAVE_AS_DEFAULT=Als Standard speichern
 service.gui.SEARCH=&Suchen
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Betätigen Sie die nachfolgende Schaltfläche um alle Chaträume auf dem ausgewählten Server anzuzeigen. Wählen Sie den Chatraum dem Sie beitreten wollen aus und betätigen Sie "Beitreten".
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Gesuchter Kontakt
 service.gui.SECURITY=Sicherheit
 service.gui.SELECT_ACCOUNT=Konto auswählen
+service.gui.SELECT_ACCOUNT_INFO=Welches Konto soll für diesen Kontakt verwendet werden?
 service.gui.SELECT_COLOR=Farbe auswählen
 service.gui.SELECT_GROUP=Gruppe auswählen
-service.gui.SELECT_GROUP_WIZARD_MSG=Die unten angeführte Liste enthält alle Gruppen Ihrer Kontaktliste. Wählen Sie diejenige aus, zu der Sie den neuen Kontakt hinzufügen wollen.
+service.gui.SELECT_GROUP_INFO=Zu welcher Gruppe soll dieser Kontakt hinzugefügt werden? (Optional)
 service.gui.SELECT_NO_GROUP=Keine Gruppe
-service.gui.SELECT_GROUP_WIZARD=Gruppe auswählen
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Die unten angeführte Liste zeigt alle Konten, die Gruppenchats unterstützen. Wählen Sie eines aus und erstellen Sie einen Chatraum.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Die folgende Liste enthält alle Ihre registrierten Benutzerkonten. Bitte wählen Sie das Benutzerkonto aus, das sie für den neuen Kontakt verwenden möchten.
-service.gui.SELECT_PROVIDERS_WIZARD=Konto auswählen
 service.gui.SELECT_VIDEO_CONFERENCE=Videokonferenz auswählen
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Wählen Sie einen Chatraum aus der Liste aus und betätigen Sie OK um ihn hinzuzufügen.
 service.gui.SEND=&Senden
 service.gui.SEND_FILE=Datei s&enden
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Für diesen Kontakt sind keine Informationen verfügbar.
 service.gui.SEND_MESSAGE=Eine Nachricht &Senden
-service.gui.SEND_AS_SMS=Als SMS Versenden
 service.gui.SEND_PRIVATE_MESSAGE=Private Nachricht senden
 service.gui.SEND_SMS=SMS vers&enden
 service.gui.SEND_SMS_DETAILS=Die Telefonnummer muss einschließlich der internationalen Vorwahl eingegeben werden, z. B. mit der +49 für eine deutsche Nummer. Beispiel: +491771234567
@@ -545,7 +521,6 @@ service.gui.STREET=Strasse
 service.gui.SUBJECT=Thema
 service.gui.SUMMARY=Zusammenfassung
 service.gui.TELEPHONY=Telefonie
-service.gui.TODAY=Heute
 service.gui.TOOLS=&Werkzeuge
 service.gui.TRANSFER=Übertr&agung
 service.gui.TO=&An:
@@ -555,7 +530,6 @@ service.gui.TRANSFER_CALL_TO=Weiterleiten an:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparenz ist in Ihrer derzeitigen Konfiguration nicht unterstützt.
 service.gui.TYPE_YOUR_REQUEST=Formulieren Sie Ihre Anfrage hier 
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Die Videoqualität konnte nicht geändert werden.
-service.gui.UNMUTE=Ton ein
 service.gui.USER_IDENTIFIER=Benutzerkennung:
 service.gui.USER_EXISTS_ERROR=Dieser Benutzer existiert bereits in dem gewählten Netzwerk. Bitte wählen Sie einen anderen Benutzer oder ein anderes Netzwerk/Protokoll.
 service.gui.USERNAME_NULL=Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.
@@ -568,7 +542,6 @@ service.gui.USE_PROVISIONING=Provisionierung verwenden
 service.gui.VALUE=Wert
 service.gui.VIDEO_CALL=&Videoanruf
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&Ansicht
 service.gui.VIEW_HISTORY=&Verlauf anzeigen
 service.gui.VIEW_SMILEYS=&Smileys anzeigen
@@ -588,9 +561,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Lautstärke anpassen
 service.gui.WAITING_AUTHORIZATION=Autorisierung ausstehend
 service.gui.WARNING=Warnung
 service.gui.YES=Ja
-service.gui.YESTERDAY=Gestern
-service.gui.EXISTING_ACCOUNT_ERROR=Das von Ihnen eingegebene Konto ist bereits installiert.
-service.gui.NEW_MAIL=<b>Sie haben eine neue E-Mail!</b><br/><b>Von:</b> {0} {1} <br/><b>Betreff:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Sie haben eine neue E-Mail in ihrem {0} <a href="{1}">Posteingang</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Sie haben {2} neue E-Mails in ihrem {0} <a href="{1}">Posteingang</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=Eine weitere ungelesene Konversation in ihrem <a href="{0}">Posteingang</a>.<br/>
@@ -617,7 +587,6 @@ service.gui.SECURITY_ERROR=Sicherheitsfehler
 service.gui.SPEED=Geschwindigkeit:
 service.gui.SILENT_MEMBER=Stilles Mitglied
 service.gui.NON_SECURE_CONNECTION=Mit dem Konto {0} kann keine sichere Verbindung hergestellt werden. Um eine Verbindung zu unsicheren Servern herzustellen, muss die Option "Unsichere Verbindung erlauben" in den Kontoeinstellungen aktiviert werden.
-service.gui.UPDATE=Aktualisieren
 service.gui.MOBILE_PHONE=Handy
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Geschäftlich
@@ -652,12 +621,10 @@ service.gui.callinfo.CALL_INFORMATION=Anrufinformationen
 service.gui.callinfo.CALL_IDENTITY=Identität
 service.gui.callinfo.PEER_COUNT=Anzahl Teilnehmer
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Konferenz-Organisator
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Verschlüsselung aktiv
 service.gui.callinfo.CALL_TRANSPORT=Signalisierungskanal-Transport
 service.gui.callinfo.CALL_DURATION=Anrufdauer
 service.gui.callinfo.TLS_PROTOCOL=TLS Protokoll
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS Chiffrensammlung
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=TLS Zertifikatskette
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Das TLS Zertifikat des Servers wird unten angezeigt.
 service.gui.callinfo.VIEW_CERTIFICATE=Zertifikat anzeigen
 service.gui.callinfo.CODEC=Codec / Frequenz
@@ -677,10 +644,14 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Schlüsselaustauschprotokoll
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Erweiterter ICE Kandidatentyp
 service.gui.callinfo.ICE_STATE=ICE Verarbeitungsstatus
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Kandidaten ermitteln
 service.gui.callinfo.ICE_STATE.RUNNING=Verbindungstests
 service.gui.callinfo.ICE_STATE.COMPLETED=Fertig
 service.gui.callinfo.ICE_STATE.FAILED=Fehlgeschlagen
+service.gui.callinfo.ICE_STATE.TERMINATED=Beendet
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Lokale IP / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Lokale reflexive IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Lokale weitergegebene IP / Port
@@ -701,11 +672,12 @@ service.gui.ALWAYS_TRUST=Diesem Zertifikat immer vertrauen
 service.gui.CERT_DIALOG_TITLE=Zertifikat überprüfen
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} kann die Identität des Servers bei der Verbindung zu {1} nicht verifizieren.<br><br> Das Zertifikat ist nicht vertrauenswürdig, daher kann die Identität des Servers <br>nicht automatisch geprüft werden. Wollen Sie die Verbindung trotzdem aufbauen?<br><br> Um mehr Information zu erhalten, klicken Sie auf "Zertifikat anzeigen".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} kann die Identität des Servers nicht überprüfen.<br><br> Das Zertifikat ist nicht vertrauenswürdig, daher kann die Identität des Servers <br>nicht automatisch geprüft werden. Wollen Sie die Verbindung trotzdem aufbauen?<br><br> Um mehr Information zu erhalten, klicken Sie auf "Zertifikat anzeigen".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} kann die Identität des Clients nicht überprüfen.<br><br> Das Zertifikat ist nicht vertrauenswürdig, daher kann die Identität des Clients <br>nicht automatisch geprüft werden. Wollen Sie die Verbindung trotzdem aufbauen?<br><br> Um mehr Information zu erhalten, klicken Sie "Zertifikat anzeigen".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} kann die Identität des Clients {1} nicht überprüfen.<br><br> Das Zertifikat ist nicht vertrauenswürdig, daher kann die Identität des Clients <br>nicht automatisch geprüft werden. Wollen Sie die Verbindung trotzdem aufbauen?<br><br> Um mehr Information zu erhalten, klicken Sie auf "Zertifikat anzeigen".</html>
 service.gui.CONTINUE_ANYWAY=Trotzdem verbinden
 service.gui.CERT_INFO_CHAIN=Zertifikatskette:
 service.gui.CERT_INFO_ISSUED_TO=Ausgestellt für
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Allgemeiner Name (CN):
 service.gui.CERT_INFO_O=Organisation (O):
 service.gui.CERT_INFO_C=Land (C):
@@ -724,12 +696,10 @@ service.gui.CERT_INFO_SIGN_ALG=Signaturalgorithmus:
 service.gui.CERT_INFO_PUB_KEY_INFO=Informationen zum öffentlichen Schlüssel
 service.gui.CERT_INFO_ALG=Algorithmus:
 service.gui.CERT_INFO_PUB_KEY=Öffentlicher Schlüssel:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} Bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} Bits
 service.gui.CERT_INFO_EXP=Exponent:
 service.gui.CERT_INFO_KEY_SIZE=Schlüssellänge:
 service.gui.CERT_INFO_SIGN=Signatur:
-service.gui.CONTINUE=Weiter
 service.gui.SHOW_CERT=Zertifikat anzeigen
 service.gui.HIDE_CERT=Zertifikat ausblenden
 
@@ -752,12 +722,9 @@ service.gui.security.SECURE_AUDIO=Verschlüsseltes Audio
 service.gui.security.AUDIO_NOT_SECURED=Audio nicht verschlüsselt
 service.gui.security.SECURE_VIDEO=Verschlüsseltes Video
 service.gui.security.VIDEO_NOT_SECURED=Video nicht verschlüsselt
-service.gui.security.NO_VIDEO=Kein Video
-service.gui.security.CIPHER=Algorithmus: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Anruf verschlüsselt. Klicken für weitere Informationen.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Anruf nicht verschlüsselt
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Klicken um SAS mit dem Gesprächspartner zu vergleichen.
-service.gui.security.COMPARE_WITH_PARTNER=Vergleiche mit Gesprächspartner und klicke auf das Vorhängeschloß, um zu bestätigen.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Mit Gesprächspartner vergleichen:
 service.gui.security.STRING_COMPARED=SAS bestätigt
@@ -775,20 +742,20 @@ service.gui.avatar.imagepicker.CLICK=Klicken und lächeln
 service.gui.avatar.imagepicker.IMAGE_FILES=Bilddateien
 service.gui.avatar.imagepicker.IMAGE_PICKER=Avatar bearbeiten
 service.gui.avatar.imagepicker.IMAGE_SIZE=Bildgröße
-service.gui.avatar.imagepicker.INITIALIZING=Initialisierung...
 service.gui.avatar.imagepicker.RESET=Zurücksetzen
 service.gui.avatar.imagepicker.SET=Auswählen
 service.gui.avatar.imagepicker.TAKE_PHOTO=Foto aufnehmen
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Kamerafehler
 
 service.gui.security.encryption.required=Verschlüsselung benötigt
 
 service.protocol.ICE_FAILED=Verbindung konnte nicht aufgebaut (ICE fehlgeschlagen, kein Relay gefunden)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
+service.systray.MODE=Tray-Symbol Modus
+service.systray.mode.NATIVE=Standard
+service.systray.mode.DISABLED=Deaktiviert
+service.systray.mode.APPINDICATOR=AppIndicator (Unity, KDE, nicht Standard-Gnome 3; kann unter Debian abstürzen)
+service.systray.mode.APPINDICATOR_STATIC=AppIndicator statisch (keine Untermenus für Konten)
+service.systray.CLI_NOTE=Wenn die Auswahl nicht funktioniert, kann {0} mit der "--notray" option gestartet werden. Dies erzwingt den Modus "Deaktiviert" und zeigt das GUI. Die Änderung des Tray-Symbol Modus erfordert einen neustart.
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Fehler in den servergespeicherten SIP Kontakten
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Ressource {0} kann nicht gelesen werden. Konto: {1}
@@ -818,9 +785,7 @@ impl.ldap.QUERY_CUSTOM=Benutzerdefinierte Abfrage
 impl.ldap.QUERY_CUSTOM_HINT={0} dient als Platzhalter für den Suchbegriff.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Automatisch Platzhalter/Wildcard zum Suchbegriff hinzufügen
 impl.ldap.QUERY_PHOTO_INLINE=Fotos gemeinsam mit den anderen Attributen abfragen
-impl.ldap.NEW=Neu
 impl.ldap.EDIT=Bearbeiten
-impl.ldap.REMOVE=&Entfernen
 impl.ldap.ENABLED=Aktiv
 impl.ldap.SERVER_NAME=Name
 impl.ldap.SERVER_NAME_EXAMPLE=Mein LDAP-Server
@@ -853,6 +818,12 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 impl.ldap.PHONE_PREFIX=Telefon-Präfix
 impl.ldap.PHONE_PREFIX_EXAMPLE=Bsp.: 00
 
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS=''{0}'' ist keine gültige SIP-Adresse.
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS=''{0}'' ist keine gültige XMPP JID.
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Adressbuch
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Suche im Mac OS X-Adressbuch aktivieren
@@ -867,9 +838,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Outlook als Standard-E-Mail-Anw
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google-Kontakte
-impl.googlecontacts.NEW=Neu
 impl.googlecontacts.EDIT=Bearbeiten
-impl.googlecontacts.REMOVE=&Entfernen
 impl.googlecontacts.ENABLED=Aktiv
 impl.googlecontacts.ACCOUNT_NAME=Konto
 impl.googlecontacts.SAVE=&Speichern
@@ -878,6 +847,10 @@ impl.googlecontacts.USERNAME=Benutzername
 impl.googlecontacts.PASSWORD=Passwort
 impl.googlecontacts.PREFIX=Telefon-Präfix 
 impl.googlecontacts.WRONG_CREDENTIALS=Falsche Anmeldedaten für Google-Konto {0}
+impl.googlecontacts.OAUTH_DIALOG_TITLE=Google Contacts Authorisierung
+impl.googlecontacts.INSTRUCTIONS=<html><p><b>Klicken Sie auf den Link um dem Google Contacts Plugin Zugriff auf das Konto zu erlauben.</b><br><br>Wenn Sie dem Link folgen, wird eine Website im Browser geöffnet. Melden Sie sich mit Ihrem Google-Konto an und gestatten den Zugriff. Nach der Genehmigung wird eine code angezeigt. Kopieren Sie diesen Code in das Textfeld und klicken Sie auf 'Speichern'</p><p>Dies muss nur einmal durchgeführt werden. Der Code wird für künftige Zugriffe gespeichert.</p></html>
+impl.googlecontacts.CODE=Code:
+impl.googlecontacts.HYPERLINK_TEXT=Hier klicken um Zugriff auf {0} zu genehmigen
 
 # account info
 plugin.accountinfo.TITLE=Kontoinformationen
@@ -908,11 +881,8 @@ plugin.accountinfo.ORGANIZATION=Firma:
 plugin.accountinfo.JOB_TITLE=Beruf:
 plugin.accountinfo.ABOUT_ME=Über mich:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Benutzerfotos
 plugin.accountinfo.GLOBAL_ICON=Globalen Avatar verwenden
 plugin.accountinfo.LOCAL_ICON=Diesen Avatar verwenden:
-plugin.accountinfo.CHANGE=Ändern
-plugin.accountinfo.ONLY_MESSAGE=Nur Nachrichten
 
 # connection info
 plugin.connectioninfo.TITLE=Verbindungsinformationen
@@ -932,52 +902,15 @@ plugin.aimaccregwizz.USERNAME=AIM-Name:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Benutzername und Passwort
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Neues Benutzerkonto anlegen
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Wenn Sie kein AIM-Konto haben, klicken Sie hier, um ein neues Konto zu erstellen.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Standardmäßige Servereinstellungen überschreiben
 
 # branding
 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 Jitsi
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} ist derzeit unter aktiver Entwicklung. Die Version, welche Sie derzeit verwenden, ist NUR EXPERIMENTELL und KÖNNTE möglicherweise NICHT wie erwartet funktionieren. Bei {2} finden Sie mehr Informationen.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Alle Rechte vorbehalten. <a href="http://jitsi.org">https://jitsi.org</a></font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> steht unter der Lizenz der LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
+plugin.branding.COPYRIGHT_LICENSE=<DIV><font size=3 color={0}>Copyright 2003-{1} <a href="{2}"><b>{3}</b></a>, alle Rechte vorbehalten.</font><br><br>{4} steht unter der  <a href="{5}">{6}</a>.</DIV>
 
 plugin.busylampfield.PICKUP=Anruf holen
 
-# Dict protocol
-service.protocol.DICTIONARIES=Wörterbücher
-plugin.dictaccregwizz.ANY_DICTIONARY=Alle Wörterbücher
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Alle Wörterbücher von {0}
-plugin.dictaccregwizz.FIRST_MATCH=Erster Treffer
-plugin.dictaccregwizz.NO_MATCH=Keine Treffer
-plugin.dictaccregwizz.MATCH_RESULT=Keine Definitionen für "{0}" gefunden. Möglicherweise meinten Sie:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Das aktuelle Wörterbuch "{0}" existiert nicht mehr auf dem Server.
-plugin.dictaccregwizz.INVALID_STRATEGY=Die aktuelle Strategie ist auf dem Server nicht verfügbar.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Das Dict-Service-Protokoll
-plugin.dictaccregwizz.HOST=Servername
-plugin.dictaccregwizz.SERVER_INFO=Serverinformationen
-plugin.dictaccregwizz.STRATEGY_SELECTION=Strategieauswahl
-plugin.dictaccregwizz.STRATEGY_LIST=Liste der Strategien:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Suche Strategien
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Wenn keine Übersetzung gefunden wurde, bestimmt die Strategie, wie ähnliche Wörter zu finden sind. Zum Beispiel: die "Präfix-Strategie" sucht Wörter, die den gleichen Anfang (Präfix) wie das zu übersetzende Wort haben.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict-Kontoinformationen
-plugin.dictaccregwizz.FIRST_ACCOUNT=Diese Seite erstellt ihr erstes Wörterbuchkonto auf dict.org.\n\nSie können weitere Wöterbuchserver mit "Konto hinzufügen" angeben. Geben sie den Namen des Wöterbuchservers im Feld "Host" an.
-plugin.dictaccregwizz.THREAD_CONNECT=Verbindungsaufbau zum Server
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Verbindungsaufbau fehlgeschlagen. Dies ist kein Dict-Server oder der Server ist nicht erreichbar.
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Rufe Strategien ab
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Keine Strategien auf dem Server gefunden
-plugin.dictaccregwizz.POPULATE_LIST=Liste wird geladen
-plugin.dictaccregwizz.CLOSING_CONNECTION=Schließe Verbindung
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Um den Facebook-Chat nutzen zu können, müssen Sie einen Benutzernamen <br>auf Facebook unter "Kontoeinstellungen" erstellen.</a><br><br>Achtung: Nachdem Sie einen Benutzernamen erstellt haben, müssen Sie sich von Facebook abmelden.<br>Es kann einige Minuten dauern, bis Sie den Benutzernamen hier verwenden können!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Facebook-Chat-Protokoll
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=E-Mail:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Benutzername und Passwort
-
 # generalconfig
 plugin.generalconfig.AUTO_START={0} beim Systemstart automatisch starten
 plugin.generalconfig.CHATALERTS_ON_MESSAGE=Zeige Benachrichtigungen in Taskleiste/Dock
@@ -987,9 +920,6 @@ plugin.generalconfig.SHOW_HISTORY=Zeige
 plugin.generalconfig.HISTORY_SIZE=vorherige Nachrichten in neuen Chats
 plugin.generalconfig.SEND_MESSAGES_WITH=Sende Nachrichten mit:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Chat-Fenster in den Vordergrund holen
-plugin.generalconfig.ERROR_PERMISSION=Sie haben nicht die Berechtigung, den Autostart auszuschalten
-plugin.generalconfig.TRANSPARENCY=Transparenz
-plugin.generalconfig.ENABLE_TRANSPARENCY=Transparenz aktivieren
 plugin.generalconfig.DEFAULT_LANGUAGE=Sprache
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Die Änderungen werden erst beim nächsten Start aktiv.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% übersetzt
@@ -1005,6 +935,8 @@ plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Vor dem Wählen Sonderzeichen
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Buchstaben in Telefonnummern in Ziffern umwandeln
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=Bsp. +1-800-ANRUFE -> +1-800-267833
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.XMPP_USE_ALL_RESOURCES=Alle Ressourcen verwenden um die Funktionalität eines Kontakts zu ermitteln
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Abtastrate:
 plugin.generalconfig.OPUS_BITRATE=Durchschnittliche Übertragungsrate (kbps):
@@ -1018,6 +950,7 @@ plugin.generalconfig.SILK_ALWAYS_ASSUME_PACKET_LOSS=Paketverlust immer annehmen:
 plugin.generalconfig.SILK_SAT=Sprachaktivitätsschwelle (0 bis 1):
 plugin.generalconfig.SILK_ADVERTISE_FEC=FEC-Unterstützung in SDP angeben:
 plugin.generalconfig.RESTORE=Voreinstellungen wiederherstellen
+plugin.generalconfig.MINIMIZE_NOT_HIDE=Hauptfenster minimieren statt zu schliessen oder verstecken
 
 # gibberish accregwizz
 plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
@@ -1076,13 +1009,10 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Kommentar
 plugin.jabberaccregwizz.RESOURCE=Ressource
 plugin.jabberaccregwizz.AUTORESOURCE=Erzeuge Ressource automatisch
 plugin.jabberaccregwizz.PRIORITY=Priorität
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP-Fehler
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Unbekannter XMPP-Fehler ({0}). Überprüfen Sie, ob der Name des Servers richtig ist.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Die Passwörter stimmen nicht überein.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Standardmäßige Servereinstellungen überschreiben
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Erweiterte Einstellungen
+plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Standardmässige Servereinstellungen überschreiben
 plugin.jabberaccregwizz.USE_ICE=ICE verwenden
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Google's Jingle/ICE Variante verwenden (experimentell)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=STUN/TURN-Server automatisch konfigurieren
 plugin.jabberaccregwizz.SUPPORT_TURN=TURN aktivieren
 plugin.jabberaccregwizz.TURN_USERNAME=TURN-Benutzername
@@ -1110,11 +1040,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Nachrichtenkopien deaktivieren
 plugin.jabberaccregwizz.DTMF_AUTO=Automatische Auswahl zwischen RTP und Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Server-Optionen
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Kontopasswort ändern
-plugin.jabberaccregwizz.NEW_PASSWORD=Neues Passwort
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Neues Passwort bestätigen
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Bitte eine gültige Portnummer eingeben um fortzufahren.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Das Konto muss angemeldet sein um das Passwort zu ändern.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Das Passwort ist leer.
 plugin.jabberaccregwizz.TLS_REQUIRED=Die Verbindung verwendet kein SSL/TLS, eine Passwortänderung wird daher nicht unterstützt.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Das Passwort wurde erfolgreich geändert
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Der XMPP-Server unterstützt keine Passwortänderungen.
@@ -1128,21 +1055,6 @@ plugin.jabberaccregwizz.RESET=Zurücksetzen
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Auf globale Einstellungen zurücksetzen
 plugin.jabberaccregwizz.DISABLE_JINGLE=Jingle deaktivieren (Audio- und Videoanrufe mit XMPP)
 
-# mailbox
-plugin.mailbox.OUTGOING=Ausgehende Meldung:
-plugin.mailbox.INCOMING=Eingehende Meldung:
-plugin.mailbox.WAIT_TIME=Warten, bis Anruf an den Anrufbeantworter weitergeleitet wurde
-plugin.mailbox.MAX_MESSAGE_TIME=Maximale Dauer eingehender Meldungen
-plugin.mailbox.CONFIRM=Bestätigen
-plugin.mailbox.DEFAULTS=Voreinstellungen
-plugin.mailbox.MAILBOX=Anrufbeantworter
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN/Live Messenger
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Das MSN/Live Messenger-Protokoll.
-plugin.msnaccregwizz.USERNAME=E-Mail:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Kontoinformationen
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Installieren
 plugin.pluginmanager.UNINSTALL=Deinstallieren
@@ -1171,9 +1083,9 @@ plugin.sipaccregwizz.SERVER_PORT=Server-Port
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxy-Port
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Bevorzugter Transport
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Erweiterte Optionen
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxy-Server-Optionen
 plugin.sipaccregwizz.PROXY_AUTO=Proxy-Server automatisch konfigurieren
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Proxy-Sicherheitsprüfung deaktivieren (nur für Hochverfügbarkeitsszenarien)
 plugin.sipaccregwizz.ENABLE_PRESENCE=Anwesenheitsfunktion aktivieren (SIMPLE)
 plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Anwesenheitsmodus "Peer-To-Peer" erzwingen
 plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Abfrageintervall für Offline-Kontakte (in Sekunden)
@@ -1191,8 +1103,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Automatische Auswahl zwischen RTP und Inband (kei
 plugin.sipaccregwizz.DTMF_RTP=RTP (RFC2833 / RFC4733)
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Servervoreinstellungen überschreiben
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Verschlüsselte Anrufe zulassen
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Unterstützung von ZRTP in der Protokollsignalisierung anzeigen
 plugin.sipaccregwizz.AUTH_NAME=Name für die Anmeldung
@@ -1213,10 +1123,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Anrufbeantworter Abruf-URI
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Die Passwörter stimmen nicht überein.
 plugin.sipaccregwizz.NO_CERTIFICATE=<keines> (reguläre Anmeldung verwenden)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP Transport-Attribut
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Aus (nur RTP/AVP wird angeboten)
 plugin.sipaccregwizz.SAVP_OPTION_1=Zwingend (nur RTP/SAVP anbieten und annehmen)
 plugin.sipaccregwizz.SAVP_OPTION_2=Optional (RTP/SAVP zuerst anbieten, dann RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=S-Descriptor Verschlüsselung aktivieren (auch bekannt als SDES oder SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Aktivierte Verschlüsselungsprotokolle und Priorität:
 plugin.sipaccregwizz.CIPHER_SUITES=Aktivierte Verschlüsselungs-Suiten
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} versucht automatisch alle Anrufe mit ZRTP zu verschlüsseln. Beide Gesprächsteilnehmer hören und sehen eine Benachrichtigung sobald eine sichere Verbindung hergestellt wurde. Die erweiterten Einstellungen auf dieser Seite sollten ohne Expertenwissen nicht geändert werden.</div></html>
@@ -1230,15 +1140,6 @@ plugin.skinmanager.DEFAULT_SKIN=Standard Skin
 plugin.skinmanager.ADD_NEW_SKIN=Neuen Skin hinzufügen...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Der Standard-Skin der Anwendung.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=SSH ist ein Protokoll für die verschlüsselte Verbindung zu anderen Computern.
-plugin.sshaccregwizz.USERNAME=Benutzerkennung:
-plugin.sshaccregwizz.IDENTITY_FILE=Identitätsdatei:
-plugin.sshaccregwizz.KNOWN_HOSTS=Bekannte Server:
-plugin.sshaccregwizz.OPTIONAL=Optional
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Kontodetails
-
 # status update
 plugin.autoaway.AUTO_STATUS=Automatisch abwesend
 plugin.autoaway.ENABLE_CHANGE_STATUS=Status automatisch auf "abwesend" setzen
@@ -1286,22 +1187,6 @@ plugin.whiteboard.DESELECT=Auswahl aufheben
 plugin.whiteboard.DELETE=Löschen
 plugin.whiteboard.PROPERTIES=Einstellungen
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Das Yahoo!-Protokoll.
-plugin.yahooaccregwizz.USERNAME=Benutzername:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Kontoinformationen
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Das Zeroconf-Protokoll (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Vorname:
-plugin.zeroaccregwizz.LAST_NAME=Nachname:
-plugin.zeroaccregwizz.EMAIL=E-Mail:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Bonjour-Kontakte merken?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=Kontoinformationen
-plugin.zeroaccregwizz.USERID=Benutzerkennung
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Das Google Talk-Protokoll
@@ -1315,19 +1200,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, das Portal für IP-Teleko
 plugin.iptelaccregwizz.USERNAME=Benutzername
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Bei iptel.org anmelden
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP und Chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Benutzername
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Passwort wiederholen
 plugin.sip2sipaccregwizz.EMAIL=E-Mail Adresse
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Um Hilfe für diesen Dienst zu erhalten, besuchen Sie bitte die Seite<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Die E-Mail Adresse wird verwendet, um Nachrichten des Anrufbeantworters und Benachrichtigungen über verpasste Anrufe zu erhalten sowie um ein vergessenes Passwort zurückzusetzen</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Um Hilfe für diesen Dienst zu erhalten, besuchen Sie bitte die Seite<a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Bestehendes sip2sip.info-Konto
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Kostenloses sip2sip.info-Konto erstellen
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Sofortnachrichten
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Um Hilfe für diesen Dienst zu erhalten, besuchen Sie bitte die Seite<br>http://ippi.fr
@@ -1336,6 +1213,8 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Existierendes ippi-Konto
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Kostenloses ippi-Konto erstellen
 
 # key binding chooser
+plugin.keybindings.WAITING=Kurzbefehl hinzufügen...
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Gesprächsfenster schließen
 plugin.keybindings.CHAT_COPY=Kopieren
 plugin.keybindings.CHAT_CUT=Ausschneiden
@@ -1358,10 +1237,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Aktion
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primäre Tastenkombination
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Sekundäre Tastenkombination
 plugin.keybindings.globalchooser.PRESS_BTN=Taste drücken um Verknüpfung zu setzen
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Warte
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Sprechtaste
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Erkennung von Spezialtasten aktivieren
 plugin.keybindings.PLUGIN_NAME=Tastenkombinationen
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Hauptfenster
 plugin.keybindings.GLOBAL=Systemweit
@@ -1389,6 +1268,7 @@ plugin.notificationconfig.tableheader.SOUND=Ton über Benachrichtigungsgerät ab
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Ton über Wiedergabegerät abspielen
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Ton über PC-Lautsprecher abspielen
 plugin.notificationconfig.tableheader.DESCRIPTION=Beschreibung der Benachrichtigung
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Eingehender Anruf
 plugin.notificationconfig.event.SecurityMessage=Sicherheitsmitteilung
 plugin.notificationconfig.event.IncomingFile=Eingehende Datei
@@ -1490,6 +1370,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Zyklische Intra-Aktualisierung
 impl.neomedia.configform.H264.defaultProfile=Standard-Kodierungsprofil
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Baseline
 impl.neomedia.configform.H264.defaultProfile.high=High
 impl.neomedia.configform.H264.defaultProfile.main=Main
@@ -1520,7 +1401,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Aktuelles Passwort:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Neues Passwort:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Passwort bestätigen:
 plugin.securityconfig.masterpassword.MP_TITLE=Master-Passwort
-plugin.securityconfig.masterpassword.MP_NOT_SET=(keines)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Falsches aktuelles Passwort, bitte wiederholen.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Das Master-Passwort ist falsch.
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Die Änderung des Passworts ist fehlgeschlagen
@@ -1536,7 +1416,7 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Passwort
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(unbekannt)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(nicht entschlüsselbar)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Gespeicherte Passwörter
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=&Entfernen
+plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Entfernen
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Alle entfernen
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Sind Sie sicher, dass alle Passwörter entfernt werden sollen?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Alle Passwörter entfernen
@@ -1632,7 +1512,7 @@ plugin.globalproxy.PROXY_PORT=Proxy-Portnummer
 plugin.globalproxy.PROXY_USERNAME=Proxy-Benutzername
 plugin.globalproxy.PROXY_PASSWORD=Proxy-Passwort
 plugin.globalproxy.DESCRIPTION={0} verwendet von nun an diese Proxy-Konfiguration für alle Protokolle.\nDie Unterstützung für Proxy-Server befindet sich noch im Experimentierstadium und unterstützt noch nicht alle Protokolle. Die folgende Tabelle gibt weitere Hinweise:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
+plugin.globalproxy.PROTOCOL_SUPPORT=<html>    <table>        <tr>            <td/>            <td> SOSCKS4/5 </td>            <td> SOSCKS4/5+Auth </td>            <td> HTTP </td>            <td> HTTP+Auth </td>        </tr>        <tr>            <td>XMPP</td>            <td>+</td>            <td>+</td>            <td>+</td>            <td>+</td>        </tr>        <tr>            <td>ICQ/AIM</td>            <td>+</td>            <td>+</td>            <td>+</td>            <td>+</td>        </tr>    </table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=DNS ebenfalls tunneln
 plugin.globalproxy.FWD_DNS_NOTE=Hilfreich bei der Verwendung von Tor. Vermeidet die Offenlegung von DNS-Daten indem der gesamte DNS-Datenverkehr über den Tor-Proxy umgeleitet wird. Wird erst nach einem Neustart aktiv.
@@ -1670,7 +1550,6 @@ plugin.provisioning.RESTART_WARNING=Die Änderungen werden erst beim nächsten S
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=UUID in die Zwischenablage kopieren
 plugin.provisioning.CLIPBOARD_FAILED=UUID konnte nicht in die Zwischenablage kopiert werden
-plugin.provisioning.EXIT_ON_FAIL=Programm beenden wenn die Provisionierung fehlschlägt
 plugin.provisioning.CREDENTIALS=Zuletzt gespeicherte Anmeldedaten
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Soll das gespeicherte Provisionierungspasswort wirklich entfernt werden?
 plugin.provisioning.PROV_FAILED=Provisionierung fehlgeschlagen
@@ -1737,8 +1616,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} hat versucht den Server <b>{1
 #plugin spellcheck
 plugin.spellcheck.TITLE=Rechtschreibung und Grammatik
 plugin.spellcheck.MENU=Rechtschreibung und Grammatik prüfen
-plugin.spellcheck.LANG=Sprache
-plugin.spellcheck.EDIT_PERSONAL_DICT=Bearbeiten
 plugin.spellcheck.ENABLE_SPELL_CHECK=Rechtschreibprüfung aktivieren
 plugin.spellcheck.dialog.FIND=Nächster Fehler
 plugin.spellcheck.dialog.REPLACE=Ersetzen
diff --git a/resources/languages/resources_el.properties b/resources/languages/resources_el.properties
index d9d9292..e60d690 100644
--- a/resources/languages/resources_el.properties
+++ b/resources/languages/resources_el.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Εγώ
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Οδηγός Καταχώρησης Λογαριασμού
 service.gui.ACCOUNTS=Λογαριασμοί
 service.gui.ADD=&Προσθήκη
-service.gui.ADD_ACCOUNT=Προσθήκη λογαριασμού
 service.gui.ADD_CONTACT=&Προσθήκη επαφής
 service.gui.ADD_AUTHORIZED_CONTACT=Πρόσθεσε την/τον {0} στη λίστα των επαφών σου
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Πρόσθεσε την επαφή στην λίστα των επαφών σου
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Σφάλμα προσθήκης επαφής
 service.gui.ADD_CONTACT_EXIST_ERROR=Η επαφή {0} υπάρχει ήδη στη λίστα επαφών σας.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Ο διακομιστής δεν απάντησε στο αίτημα προσθήκης της επαφής με κωδικό: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Αποτυχία προσθήκης της επαφής με κωδικό: {0}. Η λειτουργία δεν υποστηρίζεται.
-service.gui.ADD_CONTACT_IDENTIFIER=Εισάγετε στο παρακάτω πεδίο το αναγνωριστικό της επαφής που θέλετε να προσθέσετε.
-service.gui.ADD_CONTACT_WIZARD=Οδηγός προσθήκης επαφής
 service.gui.ADD_CONTACT_NOT_CONNECTED=Θα πρέπει να είστε συνδεδεμένοι για να προσθέσετε μια επαφή. Παρακαλώ συνδεθείτε στον επιλεγμένο παροχέα υπηρεσιών και προσπαθείστε ξανά.
 service.gui.ADD_GROUP_LOCAL_ERROR=Αποτυχία προσθήκης της ομάδας με όνομα: {0}. Το πρόβλημα προέκυψε κατά τη διάρκεια μίας τοπικής λειτουργίας εισόδου/εξόδου.
 service.gui.ADD_GROUP_EXIST_ERROR=Η ομάδα {0} υπάρχει ήδη στη λίστα επαφών σας. Παρακαλώ επιλέξτε ένα άλλο όνομα.
 service.gui.ADD_GROUP_NET_ERROR=Αποτυχία προσθήκης της ομάδας με όνομα: {0}. Το πρόβλημα προέκυψε λόγω αποτυχίας του δικτύου. Παρακαλώ ελέγξτε τη σύνδεσή σας στο δίκτυο και δοκιμάστε ξανά.
 service.gui.ADD_GROUP_ERROR=Αποτυχία προσθήκης της ομάδας με όνομα: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Το όνομα της ομάδας δεν πρέπει να είναι κενό.
-service.gui.ADD_GROUP=Δημιουργία ομάδας
-service.gui.ADD_SUBCONTACT=&Προσθήκη υποεπαφής
 service.gui.ADDRESS=Διεύθυνση
 service.gui.ADMINISTRATOR=διαχειριστής
 service.gui.ADVANCED=&Για προχωρημένους
-service.gui.ALL=&Όλα
 service.gui.ALL_CONTACTS=&Όλες οι επαφές
 service.gui.ALTERNATE_ADDRESS=Εναλλακτική διεύθυνση
 service.gui.APPLY=&Εφαρμογή
@@ -65,7 +70,6 @@ service.gui.AT=σε
 service.gui.AUTHORIZE=&Εξουσιοδότησε
 service.gui.AUTHORIZATION_ACCEPTED=Ο/Η {0} αποδέχτηκε το αίτημά σας για εξουσιοδότηση.
 service.gui.AUTHENTICATION_FAILED=Η ταυτοποίηση απέτυχε για {0}. Ο κωδικός που εισάγατε δεν είναι έγκυρος.
-service.gui.AUTHENTICATION_REQUESTED=Άιτηση ταυτοποίησης
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Ο εξυπηρετητής {0} ζήτησε την ταυτοποίησή σας.
 service.gui.AUTHENTICATION_REJECTED=Ο χρήστης {0} απέρριψε την αίτηση εξουσιοδότησης που ζητήσατε.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} ταυτοποίηση
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Στο παρακάτω πεδίο μπορε�
 service.gui.CHANGE_NICKNAME_ERROR=Παρουσιάστηκε σφάλμα κατα την αλλαγή του ψευδωνύμου
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Το ψευδόνυμο υπάρχει ήδη
 service.gui.CHANGE_VIDEO_QUALITY=Αλλαγή ποιότητας απομακρυσμένου βίντεο
-service.gui.CHAT_CONFERENCE_LABEL=Συνέδρια
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Συνέδριο του {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Έχετε ήδη συνδεθεί στο δωμάτιο συζήτησης {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=ρυθμίσεις του δωματίου συζήτησης {0}
@@ -121,18 +124,14 @@ 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_SEND_MSG_FORBIDDEN=Η αποστολή μηνυμάτων είναι απαγορευμένη (το δικαίωμα ομιλίας σας ανακλήθηκε)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Αποθήκευση του δωματίου συζήτησης για μελλονική χρήση
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Διαγραφή του επιλεγμένου δωματίου συζητήσεων από την λίστα των αποθηκευμένων δωματίων
 service.gui.CHAT_ROOM_NAME=Όνομα δωματίου συζήτησης
 service.gui.CLEAR_CUSTOM_MESSAGES=Διαγραφή προσαρμοσμένων μηνυμάτων
 service.gui.ROOM_NAME=Δωμάτιο συζήτησης
-service.gui.AUTOJOIN=Αυτόματη σύνδεση
 service.gui.CHANGE_PASSWORD=Αλλαγή κωδικού πρόσβασης
 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_LEAVE_NOT_CONNECTED=Πρέπει να είστε συνδεδεμένος για να μπορέσετε να φύγετε από ένα δωμάτιο συζήτησης.
-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} ζήτησε κωδικό πρόσβασης.
@@ -151,22 +150,18 @@ service.gui.CLEAR=Καθαρισμός
 service.gui.CLOSE=Κλείσιμ&ο
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Λάβατε ένα νέο μήνυμα πριν από λιγότερο από 2 δευτερόλεπτα. Σίγουρα θέλετε να κλείσετε αυτή τη συζήτηση;
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Υπάρχουν μεταφορές αρχείων σε εξέλιξη. Σίγουρα θέλετε να τις ακυρώσετε;
-service.gui.CONFIRM=Επιβεβαίωση
 service.gui.CONNECTED_STATUS=Συνδεθήκατε
 service.gui.CONNECTING=Γίνεται σύνδεση...
 service.gui.CONNECTING_STATUS=Συνδέεται
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Γίνεται σύνδεση...
 service.gui.CONNECTION=Σύνδεση
-service.gui.CONNECTION_FAILED_MSG=Η σύνδεση απέτυχε για τον ακόλουθο λογαριασμό: Όνομα χρήστη: {0}, όνομα εξυπηρετητή: {1}. Παρακαλώ ελέγξτε τη σύνδεσή σας στο δίκτυο ή επικοινωνήστε με τον διαχειριστή δικτύου για περισσότερες πληροφορίες.
 service.gui.CONNECTION_EXPIRED_MSG=Είστε αποσυνδεδεμένος από τον εξυπηρετητή {0}.
 service.gui.CONTACT_NAME=Κωδικός Ταυτοποίησης ή Αριθμός
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Η επιλεγμένη επαφή {0} δεν υποστηρίζει τηλεφωνία.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Η επιλεγμένη επαφή {0} δεν υποστηρίζει συνδιάσκεψη με chat.
 service.gui.CONTACT_PAUSED_TYPING=Ο/Η {0} έπαυσε την πληκτρολόγηση του μηνύματος
 service.gui.CONTACT_TYPING=Ο/Η {0} πληκτρολογεί ένα μήνυμα
 service.gui.CONTACT_TYPING_SEND_FAILED=Ουπς.. δεν μπορέσαμε να ενημερώσουμε τον/την {0} οτι γράφατε
 service.gui.CONTACT_INFO=&Πληροφορίες επαφής
-service.gui.CONTACTLIST=Λίστα επαφών
 service.gui.CONTACTS=Επαφές
 service.gui.COPY=&Αντιγραφή
 service.gui.COPY_LINK=Αντιγραφή &συνδέσμου
@@ -176,17 +171,14 @@ service.gui.CREATE_CHAT_ROOM=&Δημιουργία δωματίου συζήτη
 service.gui.CREATE_CHAT_ROOM_ERROR=Απέτυχε η δημιουργία του δωματίου συζήτησης {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Οδηγός δημιουργίας δωματίου συζήτησης
 service.gui.CREATE_CONFERENCE_CALL=&Δημιουργία κλήσης για συνδιάσκεψη...
-service.gui.CREATE_CONFERENCE_CHAT=&Δημιουργία συζήτησης για συνδιάσκεψη...
 service.gui.CREATE_GROUP=&Δημιουργία ομάδας...
 service.gui.CREATE_GROUP_NAME=Στο παρακάτω πεδίο εισάγετε το όνομα της ομάδας που θέλετε να δημιουργήσετε.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Η λίστα επαφών σας δεν περιέχει καμία ομάδα. Παρακαλώ δημιουργήστε πρώτα μία ομάδα (Αρχείο/Δημιουργία ομάδας).
 service.gui.CREATE_VIDEO_BRIDGE=Δημιουργία ενός &μεταγωγέα βίντεο...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Δημιουργία ενός &μεγαγωγέα βίντεο
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Δημιουργία / Σύνδεση τηλεδιάσκεψης
 service.gui.CREATE_VIDEO_CONFERENCE=Δημιουργία μιας νέας τηλεδιάσκεψης για αυτό το δωμάτιο συζητήσεων
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Η επαφή αυτή δεν υποστηρίζει web contact info
 service.gui.CUT=Απο&κοπή
-service.gui.DATE=Ημερομηνία
 service.gui.DELETE=Διαγραφή
 service.gui.DENY=&Άρνηση
 service.gui.DESKTOP_SHARING_WARNING=<b>Είστε σίγουρα ότι θέλετε να ξεκινήσετε τον διαμοιρασμό οθόνης;</b> <br> Πατώντας ΟΚ θα επιτρέψετε στους συνομιλητές σας να βλέπουν την οθόνη σας.
@@ -197,7 +189,6 @@ service.gui.DISCONNECTED_STATUS=Αποσυνδεθήκατε
 service.gui.DND_STATUS=Μην ενοχλείτε
 service.gui.DO_NOT_ASK_AGAIN=Μη με ξαναρωτήσεις
 service.gui.DO_NOT_SHOW_AGAIN=Μην εμφανίσεις ξανά αυτό το μήνυμα
-service.gui.DOWNLOAD_NOW=&Κάντε download τώρα
 service.gui.DRAG_FOR_SHARING=Τραβήξτε εδώ ο,τιδήποτε θέλετε να μοιραστείτε
 service.gui.DURATION=διάρκεια
 service.gui.DESTROY_CHATROOM=Διαγράψτε το δωμάτιο συζητήσεων
@@ -218,7 +209,6 @@ service.gui.ERROR_RECEIVED_FROM=Λάβαμε ένα σφάλμα από τον/�
 service.gui.ESTIMATED_TIME=Υπολογιζόμενος χρόνος:
 service.gui.EVENTS=Συμβάντα
 service.gui.EXIT=Έ&ξοδος
-service.gui.EXTENDED_CRITERIA=Εκτεταμένα κριτήρια
 service.gui.GENERAL=Γενικά
 service.gui.GENERAL_ERROR=Γενικό σφάλμα
 service.gui.GROUP_NAME=Όνομα ομάδος
@@ -260,7 +250,6 @@ service.gui.FONT_ITALIC=Πλάγια γράμματα
 service.gui.FONT_SIZE=Μέγεθος
 service.gui.FONT_STYLE=Στυλ
 service.gui.FONT_UNDERLINE=Υπογράμμιση
-service.gui.FROM={0} από {1}
 service.gui.GRANT_OWNERSHIP=Απόδωση κυριότητος
 service.gui.GRANT_ADMIN=Ανάθεση Διαχειρστού ....
 service.gui.GRANT_MODERATOR=Ανάθεση διαμεσολαβητή
@@ -286,7 +275,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Είστε βέβαιος ότι επιθ
 service.gui.HISTORY_REMOVE_ERROR=Παρουσιάστηκε σφάλμα κατα την διαγραφή των τοπικά αποθηκευμένα μηνυμάτων.
 service.gui.HOME=Οικία
 service.gui.HOME_PAGE=Αρχική σελίδα
-service.gui.HOUR=Ώρα
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Αναγνωριστικό
 service.gui.IGNORE=&Παράβλεψη
@@ -310,13 +298,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Πρόσκληση επαφών στ�
 service.gui.INVITE_REASON=Λόγος πρόσκλησης
 service.gui.IS_CALLING=Ο/Η {0} καλεί...
 service.gui.IS_NOW=Το {0} είναι τώρα {1}
-service.gui.JITSI_WARNING=Ο SIP Communicator άλλαξε πρόσφατα ονομασία στο Jitsi.<br/>Αν θέλετε η έκδοσή σας να είναι ενημερωμένη, τότε παρακαλώ κατεβάστε το Jitsi τώρα.<br/><br/>Λυπούμαστε για την ό,ποια ταλαιπωρία που αυτό ίσως σας προκαλεί.<br/><br/>Η ομάδα ανάπτυξης του Jitsi
-service.gui.JITSI_WARNING_TITLE=Ο SIP Communicator έγινε τώρα Jitsi
 service.gui.JOIN=&Ελάτε να συμμετάσχετε και σεις
 service.gui.JOIN_AS=Να σ&υμμετέχετε ως
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Συνδεθείτε σε μια προυπάρχουσα τηλεδιάσκεψη
 service.gui.JOIN_VIDEO=Συνδεθείτε με βίντεο
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Κ&λείσιμο
 service.gui.JOB_TITLE=Τίτλος εργασίας
 service.gui.JOIN_CHAT_ROOM=&Μπείτε στο Δωμάτιο συνομιλίας chat
 service.gui.JOIN_CHAT_ROOM_TITLE=Μπείτε στο Δωμάτιο συνομιλίας chat
@@ -329,7 +314,6 @@ 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.LAST_NAME=Επώνυμο
 service.gui.LEAVE=&Έξοδος
 service.gui.LIMIT_REACHED_FOR_IP=Διαθέτετε πάρα πολλές εγγραφές από την τοπική διεύθνση IP και ο διακομιστής {0} δεν σας επιτρέπει να ανοίξετε καμία επιπλέον.
@@ -349,7 +333,6 @@ service.gui.MESSAGE=Μήνυμα
 service.gui.MISSED_CALLS_TOOL_TIP=Αναπάντητες κλήσεις από:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= και {0} επιπλέον
 service.gui.MODERATOR=μεσολαβητής (moderator)
-service.gui.MORE=Δείτε περισσότερα
 service.gui.MORE_LABEL=Περισσότερα
 service.gui.MOVE=κίνηση
 service.gui.MOVE_SUBCONTACT=Μ&ετακινείστε την επαφή
@@ -358,7 +341,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Η επαφή που επιλέξατε εί�
 service.gui.MOVE_SUBCONTACT_QUESTION=Είστε βέβαιος ότι θέλετε να μετακινήσετε το {0} στο {1};
 service.gui.MOVE_TO_GROUP=&Μετακινείστε στην ομάδα
 service.gui.MOVE_CONTACT=Μετακινείστε την επαφή
-service.gui.MOVE_CONTACT_ERROR=&Η επαφή δεν μπορεί να μετακινηθεί
 service.gui.MSG_DELIVERY_FAILURE=Το παραπάνω μήνυμα δεν ήταν δυνατόν να παραδοθεί
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Το πρωτόκολλο που χρησιμοποιείτε δεν υποστηρίζει μηνύματα εκτός σύνδεσης. Μπορείτε να δοκιμάσετε να επικοινωνήσετε με τον/την {0} μέσω ενός άλλου πρωτοκόλλου ή αναμείνατε μέχρι να συνδεθεί.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Σημειώθηκε ένα εσωτερικό σφάλμα. Πρόκειται μάλλον για κάποιο bug. Παρακαλώ αναφέρατέ το εδώ: https://jitsi.org/Development/BugsAndIssues.
@@ -372,7 +354,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Θα πρέπει να συνδεθεί�
 service.gui.MULTIPLE_LOGINS=Συνδεθήκατε παραπάνω από μία φορά με τον ίδιο λογαριασμό. Ο εξής λογαριασμός: Όνομα χρήστη: {0}, Όνομα διακομιστή: {1} είναι αυτή τη στιγμή χωρίς σύνδεση.
 service.gui.MY_CHAT_ROOMS=Προσθήκη ενός δωματίου συζητήσεων
 service.gui.MY_CHAT_ROOMS_TITLE=Προσθήκη ενός δωματίου συζητήσεων
-service.gui.MUTE=Σίγαση
 service.gui.MUTUALLY_ON_HOLD_STATUS=Κλήση σε κράτηση και από τους 2 συνομιλούντες
 service.gui.NAME=Όνομα
 service.gui.NETWORK=Δίκτυο
@@ -404,7 +385,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=ΕκτόςΛίσταςΕπαφών
 service.gui.SD_QUALITY=Κανονική ποιότητα
 service.gui.OFFLINE=Χωρίς σύνδεση
 service.gui.OK=&Εντάξει
-service.gui.OLDER_CALLS=Παλαιότερες κλήσεις
 service.gui.ONLINE=Με σύνδεση
 service.gui.OPEN=Άνοιξε
 service.gui.OPEN_FILE_FROM_IMAGE=Κάντε διπλό κλικ για να ανοίξετε το αρχείο.
@@ -416,7 +396,6 @@ service.gui.OPEN_ON_ACTIVITY=Άνοιγμα όταν υπάρχει δραστη
 service.gui.OPEN_ON_MESSAGE=Άνοιγμα μόνο όταν υπάρχει κάποιο μύνημα
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Άνοιγμα μόνο όταν υπάρχει κάποιο σημαντικό μήνυμα
 service.gui.OR=ή
-service.gui.OR_ENTER_PHONE_NUMBER=Ή πληκτρολογείστε έναν αριθμό τηλεφώνου εδώ...
 service.gui.ORGANIZATION=Οργανισμός
 service.gui.OTHER=Άλλο
 service.gui.chat.role.OWNER=Ιδιοκτήτης
@@ -442,7 +421,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS="Enter" για υποδείξεις
 service.gui.PRESS_FOR_CALL_INFO=Πατήστε για πληροφορίες κλήσης
 service.gui.PRESS_TO_OPEN_CRM=Κάντε κλίκ για να ανοίξετε την εφαρμογή CRM
 service.gui.PREVIOUS=Προηγούμενος
-service.gui.PREVIOUS_TOOLTIP=Αναζήτηση στις παλαιότερες συνομιλίες
 service.gui.PRINT=&Εκτύπωση
 service.gui.PROACTIVE_NOTIFICATION=γράφει ένα μήνυμα
 service.gui.PROBLEMS_ENCOUNTERED=Βρέθηκαν προβλήματα
@@ -458,7 +436,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Συνδεθήκατε και αποσυ
 service.gui.RE_REQUEST_AUTHORIZATION=Νέα αίτηση εξουσιοδότησης
 service.gui.REFERRED_STATUS=Ανεφέρθη
 service.gui.REJECT=&Απόρριψη
-service.gui.REMIND_ME_LATER=Υπενθύμισέ μου αργότερα
 service.gui.REMEMBER_PASSWORD=Κράτα τον Κωδικό Εισόδου στη μνήμη
 service.gui.REMOVE=&Διαγραφή
 service.gui.REMOVE_ACCOUNT=&Διαγραφή Λογαριασμού
@@ -484,29 +461,20 @@ service.gui.REVOKE_ADMIN=Ανάκληση δικαιωμάτων Διαχειρ�
 service.gui.REVOKE_MODERATOR=Ανάκληση μεσολαβητή (moderator)
 service.gui.REVOKE_MEMBERSHIP=Ανάκληση ιδιότητος Μέλους
 service.gui.REVOKE_VOICE=Ανάκληση φωνής
-service.gui.ROOT_GROUP=Ομάδα Root
 service.gui.SAVE=&Αποθήκευση
-service.gui.SAVE_AS_DEFAULT=Αποθήκευση ως προεπιλογή
 service.gui.SEARCH=&Αναζήτηση
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Κάντε κλικ στο παρακάτω κουμπί για να εμφανισθούν όλα τα Δωμάτια Chat στον επιλεχθέντα Διακομιστή. Κατόπιν επιλέξτε εκείνον στον οποίο θέλετε να μπείτε και κάντε κλικ στο κουμπί "Σύνδεση"
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Αναζητημένη επαφή
 service.gui.SECURITY=Ασφάλεια
-service.gui.SELECT_ACCOUNT=Επιλογή λογαριασμού
 service.gui.SELECT_COLOR=Επιλογή χρώματος
 service.gui.SELECT_GROUP=Επιλογή ομάδος
-service.gui.SELECT_GROUP_WIZARD_MSG=Ο παρακάτω κατάλογος περιέχει όλες τις ομάδες στον Κατάλογο των επαφών σας. Επιλέξτε εκείνη στην οποία θέλετε να προσθέσετε την Νέα Επαφή.
 service.gui.SELECT_NO_GROUP=Καμία ομάδα
-service.gui.SELECT_GROUP_WIZARD=Επιλέξτε την ομάδα
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Ο παρακάτω κατάλογος περιέχει όλους τους λογαριασμούς που υποστηρίζουν την δυνατότητα για ταυτόχρονο chat από πολλούς χρήστες.  Επιλέξτε ποιον θα χρησιμοποιήσετε, για να φτιάξετε το δικό σας δωμάτιο chat.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Ο παρακάτω κατάλογος περιέχει όλους τους καταχωρημένους λογαριασμούς. Επιλέξτε εκείνον που θέλετε να χρησιμοποιείτε, για να επικοινωνείτε με την Νέα Επαφή.
-service.gui.SELECT_PROVIDERS_WIZARD=Επιλογή λογαριασμού
 service.gui.SELECT_VIDEO_CONFERENCE=Επιλέξτε μια τηλεδιάσκεψη
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Επιλέξτε ένα δωμάτιο συζητήσεων από τη λίστα και πατήστε στο OK για να το προσθέσετε.
 service.gui.SEND=&Αποστολή
 service.gui.SEND_FILE=Αποστολή &αρχείου
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Δεν υπάρχουν πληροφορίες για αυτή την Επαφή.
 service.gui.SEND_MESSAGE=&Αποστολή ενός μηνύματος.
-service.gui.SEND_AS_SMS=Αποστολή υπό μορφή SMS
 service.gui.SEND_PRIVATE_MESSAGE=Αποστολή ιδιωτικού μηνύματος
 service.gui.SEND_SMS=Α&ποστολή SMS
 service.gui.SEND_SMS_DETAILS=Να θυμάστε ότι πρέπει να καταχωρείτε τον αριθμό με την διεθνή μορφή, πχ. αρχίζοντας με το +30 για την Ελλάδα, +302311250040
@@ -545,7 +513,6 @@ service.gui.STREET=Οδός
 service.gui.SUBJECT=Θέμα
 service.gui.SUMMARY=Περίληψη
 service.gui.TELEPHONY=Τηλεφωνία
-service.gui.TODAY=Σήμερα
 service.gui.TOOLS=&Εργαλεία
 service.gui.TRANSFER=Μετα&φορά
 service.gui.TO=@Σε:
@@ -555,7 +522,6 @@ service.gui.TRANSFER_CALL_TO=Μεταφορά σε:
 service.gui.TRANSPARENCY_NOT_ENABLED=Οι τρέχουσες ρυθμίσεις σας δεν υποστηρίζουν την Διαφάνεια.
 service.gui.TYPE_YOUR_REQUEST=Πληκτρολογείστε το αίτημά σας εδώ
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Δεν ήταν δυνατό να αλλάξει η ποιότητα του βίντεο για αυτή την κλήση.
-service.gui.UNMUTE=Διακοπή σίγασης
 service.gui.USER_IDENTIFIER=Κωδικός ταυτοποίησης Χρήστη:
 service.gui.USER_EXISTS_ERROR=Αυτός ο χρήστης υπάρχει ήδη στο επιλεγμένο δίκτυο. Παρακαλώ επιλέξτε ένα άλλο δίκτυο.
 service.gui.USERNAME_NULL=Παρακαλώ συμπληρώστε το όνομα χρήστη και τον κωδικό σας.
@@ -568,7 +534,6 @@ service.gui.USE_PROVISIONING=Χρήση απ'ευθείας αρχικοποίη
 service.gui.VALUE=Τιμή
 service.gui.VIDEO_CALL=&Κλήση Βίντεο
 service.gui.VIA=μέσω
-service.gui.VIA_SMS=Μέσω SMS
 service.gui.VIEW=&Εμφάνιση
 service.gui.VIEW_HISTORY=&Εμφάνιση Ιστορικού
 service.gui.VIEW_SMILEYS=Εμφάνιση &smileys
@@ -588,9 +553,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Ρύθμιση ήχου
 service.gui.WAITING_AUTHORIZATION=Αναμονή εξουσιοδότησης
 service.gui.WARNING=Προειδοποίηση
 service.gui.YES=Ναι
-service.gui.YESTERDAY=Χθες
-service.gui.EXISTING_ACCOUNT_ERROR=Ο λογαριασμός που ορίσατε είναι ήδη καταχωρημένος.
-service.gui.NEW_MAIL=<b>'Εχετε νέο Ταχυδρομείο!</b><br/><b>Από:</b> {0} {1} <br/><b>Θέμα:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Παραλάβατε ένα νέο μήνυμα ταχυδρομείου στο {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Παραλάβατε δύο νέα μηνύματα ταχυδρομείου στο {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=ακόμη μία συνομιλία που δεν διαβάσατε στο <a href="{0}">inbox</a>.<br/>
@@ -614,7 +576,6 @@ service.gui.SECURITY_ERROR=Σφάλμα ασφαλείας
 service.gui.SPEED=Ταχύτητα:
 service.gui.SILENT_MEMBER=σιωπηλό μέλος
 service.gui.NON_SECURE_CONNECTION=Δε μπορεί να γίνει ασφαλής σύνδεση στο λογαριασμό {0}. Εάν επιθυμείτε να συνδεθείτε σε μη ασφαλή διακομιστή, ενεργοποιήστε την επιλογή "Να επιτρέπονται μη ασφαλείς συνδέσεις" στις ρυθμίσεις του λογαριασμού σας.
-service.gui.UPDATE=Ενημέρωση
 service.gui.MOBILE_PHONE=Κινητό
 service.gui.VIDEO_PHONE=Βίντεο
 service.gui.WORK_PHONE=Εργασία
@@ -649,12 +610,10 @@ service.gui.callinfo.CALL_INFORMATION=Πληροφορίες κλήσης
 service.gui.callinfo.CALL_IDENTITY=Ταυτότητα
 service.gui.callinfo.PEER_COUNT=Πλήθος συμμετεχόντων
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Εστίαση συνεδρίασης
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Κρυπτογράφηση ενεργοποιημένη
 service.gui.callinfo.CALL_TRANSPORT=Μέσο του καναλιού σηματοδότησης
 service.gui.callinfo.CALL_DURATION=Διάρκεια κλήσης
 service.gui.callinfo.TLS_PROTOCOL=Πρωτόκολλο TLS
 service.gui.callinfo.TLS_CIPHER_SUITE=Κρυπτογράφηση TLS
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Αλυσίδα πιστοποιητικών του διακομιστή TLS
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Το περιεχόμενο του πιστοποιητικού TLS εμφανίζεται παρακάτω.
 service.gui.callinfo.VIEW_CERTIFICATE=Προβολή πιστοποιητικού
 service.gui.callinfo.CODEC=Κωδικοποιητής / Συχνότητα
@@ -664,7 +623,6 @@ service.gui.callinfo.AUDIO_INFO=Πληροφορίες ήχου
 service.gui.callinfo.VIDEO_INFO=Πληροφορίες βίντεο
 service.gui.callinfo.LOCAL_IP=Τοπική IP / Θύρα
 service.gui.callinfo.REMOTE_IP=Απομακρυσμένη IP / Θύρα
-service.gui.callinfo.BANDWITH=Ταχύτητα σύνδεσης
 service.gui.callinfo.LOSS_RATE=Ποσοστό απώλειας
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Θόρυβος
@@ -674,10 +632,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Πρωτόκολλο ανταλλαγής κλειδιών
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Εκτεταμένος τύπος υποψηφίου ICE
 service.gui.callinfo.ICE_STATE=Κατάσταση ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Συλλογή υποψηφίων διευθύνσεων
 service.gui.callinfo.ICE_STATE.RUNNING=Έλεγχος συνδεσιμότητας
 service.gui.callinfo.ICE_STATE.COMPLETED=Ολοκληρώθηκε
 service.gui.callinfo.ICE_STATE.FAILED=Απέτυχε
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Τοπική IP / Θύρα
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Local reflexive IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Local relayed IP / Port
@@ -698,11 +659,12 @@ service.gui.ALWAYS_TRUST=Να εμπιστεύεσαι πάντα αυτό το
 service.gui.CERT_DIALOG_TITLE=Επαλήθευση Πιστοποιητικού
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>Το {0} δε μπορεί να επαληθεύσει τη ταυτότητα του διακομιστή κατά τη σύνδεση με <br><b>{1}</b>.<br><br> Το πιστοποιητικό ασφαλείας δεν είναι αξιόπιστο, οπότε η ταυτότητα του διακομιστή δε μπορεί να πιστοποιηθεί αυτόματα.<br><br> Θέλετε να συνδεθείτε; <br> Για περισσότερες πληροφορίες κάντε κλικ στο "Εμφάνιση Πιστοποιητικού".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>Το {0} δε μπορεί να επαληθεύσει τη ταυτότητα του πιστοποιητικού ασφαλείας του διακομιστή.<br><br> Το πιστοποιητικό ασφαλείας δεν είναι αξιόπιστο, οπότε η ταυτότητα του διακομιστή δε μπορεί <br> να πιστοποιηθεί αυτόματα. Θέλετε να συνδεθείτε; <br><br> Για περισσότερες πληροφορίες επιλέξτε "Εμφάνιση Πιστοποιητικού".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>Το {0} δε μπορεί να επαληθεύσει την ταυτότητα του συνδεόμενου πελάτη.<br><br> Το πιστοποιητικό ασφαλείας δεν είναι αξιόπιστο, οπότε η ταυτότητα του διακομιστή δε μπορεί <br> να πιστοποιηθεί αυτόματα. Θέλετε να δεχτείτε αυτή τη σύνδεση; <br><br> Για περισσότερες πληροφορίες επιλέξτε "Εμφάνιση Πιστοποιητικού".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>Το {0} δε μπορεί να επαληθεύσει την ταυτότητα του ομότιμου {1}.<br><br> Το πιστοποιητικό ασφαλείας δεν είναι αξιόπιστο, οπότε η ταυτότητα του διακομιστή δε μπορεί να <br> πιστοποιηθεί αυτόματα. Θέλετε να συνδεθείτε; <br><br> Για περισσότερες πληροφορίες επιλέξτε "Εμφάνιση Πιστοποιητικού".</html>
 service.gui.CONTINUE_ANYWAY=Αγνόηση και συνέχεια
 service.gui.CERT_INFO_CHAIN=Αλυσίδα πιστοποιητικών:
 service.gui.CERT_INFO_ISSUED_TO=Εκδόθηκε προς
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Κοινό Όνομα:
 service.gui.CERT_INFO_O=Οργανισμός:
 service.gui.CERT_INFO_C=Χώρα:
@@ -721,12 +683,10 @@ service.gui.CERT_INFO_SIGN_ALG=Υπογραφή Αλγορίθμου:
 service.gui.CERT_INFO_PUB_KEY_INFO=Πληροφορίες Δημοσίου Κλειδιού
 service.gui.CERT_INFO_ALG=Αλγόριθμος:
 service.gui.CERT_INFO_PUB_KEY=Δημόσιο Κλειδί:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Εκθέτης:
 service.gui.CERT_INFO_KEY_SIZE=Μέγεθος κλειδί:
 service.gui.CERT_INFO_SIGN=Υπογραφή:
-service.gui.CONTINUE=Συνέχεια
 service.gui.SHOW_CERT=Εμφάνιση Πιστοποιητικού
 service.gui.HIDE_CERT=Απόκρυψη Πιστοποιητικού
 
@@ -749,12 +709,9 @@ service.gui.security.SECURE_AUDIO=Κρυπτογραφημένο ηχητικό
 service.gui.security.AUDIO_NOT_SECURED=Μη κρυπτογραφημένο ηχητικό σήμα
 service.gui.security.SECURE_VIDEO=Κρυπτογραφημένο βίντεο
 service.gui.security.VIDEO_NOT_SECURED=Βίντεο μη κρυπτογραφημένο
-service.gui.security.NO_VIDEO=Χωρίς βίντεο
-service.gui.security.CIPHER=Αλγόριθμος κρυπτογράφησης: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Κλήση κρυπτογραφημένη. Για περισσότερες πληροφορίες πατήστε εδώ.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Κλήση μη κρυπτογραφημένη.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Κάντε κλικ εδώ για να συγκρίνετε το μυστκό συνθηματικό με τον συνομιλητή σας.
-service.gui.security.COMPARE_WITH_PARTNER=Συγκρίνατε με το συνομιλητή σας και κάντε κλικ στη κλειδαριά για επιβεβαίωση.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Συγκρίνατε με το συνομιλητή:
 service.gui.security.STRING_COMPARED=Το συνθηματικό πιστοποιήθηκε!
@@ -772,20 +729,14 @@ service.gui.avatar.imagepicker.CLICK=Κάντε κλικ και Χαμογελά
 service.gui.avatar.imagepicker.IMAGE_FILES=Αρχεία Εικόνας
 service.gui.avatar.imagepicker.IMAGE_PICKER=Φωτογραφία
 service.gui.avatar.imagepicker.IMAGE_SIZE=Μέγεθος εικόνας
-service.gui.avatar.imagepicker.INITIALIZING=Αρχικοποίηση σε εξέλιξη
 service.gui.avatar.imagepicker.RESET=Reset
 service.gui.avatar.imagepicker.SET=Καθορισμός (Set)
 service.gui.avatar.imagepicker.TAKE_PHOTO=Λήψη φωτογραφίας
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Σφάλμα της κάμερας
 
 service.gui.security.encryption.required=Απαιτείται κρυπτογράφηση!
 
 service.protocol.ICE_FAILED=Δεν ήταν δυνατή η δημιουργία σύνδεσης (το ICE απέτυχε και δεν βρέθηκε αναμεταδότης)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Παρουσιάστηκε σφάλμα στη λίστα επαφών SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Ο πόρος {0} δεν μπόρεσε να διαβαστεί. Λογαριασμός: {1}
@@ -815,9 +766,7 @@ impl.ldap.QUERY_CUSTOM=Προσαρμοσμένο ερώτημα
 impl.ldap.QUERY_CUSTOM_HINT=Χρησιμοποιήστε το {0} ως σύμβολο κράτησης θέσης για την αναζήτηση.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Αυτόματη προσθήκη μπαλαντέρ στον όρο του ερωτήματος
 impl.ldap.QUERY_PHOTO_INLINE=Λήψη φωτογραφιών μαζί με τα άλλα χαρακτηριστικά
-impl.ldap.NEW=Νέος/ Νέα
 impl.ldap.EDIT=επεξεργασία
-impl.ldap.REMOVE=Απομάκρυνση
 impl.ldap.ENABLED=Ενεργοποιήθηκε
 impl.ldap.SERVER_NAME=Όνομα διακομιστή
 impl.ldap.SERVER_NAME_EXAMPLE=Ο LDAP διακομιστής μου 
@@ -850,6 +799,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=τηλέφωνοΣπιτιού
 impl.ldap.PHONE_PREFIX=Πρόθεμα τηλεφώνου
 impl.ldap.PHONE_PREFIX_EXAMPLE=Πχ: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Κατάλογος Διευθύνσεων
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Ενεργοποίηση αναζήτησης στο Βιβλίο Διευθύνσεων MacOSX Address
@@ -864,9 +817,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Κάντε το Outlook τον
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Επαφές Google
-impl.googlecontacts.NEW=Νέος/ Νέα
 impl.googlecontacts.EDIT=επεξεργασία
-impl.googlecontacts.REMOVE=Απομάκρυνση
 impl.googlecontacts.ENABLED=Ενεργοποιήθηκε
 impl.googlecontacts.ACCOUNT_NAME=Όνομα λογαριασμού
 impl.googlecontacts.SAVE=Αποθήκευση
@@ -905,11 +856,8 @@ plugin.accountinfo.ORGANIZATION=Όνομα οργανισμού:
 plugin.accountinfo.JOB_TITLE=Τίτλος εργασίας:
 plugin.accountinfo.ABOUT_ME=Σχετικά με μένα:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Φωτογραφίες Χρήστη
 plugin.accountinfo.GLOBAL_ICON=Χρηση του γενικού εικονιδίου
 plugin.accountinfo.LOCAL_ICON=Χρήση αυτού του εικονιδίου:
-plugin.accountinfo.CHANGE=Αλλαγή
-plugin.accountinfo.ONLY_MESSAGE=Μόνον μηνύματα
 
 # connection info
 plugin.connectioninfo.TITLE=Πληροφορίες σύνδεσης
@@ -929,49 +877,12 @@ plugin.aimaccregwizz.USERNAME=Όνομα οθόνης για το ΑΙΜ
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Όνομα Οθόνης και Κωδικός Εισόδου
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Καταχώρηση νέου λογαριασμού
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Σε περίπτωση που δεν έχετε έναν λογαριασμό AIM, κάντε κλικ σε αυτό το κουμπί για να φτιάξετε έναν καινούργιο.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Παράκαμψη των προκαθορισμένων επιλογών του Διακομιστή
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Σχετικά με το {0}
 plugin.branding.LOGO_MESSAGE=VoIP Ανοικτού Κώδικα && Υπηρεσία Άμεσων Μηνυμάτων (Instant Messaging)
-plugin.branding.LOADING=Φορτώνει
 plugin.branding.ABOUT_MENU_ENTRY=&Περί
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>Το {1} είναι τρεχόντως υπό ανάπτυξη. Η έκδοση που τρέχετε είναι απλώς πειραματική και ΙΣΩΣ ΝΑ ΜΗ δουλέψει όπως θα αναμένατε. Για παραπάνω πληροφορίες, παρακαλώ ανατρέξτε στο {2}.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Με την επιφύλαξη όλων των νομίμων δικαιωμάτων. Επισκεφθείτε το <a href="http://jitsi.org">http://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>Το <b>Jitsi</b> διανέμεται με τους όρους της LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Λεξικά
-plugin.dictaccregwizz.ANY_DICTIONARY=Οποιοδήποτε Λεξικό
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Οποιοδήποτε Λεξικό από το {0}
-plugin.dictaccregwizz.FIRST_MATCH=Πρώτο ταίρασμα
-plugin.dictaccregwizz.NO_MATCH=Δεν έγινε εφικτό κανένα ταίριασμα
-plugin.dictaccregwizz.MATCH_RESULT=Δεν βρέθηκαν ορισμοί για το "{0}", ίσως να εννοείτε:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Το τρέχον Λεξικό "{0}" δεν υπάρχει πλέον σε αυτόν τον διακομιστή.
-plugin.dictaccregwizz.INVALID_STRATEGY=Η τρέχουσα στρατηγική δεν είναι διαθέσιμη στον διακομιστή.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Το Πρωτόκολλο υπηρεσιών Dict
-plugin.dictaccregwizz.HOST=Κεντρικός Υπολογιστής
-plugin.dictaccregwizz.SERVER_INFO=Πληροφορίες για τον Διακομιστή
-plugin.dictaccregwizz.STRATEGY_SELECTION=Επιλογή Στρατηγικής
-plugin.dictaccregwizz.STRATEGY_LIST=Κατάλογος στρατηγικών:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Αναζήτηση των στρατηγικών
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Η στρατηγική σε χρήση, για αναζήτηση παρόμοιων λέξεων, αν δεν βρεθεί μία μετάφραση, χάρη σε διαφορετικές προσεγγίσεις. Για παράδειγμα, οι στρατηγικές Prefix θα αναζητήσουν λέξεις που να αρχίζουν όπως και η λέξη που θέλατε να μεταφράσετε.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Πληροφορίες Λογαριασμού Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Αυτός ο Βοηθός (wizard) θα σας φτιάξει τον πρώτο σας Λογαρισμό Dict, στο dict.org.\n\nΜπορείτε να προσθέσετε ένα νέο λεξικό πηγαίνοντας στον Βοηθό Καταχώρησης Λογαριασμών. Συμπληρώστε το Πεδίο για τον host, με το λεξικό που θα θέλατε να προσθέσετε.
-plugin.dictaccregwizz.THREAD_CONNECT=Προσπάθεια σύνδεσης με τον Διακομιστή
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Αποτυχία της προσπάθειας σύνδεσης. Είτε αυτός δεν είναι ένας διακομιστής dict, είτε ο διακομιστής είναι χωρίς σύνδεση.
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Στρατηγικές ανάκτησης
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Δεν εντοπίσθηκε καμία στρατηγική στον Διακομιστή
-plugin.dictaccregwizz.POPULATE_LIST=Γεμίζει τον Κατάλογο
-plugin.dictaccregwizz.CLOSING_CONNECTION=Κλείσιμο σύνδεσης
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Για να χρησιμοποιήσετε το Facebook Chat, πρέπει να φτιάξετε έναν "Username" <br>από τη σελίδα με τις "Ρυθμίσεις του Λογαριασμού" σας, στο Facebook.</a><br><br>Σημείωση: Όταν φτιάχνετε ένα Όνομα χρήστη, πρέπει να αποσυνδεθείτε από την ιστοσελίδα<br>και μπορεί να χρειασθεί αρκετή ώρα μέχρι να μπορέσετε να μπείτε με το νέο σας όνομα χρήστη!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Το Πρωτόκολλο για το Facebook Chat
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Όνομα χρήστη:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Όνομα χρήστη και Κωδικός πρόσβασης
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Αυτόματη εκκίνηση του {0} όταν ο υπολογιστής επανεκκινεί.
@@ -982,9 +893,6 @@ plugin.generalconfig.SHOW_HISTORY=Εμφάνιση
 plugin.generalconfig.HISTORY_SIZE=πρόσφατα μηνύματα σε νέα chats
 plugin.generalconfig.SEND_MESSAGES_WITH=Στείλτε μηνύματα με το:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Μεταφορά του παραθύρου chat στο προσκήνιο.
-plugin.generalconfig.ERROR_PERMISSION=Δεν διαθέτετε επαρκή δικαιώματα για την απομάκρυνση του autostart
-plugin.generalconfig.TRANSPARENCY=Διαφάνεια
-plugin.generalconfig.ENABLE_TRANSPARENCY=Ενεργοποίηση διαφάνειας
 plugin.generalconfig.DEFAULT_LANGUAGE=Διεπαφή Γλώσσας
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Οι αλλαγές σας θα ενεργοποιηθούν με την επόμενη επανεκκίνηση.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% μεταφρασμένο
@@ -1043,13 +951,13 @@ plugin.ircaccregwizz.EXAMPLE_SERVER=Π.χ.: chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Χρησιμοποιήστε ασφαλή σύνδεση
 plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=Ενεργοποίηση παρουσίας
 plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=Ενεργοποίηση παρουσίας στα δωμάτια συζητήσεων
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} ταυτοποίηση
+plugin.ircaccregwizz.SASL_USERNAME=Όνομα χρήστη
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Το πρωτόκολλο XMPP
 plugin.jabberaccregwizz.USERNAME=XMPP όνομα χρήστη
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Επιβεβαίωση κωδικού πρόσβασης
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=Ταυτοποίηση και Κωδικός πρόσβασης
 plugin.jabberaccregwizz.CSERVER=Διακομιστής
 plugin.jabberaccregwizz.SERVER=Σύνδεση με τον διακομιστή
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Ενεργοποίηση λειτουργίας keep alive
@@ -1065,13 +973,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Σχόλιο
 plugin.jabberaccregwizz.RESOURCE=Πόροι
 plugin.jabberaccregwizz.AUTORESOURCE=Αυτόματη δημιουργία πόρων
 plugin.jabberaccregwizz.PRIORITY=Προτεραιότητα
-plugin.jabberaccregwizz.XMPP_ERROR=Σφάλμα XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Άγνωστο σφάλμα XMPP ({0}). Ελέγξτε ότι το όνομα του διακομιστή είναι σωστό.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Οι κωδικοί πρόσβασης δε ταιριάζουν.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Παράκαμψη των προκαθορισμένων επιλογών του διακομιστή
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Προχωρημένες επιλογές
 plugin.jabberaccregwizz.USE_ICE=Χρήση του ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Χρησιμοποίησε το Jingle/ICE της Google (πειραματικό)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Αυτόματος εντοπισμός (Auto-discover) διακομιστών STUN/TURN
 plugin.jabberaccregwizz.SUPPORT_TURN=Υποστήριξη του TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Όνομα χρήστη για το TURN
@@ -1099,11 +1003,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Απενεργοποίηση των μη�
 plugin.jabberaccregwizz.DTMF_AUTO=Αυτόματο: Να γίνεται αυτόματη επιλογή μεταξύ RTP και Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Επιλογές εξυπηρετητή
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Αλλαγή κωδικού πρόσβασης λογαριασμού
-plugin.jabberaccregwizz.NEW_PASSWORD=Νέος κωδικός πρόσβασης
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Επιβεβαίωση του νέου κωδικού πρόσβασης
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Παρακαλώ συμπληρώστε ένα έγκυρο αριθμό θύρας για να συνεχίσετε.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό πρόσβασης σας.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Το συνθηματικό είναι κενό.
 plugin.jabberaccregwizz.TLS_REQUIRED=Η σύνδεση δεν χρησιμοποιεί TLS, δεν θα επιχειρηθεί αλλαγή συνθηματικού.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Το συνθηματικό άλλαξε με επιτυχία.
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Ο διακομιστής XMPP δεν υποστηρίζει την αλλαγή συνθηματικού.
@@ -1117,25 +1018,9 @@ plugin.jabberaccregwizz.RESET=Επαναφορά
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Επαναφορά στις γενικές ρυθμίσεις
 plugin.jabberaccregwizz.DISABLE_JINGLE=Απενεργοποίηση Jingle (κλήσεις με εικόνα και ήχο μέσω XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Εξερχόμενο Μήνυμα:
-plugin.mailbox.INCOMING=Εισερχόμενα Μηνύματα:
-plugin.mailbox.WAIT_TIME=Καθυστέρησε ωσότου η κλήση σταλεί στο φωνητικό Ταχυδρομείο (Voicemail)
-plugin.mailbox.MAX_MESSAGE_TIME=Μέγιστη Διάρκεια Εισερχομένου Μυνήματος
-plugin.mailbox.CONFIRM=Επιβεβαίωση
-plugin.mailbox.DEFAULTS=Προκαθορισμένες επιλογές
-plugin.mailbox.MAILBOX=Γραμματοκιβώτιο
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Ένα Πρωτόκολλο για σύνδεση και chat με την υπηρεσία MSN.
-plugin.msnaccregwizz.USERNAME=Email:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Ταυτοποίηση και Κωδικός πρόσβασης
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Εγκατάσταη
 plugin.pluginmanager.UNINSTALL=Απεγκατάσταση
-plugin.pluginmanager.UPDATE=Ενημέρωση
 plugin.pluginmanager.PLUGINS=Πρόσθετα Plug-ins
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=Επιλογή Αρχείου
@@ -1160,7 +1045,6 @@ plugin.sipaccregwizz.SERVER_PORT=Θύρα Διακομιστή
 plugin.sipaccregwizz.PROXY=Διακομιστής διαμεσολάβησης (Proxy)
 plugin.sipaccregwizz.PROXY_PORT=Θύρα διακομιστή διαμεσολάβησης (Proxy)
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Προτιμώμενη μεταφορά
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Προχωρημένες επιλογές
 plugin.sipaccregwizz.PROXY_OPTIONS=Επιλογές Διακομιστή διαμεσολάβησης (Proxy)
 plugin.sipaccregwizz.PROXY_AUTO=Αυτόματη Ρύθμιση διακομιστή διαμεσολάβησης
 plugin.sipaccregwizz.ENABLE_PRESENCE=Ενεργοποίηση της Παρουσίας (ΑΠΛΟ)
@@ -1180,8 +1064,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Αυτόματο: Να γίνεται αυτόμ�
 plugin.sipaccregwizz.DTMF_RTP=RTP ( σύμφωνα με τις προτάσεις RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Εντός εύρους
-plugin.sipaccregwizz.REGISTER=ΕΓΓΡΑΦΗ
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Παράκαμψη των προκαθορισμένων επιλογών του διακομιστή
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Ενεργοποίηση υποστήριξης για απόκρυψη κλήσεων
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Αναφέρετε την υποστήριξη της ZRTP στο πρωτόκολλο σηματοδότησης
 plugin.sipaccregwizz.AUTH_NAME=Όνομα εξουσιοδότησης
@@ -1202,10 +1084,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Διεύθυνση ελέγχου τη�
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Οι κωδικοί πρόσβασης που δώσατε δε ταιριάζουν.
 plugin.sipaccregwizz.NO_CERTIFICATE=<κανένα> (χρησιμοποίησε κανονική πιστοποίηση)
 plugin.sipaccregwizz.SAVP_OPTION=Ένδειξη RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Απενεργοποιημένο (υπόδειξη μόνο RTP/AVP)
 plugin.sipaccregwizz.SAVP_OPTION_1=Υποχρεωτικό (προσφορά και αποδοχή μόνο RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Προαιρετικό (προσφορά RTP/SAVP πρώτα, μετά RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Ενεργοποίηση S-Descriptor (αλλιώς γνωστό ως SDES ή SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Επιλέξτε τα ενεργοποιημένα πρωτόκολλα κρυπτογράφησης και την προτεραιότητά τους: 
 plugin.sipaccregwizz.CIPHER_SUITES=Ενεργοποιημένες σουίτες κρυπτογράφησης:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>το {0} θα προσπαθήσει να ασφαλίσει τις κλήσεις σας αυτόματα με το ZRTP και θα σας ειδοποιήσει ηχητικά και οπτικά μόλις εδραιώσει μια ασφαλή σύνδεση. Αλλάξτε τις παρακάτω ρυθμίσεις μόνο εάν ξέρετε πολύ καλά τι κάνετε.</div></html>
@@ -1219,15 +1101,6 @@ plugin.skinmanager.DEFAULT_SKIN=Προεπιλεγμένο skin
 plugin.skinmanager.ADD_NEW_SKIN=Προσθήκη νέου skin...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Το προκαθορισμένο skin της εφαρμογής.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Ένα Πρωτόκολλο για την σύνδεση απομεμακρυσμένων μηχανημάτων μέσω SSH.
-plugin.sshaccregwizz.USERNAME=Ταυτοποίηση λογαρισμού:
-plugin.sshaccregwizz.IDENTITY_FILE=Ταυτότητα Αρχείου:
-plugin.sshaccregwizz.KNOWN_HOSTS=Καταγεγραμμένοι υπολογιστές:
-plugin.sshaccregwizz.OPTIONAL=Προαιρετικό
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Λεπτομέρειες λογαριασμού
-
 # status update
 plugin.autoaway.AUTO_STATUS=Auto Away
 plugin.autoaway.ENABLE_CHANGE_STATUS=Αλλαγή καταστάσεως (status) όταν είμαστε μακριά
@@ -1275,22 +1148,6 @@ plugin.whiteboard.DESELECT=Αποεπιλογή
 plugin.whiteboard.DELETE=Διαγραφή
 plugin.whiteboard.PROPERTIES=Ιδιότητες
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Ένα πρωτόκολλο για συνομιλία μέσω της υπηρεσίας Yahoo.
-plugin.yahooaccregwizz.USERNAME=Όνομα χρήστη:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Ταυτοποίηση και Κωδικός πρόσβασης:
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Πρωτόκολλο της υπηρεσίας Zeroconf (Bonjour)
-plugin.zeroaccregwizz.FIRST_NAME=Όνομα:
-plugin.zeroaccregwizz.LAST_NAME=Επίθετο:
-plugin.zeroaccregwizz.EMAIL=Email:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Θυμάσαι τις επαφές Bonjour ;
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=Ταυτοποίηση και Κωδικός πρόσβασης:
-plugin.zeroaccregwizz.USERID=Ταυτότητα Χρήστη:
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Το Πρωτόκολλο Google Talk
@@ -1304,19 +1161,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, the IP Telecommunications
 plugin.iptelaccregwizz.USERNAME=Όνομα χρήστη
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Εγγραφείτε στο iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP και chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Όνομα χρήστη
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Πληκτρολογείστε ξανά τον Κωδικό πρόσβασης
 plugin.sip2sipaccregwizz.EMAIL=Διεύθυνση Email 
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Για παραπάνω βοήθεια με αυτή την υπηρεσία επισκεφθείτε το<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Η διεύθυνση email χρησιμοποιείται για αποστολή φωνητικών μηνυμάτων, <br>ειδοποιήσεων περί αναπάντητων κλήσεων και για ανάκτηση χαμένων κωδικών πρόσβασης</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Για παραπάνω βοήθεια με αυτή την υπηρεσία επισκεφθείτε το<a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Υπάρχων λογαριασμός sip2sip.info 
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Δημιουργία ενός δωρεάν λογαριασμού sip2sip.info
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Υπηρεσία ανταλλαγής Άμεσων Μηνυμάτων (Instant Messaging)
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Για παραπάνω βοήθεια με αυτή την υπηρεσία επισκεφθείτε το<br>http://ippi.fr
@@ -1325,6 +1174,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Υπάρχων λογαριασμός ipp
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Δημιουργείστε έναν δωρεάν λογαριασμό ippi
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Κλείσιμο του παραθύρου του chat
 plugin.keybindings.CHAT_COPY=Αντι&γραφή
 plugin.keybindings.CHAT_CUT=Απο&κοπή
@@ -1347,10 +1197,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Όνομα
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Πρωτεύουσα συντόμευση
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Δευτερεύουσα συντόμευση
 plugin.keybindings.globalchooser.PRESS_BTN=Πιέστε για να θέσετε τη συντόμευση
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Αναμονή
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Κουμπί ομιλίας
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Ενεργοποίηση ανίχνευσης ειδικών πλήκτρων
 plugin.keybindings.PLUGIN_NAME=Keybindings
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Συζητήσεις
 plugin.keybindings.MAIN=Κυρίως
 plugin.keybindings.GLOBAL=Γενικές συντομεύσεις
@@ -1378,6 +1228,7 @@ plugin.notificationconfig.tableheader.SOUND=Αναπαραγωγή ήχου μέ
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Αναπαραγωγή ήχου μέσω της συσκευής αναπαραγωγής
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Αναπαραγωγή ήχου μέσω του ηχείου συστήματος
 plugin.notificationconfig.tableheader.DESCRIPTION=Περιγραφή συμβάντος
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Εισερχόμενη κλήση
 plugin.notificationconfig.event.SecurityMessage=Μήνυμα ασφαλείας
 plugin.notificationconfig.event.IncomingFile=Εισερχόμενο αρχείο
@@ -1479,6 +1330,7 @@ impl.neomedia.configform.VIDEO=Βίντεο
 impl.neomedia.configform.H264=Η.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Περιοδική ενδοανανέωση
 impl.neomedia.configform.H264.defaultProfile=Προεπιλεγμένο προφίλ κωδικοποίησης:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Βάση Η.264
 impl.neomedia.configform.H264.defaultProfile.high=Υψηλή
 impl.neomedia.configform.H264.defaultProfile.main=Κυρίως
@@ -1509,7 +1361,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Τρέχων Κωδικό�
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Βάλτε έναν νέο Κωδικό:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Ξαναπληκτρολογείστε τον Κωδικό πρόσβασης:
 plugin.securityconfig.masterpassword.MP_TITLE=Γενικός Κωδικός Πρόσβασης
-plugin.securityconfig.masterpassword.MP_NOT_SET=(δεν καθορίσθηκε)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Δεν πληκτρολογήσατε τον σωστό Γενικό Κωδικό Πρόσβασης. Δοκιμάστε ξανά.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Ο Γενικός Κωδικός Πρόσβασης δεν είναι ορθός!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Η Αλλαγή Κωδικού πρόσβασης απέτυχε
@@ -1525,7 +1376,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Κωδικός πρόσβασ�
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(άγνωστος)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(δεν μπορεί να αποκρυπτογραφήσει)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Αποθηκευμένοι κωδικοί πρόσβασης
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Απομάκρυνση
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Απομάκρυνση όλων
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Είστε βέβαιος ότι θέλετε να απομακρύνετε όλους τους κωδικούς ;
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Απομάκρυνση όλων των κωδικών πρόσβασης
@@ -1621,7 +1471,6 @@ plugin.globalproxy.PROXY_PORT=Θύρα διακομιστή διαμεσολάβ
 plugin.globalproxy.PROXY_USERNAME=Όνομα χρήστη Proxy
 plugin.globalproxy.PROXY_PASSWORD=Κωδικός πρόσβασης Proxy
 plugin.globalproxy.DESCRIPTION=To {0} θα χρησιμοποιεί τις παραπάνω ρυθμίσεις proxy για όλα τα δίκτυα με τα οποία συνδέεσθε ή επανασυνδέεσεθε, από τώρα και στο εξής. \nΗ υποστήριξη Proxy αυτή τη στιγμή είναι σε πειραματικό στάδιο και δουλεύει μόνο με μερικά πρωτόκολλα. Ελέγξτε τον παρακάτω πίνακα για περισσότερες λεπτομέρειες:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Χρησιμοποιήση του διακομιστή μεσολάβησης και για το DNS
 plugin.globalproxy.FWD_DNS_NOTE=Χρήσιμο όταν χρησιμοποιείτε το Tor. Αποτρέπει τη δημοσιοποίηση των δεδομένων DNS ανακατευθύνοντας μέσω του μεσολάβητή Tor όλα τα δεδομένα DNS. Δεν τίθεται σε ισχύ μέχρι να κάνετε επανεκκίνηση.
@@ -1659,7 +1508,6 @@ plugin.provisioning.RESTART_WARNING=Σημειώστε ότι οι αλλαγέ�
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Αντιγραφή του UUID στο πρόχειρο
 plugin.provisioning.CLIPBOARD_FAILED=Αποτυχία αντιγραφής του UUID στο πρόχειρο
-plugin.provisioning.EXIT_ON_FAIL=Τερματισμός εφαρμογής αν η αυτόματη τροφοδοσία ρυθμίσεων αποτύχει
 plugin.provisioning.CREDENTIALS=Πιο πρόσφατα αποθηκευμένα διαπιστευτήρια αυτόματης τροφοδοσίας ρυθμίσεων
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Είστε σίγουροι ότι θέλετε να σβήσετε το συνθηματικό για την αυτόματη τροφοδοσία ρυθμίσεων;
 plugin.provisioning.PROV_FAILED=Η παροχή πληροφοριών απέτυχε
@@ -1726,8 +1574,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">Το {0} επιχείρησε ν�
 #plugin spellcheck
 plugin.spellcheck.TITLE=Ορθογραφία και γραμματική
 plugin.spellcheck.MENU=Δείξε την ορθογραφία και γραμματική
-plugin.spellcheck.LANG=Γλώσσα
-plugin.spellcheck.EDIT_PERSONAL_DICT=Επεξεργασία
 plugin.spellcheck.ENABLE_SPELL_CHECK=Ενεργοποίηση ορθογράφου
 plugin.spellcheck.dialog.FIND=Βρες το επόμενο
 plugin.spellcheck.dialog.REPLACE=Αντικατάσταση
diff --git a/resources/languages/resources_es.properties b/resources/languages/resources_es.properties
index 2df833d..d8a746e 100644
--- a/resources/languages/resources_es.properties
+++ b/resources/languages/resources_es.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -25,15 +36,14 @@
 # from your system's language, pass the language code to ant:
 # ant -Duser.language=xx run
 
-service.gui.ABOUT=&Acerca de
-service.gui.ACCEPT=&Aceptar
+service.gui.ABOUT=Acerca de
+service.gui.ACCEPT=Aceptar
 service.gui.ACCOUNT=Cuenta
 service.gui.ACCOUNT_ME=Yo
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Asistente para registrar una cuenta
 service.gui.ACCOUNTS=Cuentas
-service.gui.ADD=&Agregar
-service.gui.ADD_ACCOUNT=Agregar cuenta
-service.gui.ADD_CONTACT=&Agregar contacto
+service.gui.ADD=Agregar
+service.gui.ADD_CONTACT=Agregar contacto
 service.gui.ADD_AUTHORIZED_CONTACT=Agregar {0} a su lista de contactos
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Agregar contacto a su lista de contactos
 service.gui.ADD_CONTACT_TO=&Agregar contacto a
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Error al agregar contacto
 service.gui.ADD_CONTACT_EXIST_ERROR=El contacto {0} ya existe en su lista de contactos.
 service.gui.ADD_CONTACT_NETWORK_ERROR=El servidor no responde a la solicitud de agregar el contacto con id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=No se pudo agregar el contacto con id: {0}. Operación no soportada.
-service.gui.ADD_CONTACT_IDENTIFIER=Introduzca en el campo inferior el identificador del contacto que desea agregar.
-service.gui.ADD_CONTACT_WIZARD=Asistente para agregar contactos
 service.gui.ADD_CONTACT_NOT_CONNECTED=Usted necesita estar conectado para agregar un contacto. Por favor, inicie sesión con el proveedor seleccionado, y vuelva a intentarlo.
 service.gui.ADD_GROUP_LOCAL_ERROR=No fue posible agregar el grupo: {0}. El problema ocurrió en una operación de entrada/salida local.
 service.gui.ADD_GROUP_EXIST_ERROR=El grupo {0} ya existe en su lista de contactos. Elija otro nombre.
 service.gui.ADD_GROUP_NET_ERROR=No se pudo agregar el grupo: {0}. El problema fue causado por un error en la red. Por favor, revise su conexión de red e inténtelo nuevamente.
 service.gui.ADD_GROUP_ERROR=No se pudo agregar el grupo: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=El nombre del grupo no puede estar vacío.
-service.gui.ADD_GROUP=Crear grupo
-service.gui.ADD_SUBCONTACT=&Agregar subcontacto
 service.gui.ADDRESS=Dirección
 service.gui.ADMINISTRATOR=administrador
 service.gui.ADVANCED=&Avanzado
-service.gui.ALL=&Todos
 service.gui.ALL_CONTACTS=&Todos los contactos
 service.gui.ALTERNATE_ADDRESS=Dirección alterna
 service.gui.APPLY=&Aplicar
@@ -65,7 +70,6 @@ service.gui.AT=a las
 service.gui.AUTHORIZE=&Autorizar
 service.gui.AUTHORIZATION_ACCEPTED={0} ha aceptado su solicitud de autorización.
 service.gui.AUTHENTICATION_FAILED=La autenticación falló para {0}. La contraseña que ha introducido no es válida.
-service.gui.AUTHENTICATION_REQUESTED=Solicitud de autenticación
 service.gui.AUTHENTICATION_REQUESTED_SERVER=El servidor {0} ha solicitado su autenticación.
 service.gui.AUTHENTICATION_REJECTED={0} ha rechazado su solicitud de autorización.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autenticación
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=En el siguiente campo, puede introducir su nue
 service.gui.CHANGE_NICKNAME_ERROR=Error al cambiar el apodo
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=El apodo ya existe
 service.gui.CHANGE_VIDEO_QUALITY=Cambiar la calidad del vídeo remoto
-service.gui.CHAT_CONFERENCE_LABEL=Conferencias
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Conferencia de {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Ya se encuentra en la sala {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=Configuración de la sala {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=ha abandonado {0}
 service.gui.CHAT_ROOM_USER_KICKED=ha sido expulsado de {0}
 service.gui.CHAT_ROOM_USER_QUIT=ha cerrado su sesión {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=El Envió de mensajes esta prohibido (revocado)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Guardar la sala de chat para uso posterior
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Eliminar la sala seleccionada de la lista de salas guardadas
 service.gui.CHAT_ROOM_NAME=Nombre de la sala de charlas
 service.gui.CLEAR_CUSTOM_MESSAGES=Limpiar mensajes personalizados
 service.gui.ROOM_NAME=Sala de charla
-service.gui.AUTOJOIN=Auto-ingresar
 service.gui.CHANGE_PASSWORD=Cambiar contraseña
 service.gui.CHAT_ROOM_NAME_INFO=Introduzca en el campo inferior el nombre con el que desea crear la sala de charlas.
 service.gui.CHAT_ROOM_NOT_EXIST=La sala {0} no existe en el servidor {1}. Por favor, compruebe que el nombre es el correcto.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Necesita estar conectado para entrar en la sala {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Tiene que estar conectado para abandonar una sala de chat.
-service.gui.CHAT_ROOM_NOT_JOINED=Necesita estar dentro de la sala de charlas para realizar acciones sobre ella.
 service.gui.CHAT_ROOM_OPTIONS=Opciones de la sala
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Necesita registrarse antes poder entrar en la sala {0}.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=La sala {0} ha solicitado contraseña.
@@ -157,16 +156,15 @@ service.gui.CONNECTING=Conectando...
 service.gui.CONNECTING_STATUS=Conectando
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Conectando*
 service.gui.CONNECTION=Conexión
-service.gui.CONNECTION_FAILED_MSG=Falló la conexión para la cuenta: Usuario: {0}, Servidor: {1}. Por favor, verifique su conexión a la red o contacte con el administrador de red para más información.
 service.gui.CONNECTION_EXPIRED_MSG=Actualmente está desconectado del servidor {0}.
 service.gui.CONTACT_NAME=ID o Número
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=El contacto {0} no soporta telefonía.
+service.gui.CONTACT_NAME_PROMPT=juana.perez@ejemplo.com
+service.gui.CONTACT_NAME_INFO=Agregar una dirección de mensajería instantánea (como juana.perez@ejemplo.com) o un número de VoIP
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=El contacto {0} no soporta conferencias.
 service.gui.CONTACT_PAUSED_TYPING={0} paró de escribir un mensaje
 service.gui.CONTACT_TYPING={0} está escribiendo un mensaje
 service.gui.CONTACT_TYPING_SEND_FAILED=oh-oh... no le pudimos decir a {0} que está escribiendo
 service.gui.CONTACT_INFO=Información de &contacto
-service.gui.CONTACTLIST=Lista de Contactos
 service.gui.CONTACTS=Contactos
 service.gui.COPY=&Copiar
 service.gui.COPY_LINK=Copiar en&lace
@@ -176,28 +174,26 @@ service.gui.CREATE_CHAT_ROOM=&Crear sala de charlas...
 service.gui.CREATE_CHAT_ROOM_ERROR=Falló la creación de la sala {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Asistente de creación de salas de charlas
 service.gui.CREATE_CONFERENCE_CALL=&Crear una conferencia...
-service.gui.CREATE_CONFERENCE_CHAT=&Crear una conferencia...
 service.gui.CREATE_GROUP=&Crear grupo...
 service.gui.CREATE_GROUP_NAME=Introduzca en el campo inferior el nombre del grupo que desea crear.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Su lista de contactos no contiene ningún grupo. Por favor, cree primero un grupo (Archivo/Crear grupo).
 service.gui.CREATE_VIDEO_BRIDGE=Crear un puente de &vídeo...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Crear un puente de &vídeo
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Crear / Unirse a videoconferencia
 service.gui.CREATE_VIDEO_CONFERENCE=Crear una nueva videoconferencia para esta sala de chat
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Este contacto no soporta información de contacto web
 service.gui.CUT=Cor&tar
-service.gui.DATE=Fecha
 service.gui.DELETE=Eliminar
 service.gui.DENY=&Denegar
 service.gui.DESKTOP_SHARING_WARNING=<b>¿Está seguro de que desea compartir su pantalla?</b> <br> Al pulsar Aceptar permitirá que los miembros de esta llamada vean su pantalla.
 service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Estás compartiendo su pantalla
 service.gui.DIALPAD=Teclado numérico
 service.gui.DISPLAY_NAME=Mostrar nombre
+service.gui.DISPLAY_NAME_PROMPT=Juana Pérez
+service.gui.DISPLAY_NAME_INFO=Agregar un nombre a este contacto. Si se deja en blanco, la dirección de de mensajería instantánea o el número de VoIP será utilizado en su lugar. (Opcional)
 service.gui.DISCONNECTED_STATUS=Desconectado
 service.gui.DND_STATUS=No molestar
 service.gui.DO_NOT_ASK_AGAIN=No volver a preguntar
 service.gui.DO_NOT_SHOW_AGAIN=No mostrar este mensaje de nuevo
-service.gui.DOWNLOAD_NOW=&Descargar ahora
 service.gui.DRAG_FOR_SHARING=Arrastre hasta aquí lo que desea compartir...
 service.gui.DURATION=duración
 service.gui.DESTROY_CHATROOM=Destruir sala de charlas
@@ -218,7 +214,6 @@ service.gui.ERROR_RECEIVED_FROM=Se recibió un error de {0}
 service.gui.ESTIMATED_TIME=Tiempo estimado:
 service.gui.EVENTS=Eventos
 service.gui.EXIT=&Salir
-service.gui.EXTENDED_CRITERIA=Criterios extendidos
 service.gui.GENERAL=General
 service.gui.GENERAL_ERROR=Error general
 service.gui.GROUP_NAME=Nombre del grupo
@@ -260,7 +255,6 @@ service.gui.FONT_ITALIC=Itálica
 service.gui.FONT_SIZE=Tamaño
 service.gui.FONT_STYLE=Estilo
 service.gui.FONT_UNDERLINE=Subrayado
-service.gui.FROM={0} de {1}
 service.gui.GRANT_OWNERSHIP=Permitir ser el propietario...
 service.gui.GRANT_ADMIN=Permitir administrar...
 service.gui.GRANT_MODERATOR=Permitir moderar
@@ -286,7 +280,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=¿Está seguro de que desea eliminar de f
 service.gui.HISTORY_REMOVE_ERROR=Error al eliminar los mensajes almacenados localmente.
 service.gui.HOME=Inicio
 service.gui.HOME_PAGE=Página inicial
-service.gui.HOUR=Hora
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identificador
 service.gui.IGNORE=&Ignorar
@@ -310,13 +303,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Invitar contactos al puente de vídeo
 service.gui.INVITE_REASON=Motivo de la invitación
 service.gui.IS_CALLING={0} está llamando...
 service.gui.IS_NOW={0} ahora es {1}
-service.gui.JITSI_WARNING=SIP Communicator ha sido renombrado recientemente como Jitsi.<br/>Si desea que su versión se mantenga actualizada, entonces debe descargar Jitsi ahora.<br/><br/>Disculpe cualquier inconveniencia que esto le pueda causar.<br/><br/>El equipo de desarrollo de Jitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator ahora es Jitsi
 service.gui.JOIN=&Entrar
 service.gui.JOIN_AS=E&ntrar como
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Unirse a una videoconferencia existente
 service.gui.JOIN_VIDEO=Unir vídeo
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Cerra&r
 service.gui.JOB_TITLE=Puesto
 service.gui.JOIN_CHAT_ROOM=&Entrar a la sala...
 service.gui.JOIN_CHAT_ROOM_TITLE=Entrar a la sala
@@ -329,7 +319,6 @@ service.gui.KICK_FAILED=Expulsar falló
 service.gui.KICK_FAILED_GENERAL_ERROR=Falló la expulsión de {0}. Ocurrió un error general en el servidor.
 service.gui.KICK_FAILED_NOT_ALLOWED=Falló la expulsión de {0}. Ni el dueño ni el administrador de la sala pueden ser expulsados.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Fallo al expulsar a {0}. No dispone de los privilegios necesarios.
-service.gui.LAST=Último
 service.gui.LAST_NAME=Apellidos:
 service.gui.LEAVE=&Abandonar
 service.gui.LIMIT_REACHED_FOR_IP=Existen muchas cuentas registradas en el servidor {0} desde su dirección IP local, y no permite establecer más.
@@ -349,7 +338,6 @@ service.gui.MESSAGE=Mensaje
 service.gui.MISSED_CALLS_TOOL_TIP=Llamadas perdidas de:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= y {0} más
 service.gui.MODERATOR=moderador
-service.gui.MORE=Ver más
 service.gui.MORE_LABEL=Ver más
 service.gui.MOVE=Mover
 service.gui.MOVE_SUBCONTACT=M&over contacto
@@ -358,7 +346,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=El contacto que ha elegido es el mismo que\n
 service.gui.MOVE_SUBCONTACT_QUESTION=¿Está seguro de querer mover a {0} a {1}?
 service.gui.MOVE_TO_GROUP=&Mover al grupo
 service.gui.MOVE_CONTACT=Mover contacto
-service.gui.MOVE_CONTACT_ERROR=El contacto no se puede mover
 service.gui.MSG_DELIVERY_FAILURE=El mensaje de arriba no pudo ser entregado
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=El protocolo que está utilizando no soporta mensajes mientras está desconectado. Puede intentar comunicarse con {0} usando otro protocolo o esperar a que se conecte.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Ocurrió un error interno. Es muy probable que sea un fallo de programación. Infórmelo en:  https://jitsi.org/Development/BugsAndIssues.
@@ -372,7 +359,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Debe estar conectado para poder enviar m
 service.gui.MULTIPLE_LOGINS=Se ha conectado más de una vez con la misma cuenta de usuario. La cuenta: Usuario: {0}, Servidor: {1} está actualmente desconectada.
 service.gui.MY_CHAT_ROOMS=Agregar sala de Chat
 service.gui.MY_CHAT_ROOMS_TITLE=Agregar sala de chat
-service.gui.MUTE=Silencio
 service.gui.MUTUALLY_ON_HOLD_STATUS=Mutuamente en Espera
 service.gui.NAME=Nombre
 service.gui.NETWORK=Red
@@ -404,7 +390,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=No está en la lista de Contactos
 service.gui.SD_QUALITY=Calidad estándar
 service.gui.OFFLINE=Desconectado
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Llamadas antiguas
 service.gui.ONLINE=Conectado
 service.gui.OPEN=Abrir
 service.gui.OPEN_FILE_FROM_IMAGE=Doble clic para abrir el archivo.
@@ -416,7 +401,6 @@ service.gui.OPEN_ON_ACTIVITY=Abrir al estar activo
 service.gui.OPEN_ON_MESSAGE=Abrir al recibir mensaje
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Solamente Abrir en mensajes importantes 
 service.gui.OR=o
-service.gui.OR_ENTER_PHONE_NUMBER=O introduzca el teléfono aquí...
 service.gui.ORGANIZATION=Organización
 service.gui.OTHER=Otro
 service.gui.chat.role.OWNER=Propietario
@@ -442,7 +426,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Intro' para sugerencias
 service.gui.PRESS_FOR_CALL_INFO=Presione para información de la llamada
 service.gui.PRESS_TO_OPEN_CRM=Presione para abrir la aplicación CRM
 service.gui.PREVIOUS=Anterior
-service.gui.PREVIOUS_TOOLTIP=Explorar conversaciones antiguas
 service.gui.PRINT=Im&primir
 service.gui.PROACTIVE_NOTIFICATION=está escribiendo
 service.gui.PROBLEMS_ENCOUNTERED=Se encontraron problemas
@@ -458,7 +441,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Ha desconectado y reconectado al servido
 service.gui.RE_REQUEST_AUTHORIZATION=Volver a solicitar autorización
 service.gui.REFERRED_STATUS=Referido
 service.gui.REJECT=&Rechazar
-service.gui.REMIND_ME_LATER=Recordarme más tarde
 service.gui.REMEMBER_PASSWORD=Recordar contraseña
 service.gui.REMOVE=&Eliminar
 service.gui.REMOVE_ACCOUNT=&Eliminar cuenta
@@ -484,29 +466,23 @@ service.gui.REVOKE_ADMIN=Cancelar admin
 service.gui.REVOKE_MODERATOR=Cancelar moderador
 service.gui.REVOKE_MEMBERSHIP=Cancelar membresía
 service.gui.REVOKE_VOICE=Cancelar voz
-service.gui.ROOT_GROUP=Grupo raíz
 service.gui.SAVE=&Guardar
-service.gui.SAVE_AS_DEFAULT=Guardar como predeterminado
 service.gui.SEARCH=&Buscar
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Presione el botón para mostrar todas las salas de conversación existentes en el servidor seleccionado. Después seleccione aquella a la que desea conectarse y presione el botón Entrar.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Contacto buscado
 service.gui.SECURITY=Seguridad
 service.gui.SELECT_ACCOUNT=Seleccionar cuenta de usuario
+service.gui.SELECT_ACCOUNT_INFO=¿Cual cuenta desea utilizar para comunicarse con este contacto?
 service.gui.SELECT_COLOR=Seleccionar color
 service.gui.SELECT_GROUP=Seleccione un grupo
-service.gui.SELECT_GROUP_WIZARD_MSG=La lista inferior contiene todos los grupos de su lista de contactos. Seleccione a la que desea agregar el nuevo contacto.
+service.gui.SELECT_GROUP_INFO=¿Que grupo desea usar para mostrar este contacto? (Opcional)
 service.gui.SELECT_NO_GROUP=Sin grupo
-service.gui.SELECT_GROUP_WIZARD=Seleccione grupo
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=La lista inferior contiene todas las cuentas de usuario que tienen soporte para chat multi usuario. Seleccione aquella que desee usar para crear la sala de chat.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=La lista inferior contiene todas las cuentas de usuario registradas. Seleccione aquellas que desee usar para comunicarse con el nuevo contacto.
-service.gui.SELECT_PROVIDERS_WIZARD=Seleccione cuenta
 service.gui.SELECT_VIDEO_CONFERENCE=Seleccionar videoconferencia
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Elija una sala de chat de la lista y presione Aceptar para agregarla
 service.gui.SEND=&Enviar
 service.gui.SEND_FILE=Enviar archivo
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=No hay información para este contacto.
 service.gui.SEND_MESSAGE=&Enviar mensaje
-service.gui.SEND_AS_SMS=Enviar como SMS
 service.gui.SEND_PRIVATE_MESSAGE=Enviar mensaje privado
 service.gui.SEND_SMS=Enviar S&MS
 service.gui.SEND_SMS_DETAILS=Recuerde que debe introducir el teléfono en formato internacional, por ejemplo: empezando por +44 para Reino Unido, +447777000000
@@ -545,7 +521,6 @@ service.gui.STREET=Calle
 service.gui.SUBJECT=Asunto
 service.gui.SUMMARY=Resumen
 service.gui.TELEPHONY=Telefonía
-service.gui.TODAY=Hoy
 service.gui.TOOLS=&Herramientas
 service.gui.TRANSFER=Trans&ferir
 service.gui.TO=&Para:
@@ -555,7 +530,6 @@ service.gui.TRANSFER_CALL_TO=Transferir a:
 service.gui.TRANSPARENCY_NOT_ENABLED=La transparencia no está soportada por su configuración actual.
 service.gui.TYPE_YOUR_REQUEST=Escriba su petición aquí
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=No es posible cambiar la calidad de vídeo de esta llamada.
-service.gui.UNMUTE=Apagar silencio
 service.gui.USER_IDENTIFIER=Identificación de usuario:
 service.gui.USER_EXISTS_ERROR=Este usuario ya existe en el servidor. Escoja otro o use otro servidor.
 service.gui.USERNAME_NULL=Por favor introduzca su nombre y contraseña.
@@ -568,7 +542,6 @@ service.gui.USE_PROVISIONING=Usar aprovisionamiento en línea
 service.gui.VALUE=Valor
 service.gui.VIDEO_CALL=&Videollamada
 service.gui.VIA=vía
-service.gui.VIA_SMS=Vía SMS
 service.gui.VIEW=&Ver
 service.gui.VIEW_HISTORY=Ver &historial
 service.gui.VIEW_SMILEYS=Ver emoticono&s
@@ -588,9 +561,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Ajustar volumen
 service.gui.WAITING_AUTHORIZATION=Esperando autorización
 service.gui.WARNING=Advertencia
 service.gui.YES=Sí
-service.gui.YESTERDAY=Ayer
-service.gui.EXISTING_ACCOUNT_ERROR=La cuenta introducida ya se encontraba instalada.
-service.gui.NEW_MAIL=<b>¡Ha recibido un correo!</b><br/><b> De:</b> {0} {1} <br/><b>Asunto:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Ha recibido un nuevo mensaje de correo en su <a href="{1}">bandeja de entrada</a> {0}:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Ha recibido {2} mensajes en su <a href="{1}">bandeja de entrada</a>{0} :<br/>
 service.gui.NEW_GMAIL_FOOTER=una o más conversaciones sin leer en su <a href="{0}">bandeja de entrada</a>.<br/>
@@ -617,7 +587,6 @@ service.gui.SECURITY_ERROR=Error de seguridad
 service.gui.SPEED=Velocidad:
 service.gui.SILENT_MEMBER=silenciar miembro
 service.gui.NON_SECURE_CONNECTION=No se puede establecer una conexión segura para la cuenta {0}. Si desea conectarse a un servidor no seguro, seleccione "Permitir conexiones no seguras" en la configuración de su cuenta
-service.gui.UPDATE=Actualizar
 service.gui.MOBILE_PHONE=Móvil
 service.gui.VIDEO_PHONE=Vídeo
 service.gui.WORK_PHONE=Trabajo
@@ -652,12 +621,10 @@ service.gui.callinfo.CALL_INFORMATION=Información de la Llamada
 service.gui.callinfo.CALL_IDENTITY=Identidad
 service.gui.callinfo.PEER_COUNT=Conteo de Participantes
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Enfocar conferencia
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Cifrado activado
 service.gui.callinfo.CALL_TRANSPORT=Señalización de transporte de llamadas
 service.gui.callinfo.CALL_DURATION=Duración de la llamada
 service.gui.callinfo.TLS_PROTOCOL=Protocolo TLS
 service.gui.callinfo.TLS_CIPHER_SUITE=Suite de cifrado TLS
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Cadena del certificado del servidor TLS
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=El contenido del certificado del servidor TLS se muestra a continuación.
 service.gui.callinfo.VIEW_CERTIFICATE=Ver Certificado
 service.gui.callinfo.CODEC=Códec / Frecuencia
@@ -677,10 +644,14 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Protocolo de intercambio de claves
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE Candidato de tipo extendido
 service.gui.callinfo.ICE_STATE=Estado de Procesamiento ICE:
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Reuniendo candidatos
 service.gui.callinfo.ICE_STATE.RUNNING=Revise conectividad
 service.gui.callinfo.ICE_STATE.COMPLETED=Terminado
 service.gui.callinfo.ICE_STATE.FAILED=Falló
+service.gui.callinfo.ICE_STATE.TERMINATED=Finalizado
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=IP local / Puerto
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=IP Local reflexiva / Puerto
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=IP Local retransmitida / Puerto
@@ -701,11 +672,12 @@ service.gui.ALWAYS_TRUST=Siempre confiar en este certificado
 service.gui.CERT_DIALOG_TITLE=Verificar Certificado
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} no puede verificar la identidad del servidor al conectarse a<br><b>{1}</b>.<br><br> El certificado no es confiable, esto significa que la identidad del servidor no puede ser verificada automáticamente. <br><br>¿Desea continuar con la conexión?<br> Para mayor información, presione "Ver Certificado".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} no puede verificar el certificado del servidor.<br><br> El certificado no es confiable, esto significa que la identidad del servidor no puede<br> ser verificada automáticamente. <br><br>¿Desea continuar con la conexión?<br><br> Para mayor información, de un clic en "Ver Certificado".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} no puede verificar la identidad del cliente.<br><br> El certificado no es confiable, esto significa que la identidad del cliente no puede<br> ser verificada automáticamente. ¿Desea continuar?<br><br> Para mayor información presione "Ver Certificado".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} no puede verificar la identidad del cliente {1}.<br><br> El certificado no es confiable, esto significa que la identidad del cliente no puede<br> ser verificada automáticamente. ¿Desea continuar con la conexión?<br><br> Para mayor información presione "Ver Certificado".</html>
 service.gui.CONTINUE_ANYWAY=Continuar de todas formas
 service.gui.CERT_INFO_CHAIN=Cadena del certificado:
 service.gui.CERT_INFO_ISSUED_TO=Emitido a
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nombre Común:
 service.gui.CERT_INFO_O=Organización:
 service.gui.CERT_INFO_C=País:
@@ -724,12 +696,10 @@ service.gui.CERT_INFO_SIGN_ALG=Algoritmo de la Firma:
 service.gui.CERT_INFO_PUB_KEY_INFO=Información de la clave pública
 service.gui.CERT_INFO_ALG=Algoritmo:
 service.gui.CERT_INFO_PUB_KEY=Clave Pública:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Exponente:
 service.gui.CERT_INFO_KEY_SIZE=Tamaño de la Clave:
 service.gui.CERT_INFO_SIGN=Firma:
-service.gui.CONTINUE=Continuar
 service.gui.SHOW_CERT=Ver Certificado
 service.gui.HIDE_CERT=Ocultar Certificado
 
@@ -752,12 +722,9 @@ service.gui.security.SECURE_AUDIO=Audio seguro
 service.gui.security.AUDIO_NOT_SECURED=Audio no seguro
 service.gui.security.SECURE_VIDEO=Vídeo seguro
 service.gui.security.VIDEO_NOT_SECURED=Vídeo no seguro
-service.gui.security.NO_VIDEO=Sin video
-service.gui.security.CIPHER=Cifrado: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Llamada asegurada. Para mayor información presione aquí.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Llamada no segura.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Presione aquí para comparar la seguridad con su contraparte.
-service.gui.security.COMPARE_WITH_PARTNER=Compare con su contacto y presione en el candado para confirmar.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Comparar con su contra-parte.
 service.gui.security.STRING_COMPARED=¡Cadena comparada!
@@ -775,20 +742,20 @@ service.gui.avatar.imagepicker.CLICK=Presione y Sonría
 service.gui.avatar.imagepicker.IMAGE_FILES=Archivos de imágenes
 service.gui.avatar.imagepicker.IMAGE_PICKER=Imagen
 service.gui.avatar.imagepicker.IMAGE_SIZE=Tamaño de imagen
-service.gui.avatar.imagepicker.INITIALIZING=Inicializando
 service.gui.avatar.imagepicker.RESET=Reiniciar
 service.gui.avatar.imagepicker.SET=Definir
 service.gui.avatar.imagepicker.TAKE_PHOTO=Tomar una foto
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Error en cámara web
 
 service.gui.security.encryption.required=¡Cifrado requerido!
 
 service.protocol.ICE_FAILED=No se pudo establecer una conexión (falló ICE y no se encontró relé)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
+service.systray.MODE=Modo bandeja
+service.systray.mode.NATIVE=Predeterminado
+service.systray.mode.DISABLED=Desactivado
+service.systray.mode.APPINDICATOR=AppIndicator (Unity, KDE, not plain Gnome 3; puede fallar en Debian)
+service.systray.mode.APPINDICATOR_STATIC=AppIndicator Estático (sin menú de estado de la cuenta)
+service.systray.CLI_NOTE=Si su elección no funciona, puede iniciar {0} con la opción "--notray". Esta opción va a forzar el modo de bandeja como "Desactivado" y muestra la Interfaz gráfica. Cambiar la implementación de la bandeja requiere reiniciar.
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Error en almacenamiento de lista de contactos SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=No se pueden leer los recusros {0}. De {1}
@@ -818,9 +785,7 @@ impl.ldap.QUERY_CUSTOM=Consulta personalizada
 impl.ldap.QUERY_CUSTOM_HINT=Usar {0} como un marcador para el término de búsqueda.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Añadir automáticamente comodines en la consulta
 impl.ldap.QUERY_PHOTO_INLINE=Obtener foto junto con otros atributos
-impl.ldap.NEW=Nuevo
 impl.ldap.EDIT=editar
-impl.ldap.REMOVE=Eliminar
 impl.ldap.ENABLED=Activado
 impl.ldap.SERVER_NAME=Nombre del Servidor
 impl.ldap.SERVER_NAME_EXAMPLE=Mi servidor LDAP
@@ -853,6 +818,12 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=TeléfonoCasa
 impl.ldap.PHONE_PREFIX=Prefijo del teléfono
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ej: 00
 
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS=''{0}'' no es una dirección SIP válida.
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS=''{0}'' no es un JID de XMPP válido.
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Libreta de direcciones
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Activar búsqueda en la Libreta de Direcciones de MacOSX
@@ -867,9 +838,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Hacer a Outlook su cliente de c
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Contactos de Google
-impl.googlecontacts.NEW=Nuevo
 impl.googlecontacts.EDIT=editar
-impl.googlecontacts.REMOVE=Eliminar
 impl.googlecontacts.ENABLED=Activado
 impl.googlecontacts.ACCOUNT_NAME=Nombre de cuenta
 impl.googlecontacts.SAVE=Guardar
@@ -878,6 +847,10 @@ impl.googlecontacts.USERNAME=Nombre de cuenta
 impl.googlecontacts.PASSWORD=Contraseña
 impl.googlecontacts.PREFIX=Prefijo del teléfono
 impl.googlecontacts.WRONG_CREDENTIALS=Credenciales erróneas de la cuenta de Google {0}
+impl.googlecontacts.OAUTH_DIALOG_TITLE=Autorización de contactos de Google
+impl.googlecontacts.INSTRUCTIONS=<html><p><b>Presione en el enlace de abajo para aprobar el plugin de contactos para acceder a la cuenta de Google .</b><br><br> Al presionar en el enlace, se abrirá una página web en su navegador. Inicie sesión con la cuenta solicitada y apruebe el acceso. Una vez aprobado, Google le mostrará un código. Copie este código en el campo de texto de abajo y presione en 'Guardar'.</p><p>Esta es una operación de una sola vez. se almacenarán tokens de autorización para su uso futuro.</p></html>
+impl.googlecontacts.CODE=Código:
+impl.googlecontacts.HYPERLINK_TEXT=Presione aquí para aprobar el acceso a {0}
 
 # account info
 plugin.accountinfo.TITLE=Información de la cuenta
@@ -908,11 +881,8 @@ plugin.accountinfo.ORGANIZATION=Nombre de la organización:
 plugin.accountinfo.JOB_TITLE=Puesto:
 plugin.accountinfo.ABOUT_ME=Información sobre mí:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Fotos
 plugin.accountinfo.GLOBAL_ICON=Usar icono global
 plugin.accountinfo.LOCAL_ICON=Usar este ícono:
-plugin.accountinfo.CHANGE=Cambiar
-plugin.accountinfo.ONLY_MESSAGE=Sólo mensajes
 
 # connection info
 plugin.connectioninfo.TITLE=Información de la conexión
@@ -932,52 +902,15 @@ plugin.aimaccregwizz.USERNAME=Usuario AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Usuario y Contraseña
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Registrar nueva cuenta
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=En el caso de no disponer de una cuenta AIM, presione este botón para crear una nueva.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Modificar las opciones predeterminadas del servidor
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Acerca de {0}
 plugin.branding.LOGO_MESSAGE=VoIP && Mensajería Instantánea.
-plugin.branding.LOADING=Cargando
 plugin.branding.ABOUT_MENU_ENTRY=&Acerca de
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} se está desarrollando actualmente. La versión que está ejecutando es únicamente experimental y PUEDE QUE NO se comporte como espera. Por favor, consulte a {2} para más información.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c) 2003-2013 Copyright <b>jitsi.org</b>. Todos los derechos reservados. Visite <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>The <b>Jitsi</b> se distribuye bajo los términos de la licencia LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
+plugin.branding.COPYRIGHT_LICENSE=<DIV><font size=3 color={0}>Copyright 2003-{1} <a href="{2}"><b>{3}</b></a>, Todos los derechos reservados.</font><br><br>{4} es distribuido bajo los términos de <a href="{5}">{6}</a>.</DIV>
 
 plugin.busylampfield.PICKUP=Tomar llamada
 
-# Dict protocol
-service.protocol.DICTIONARIES=Diccionarios
-plugin.dictaccregwizz.ANY_DICTIONARY=Cualquier Diccionario
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Cualquier Diccionario de {0}
-plugin.dictaccregwizz.FIRST_MATCH=Primera Coincidencia
-plugin.dictaccregwizz.NO_MATCH=Sin coincidencias
-plugin.dictaccregwizz.MATCH_RESULT=No hay definiciones para "{0}", puede ser:\n
-plugin.dictaccregwizz.INVALID_DATABASE=El diccionario "{0}" ya no existe en el servidor.
-plugin.dictaccregwizz.INVALID_STRATEGY=La estrategia no está disponible en el servidor.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=El protocolo de servicio Dict
-plugin.dictaccregwizz.HOST=Anfitrión
-plugin.dictaccregwizz.SERVER_INFO=Información del Servidor
-plugin.dictaccregwizz.STRATEGY_SELECTION=Selección de Estrategia
-plugin.dictaccregwizz.STRATEGY_LIST=Lista de estrategias:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Buscar estrategias
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=La estrategia se usa para buscar palabras similares si una traducción no se encuentra, gracias a distintos enfoques. Por ejemplo las estrategias de prefijo buscan palabras que empiezan como la palabra que desea traducir.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Infomación de la cuenta Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Este asistente creará su primera cuenta Dict por usted en dict.org.\n\nPuede agregar nuevos diccionarios usando el asistente de registro de cuentas. Complete el campo de anfitrión con el diccionario que desee agregar.
-plugin.dictaccregwizz.THREAD_CONNECT=Intentado conectarse al servidor
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Fallo el intento de conexión, No es un servidor dict o está apagado
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Recuperando estrategias
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=No hay estrategía en el servidor
-plugin.dictaccregwizz.POPULATE_LIST=Generando lista
-plugin.dictaccregwizz.CLOSING_CONNECTION=Cerrando conexión
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Para poder usar los chat de Facebook necesita crear un "Usuario" <br>desde la "Configuración de Cuenta" en Facebook.</a><br><br>Nota: ¡Cuando crea un usuario debe salir de la página <br>y esto puede tomar tiempo antes de que pueda iniciar sesión con el nuevo usuario!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Protocolo de Chat de Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Usuario:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Usuario y Contraseña
-
 # generalconfig
 plugin.generalconfig.AUTO_START=Auto - Iniciar {0} cuando arranque o reinicie el sistema
 plugin.generalconfig.CHATALERTS_ON_MESSAGE=Utilizar alertas en la barra de tareas / dock para llamadas entrantes y charlas
@@ -987,9 +920,6 @@ plugin.generalconfig.SHOW_HISTORY=Mostrar
 plugin.generalconfig.HISTORY_SIZE=últimos mensajes en conversaciones
 plugin.generalconfig.SEND_MESSAGES_WITH=Enviar mensajes usando:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Traer la ventana del chat al frente
-plugin.generalconfig.ERROR_PERMISSION=No dispone de los privilegios necesarios para desactivar el inicio automático
-plugin.generalconfig.TRANSPARENCY=Transparencia
-plugin.generalconfig.ENABLE_TRANSPARENCY=Activar transparencia
 plugin.generalconfig.DEFAULT_LANGUAGE=Idioma de la Interfaz
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Los cambios se llevarán a cabo al reiniciar.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% traducido
@@ -1005,6 +935,8 @@ plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Eliminar símbolos especiales
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Convertir letras a números de teléfono
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=ejemplo. +1-800-MYPHONE -> +1-800-694663
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.XMPP_USE_ALL_RESOURCES=Utilizar todos los recursos al detectar características de un contacto
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Tasa de muestreo:
 plugin.generalconfig.OPUS_BITRATE=Tasa de bits media (kbps) del Encoder:
@@ -1018,6 +950,7 @@ plugin.generalconfig.SILK_ALWAYS_ASSUME_PACKET_LOSS=Suponer siempre la pérdida
 plugin.generalconfig.SILK_SAT=Umbral de actividad de voz (0-1):
 plugin.generalconfig.SILK_ADVERTISE_FEC=Anunciar soporte a FEC en SDP:
 plugin.generalconfig.RESTORE=Restaurar opciones predeterminadas
+plugin.generalconfig.MINIMIZE_NOT_HIDE=Minimizar la ventana principal en lugar cerrarla o esconderla
 
 # gibberish accregwizz
 plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
@@ -1076,13 +1009,10 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Comentarios
 plugin.jabberaccregwizz.RESOURCE=Recurso
 plugin.jabberaccregwizz.AUTORESOURCE=Auto generar recurso
 plugin.jabberaccregwizz.PRIORITY=Prioridad
-plugin.jabberaccregwizz.XMPP_ERROR=Error XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Error desconocido de XMPP ({0}). Verifique que el nombre del servidor es correcto.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Sus contraseñas no coinciden.
 plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Modificar las opciones predeterminadas del servidor
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Opciones avanzadas
 plugin.jabberaccregwizz.USE_ICE=Usar ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Utilizar Jingle/ICE de Google (experimental)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Auto descubrir servidores STUN/TURN
 plugin.jabberaccregwizz.SUPPORT_TURN=Soporte TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Nombre de usuario TURN
@@ -1110,11 +1040,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Desactivar copias de los mensajes
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Selecciona automáticamente entre RTP y en banda
 plugin.jabberaccregwizz.SERVER_OPTIONS=Opciones de servidor
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Cambiar contraseña de la cuenta
-plugin.jabberaccregwizz.NEW_PASSWORD=Nueva contraseña
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirmar nueva contraseña
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Por favor introduzca un número de puerto válido para continuar.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Tiene que iniciar sesión en la cuenta para poder cambiar la contraseña.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=La contraseña esta vacía.
 plugin.jabberaccregwizz.TLS_REQUIRED=La conexión no usa TLS, no se realizará el cambio de contraseña.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=La contraseña se cambio con éxito
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Su servidor de XMPP no soporta el cambio de contraseña.
@@ -1128,21 +1055,6 @@ plugin.jabberaccregwizz.RESET=Reiniciar
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Reiniciar a la configuración global
 plugin.jabberaccregwizz.DISABLE_JINGLE=Desactivar Jingle (llamadas de audio y vídeo con XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Mensaje saliente:
-plugin.mailbox.INCOMING=Mensaje entrante:
-plugin.mailbox.WAIT_TIME=Espera hasta que la llamada es enviada al buzón de voz
-plugin.mailbox.MAX_MESSAGE_TIME=Duración máxima del mensaje entrante
-plugin.mailbox.CONFIRM=Confirmar
-plugin.mailbox.DEFAULTS=Predeterminados
-plugin.mailbox.MAILBOX=Buzón
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Protocolo para conectarse y conversar mediante el protocolo MSN.
-plugin.msnaccregwizz.USERNAME=Correo:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID y Contraseña
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Instalar
 plugin.pluginmanager.UNINSTALL=Desinstalar
@@ -1171,9 +1083,9 @@ plugin.sipaccregwizz.SERVER_PORT=Puerto del servidor
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Puerto del proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Transporte preferido
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Opciones avanzadas
 plugin.sipaccregwizz.PROXY_OPTIONS=Opciones del proxy
 plugin.sipaccregwizz.PROXY_AUTO=Configurar proxy de forma automática
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Ignorar control de seguridad del proxy, seleccione en escenarios de alta disponibilidad (use sólo si es necesario)
 plugin.sipaccregwizz.ENABLE_PRESENCE=Activar presencia (SIMPLE)
 plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Forzar envío de presencia mediante peer-to-peer
 plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Tiempo de sondeo de contactos desconectados (en s.)
@@ -1191,8 +1103,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Selecciona automáticamente entre RTP y en
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=En banda
-plugin.sipaccregwizz.REGISTER=REGISTRO
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Modificar las opciones predeterminadas del servidor
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Activar soporte para llamadas cifradas
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Indique el soporte de ZRTP en el protocolo de señalización
 plugin.sipaccregwizz.AUTH_NAME=Nombre autorizado
@@ -1213,10 +1123,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Revisar URI de Correo de Voz
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Sus contraseñas no coinciden.
 plugin.sipaccregwizz.NO_CERTIFICATE=<ninguno> (use autenticación regular)
 plugin.sipaccregwizz.SAVP_OPTION=indicador RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Apagado (indica RTP/AVP solamente) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Obligatorio (ofrece y acepta RTP/SAVP solamente)
 plugin.sipaccregwizz.SAVP_OPTION_2=Opcional (ofrece primero RTP/SAVP, y después RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Habilitar S-Descriptor (también conocido como SDES o SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Elegir protocolos con cifrado habilitado y su prioridad (superior como primer protocolo):
 plugin.sipaccregwizz.CIPHER_SUITES=Habilita suites de cifrado:
 plugin.sipaccregwizz.SECURITY_WARNING=<html> <div width=450> {0} automáticamente tratará de garantizar todas sus llamadas con ZRTP y podrá oír y ver una notificación una vez que una conexión segura se establece. Sólo debe cambiar la configuración avanzada si sabe muy bien lo que está haciendo. </div> </html>
@@ -1230,15 +1140,6 @@ plugin.skinmanager.DEFAULT_SKIN=Tema predeterminado
 plugin.skinmanager.ADD_NEW_SKIN=Agregar un nuevo tema...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=El tema predeterminado de la aplicación.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Protocolo para conectarse remotamente a distintas máquinas usando SSH.
-plugin.sshaccregwizz.USERNAME=ID de cuenta:
-plugin.sshaccregwizz.IDENTITY_FILE=Archivo de identidad:
-plugin.sshaccregwizz.KNOWN_HOSTS=Anfitriones conocidos:
-plugin.sshaccregwizz.OPTIONAL=Opcional
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Detalles de la cuenta
-
 # status update
 plugin.autoaway.AUTO_STATUS=Auto Ausente
 plugin.autoaway.ENABLE_CHANGE_STATUS=Cambiar el estado si no estoy presente
@@ -1286,22 +1187,6 @@ plugin.whiteboard.DESELECT=Deseleccionar
 plugin.whiteboard.DELETE=Eliminar
 plugin.whiteboard.PROPERTIES=Propiedades
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Protocolo para conectarse y conversar en el Servicio de Yahoo!.
-plugin.yahooaccregwizz.USERNAME=Usuario:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Usuario y Contraseña
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=El protocolo de servicio Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Nombre:
-plugin.zeroaccregwizz.LAST_NAME=Apellidos:
-plugin.zeroaccregwizz.EMAIL=Email:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=¿Recordar contactos de Bonjour?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID y Contraseña
-plugin.zeroaccregwizz.USERID=User ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Protocolo Google Talk
@@ -1315,19 +1200,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, el Portal de Telecomunica
 plugin.iptelaccregwizz.USERNAME=Usuario
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Inscribirse a iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP y charlas
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Usuario
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Escriba nuevamente la contraseña
 plugin.sip2sipaccregwizz.EMAIL=Dirección de correo
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Si necesita ayuda sobre este servicio visite<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>La dirección de correo es usada para enviar mensajes del correo de voz, <br>notificaciones de llamadas perdidas y para recuperar una contraseña</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Si necesita ayuda sobre este servicio visite <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Cuenta actual de sip2sip.info
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Crear una cuenta gratuita de sip2sip.info
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP y Mensajero Instantáneo
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Si necesita ayuda sobre este servicio visite<br>http://ippi.fr
@@ -1336,6 +1213,8 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Cuenta ippi existente
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Crear una cuenta ippi gratuita
 
 # key binding chooser
+plugin.keybindings.WAITING=Pulsar acceso rápido...
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Cerrar ventana de charla
 plugin.keybindings.CHAT_COPY=Copiar
 plugin.keybindings.CHAT_CUT=Cortar
@@ -1358,10 +1237,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Nombre
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=acceso directo principal
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=acceso directo secundario
 plugin.keybindings.globalchooser.PRESS_BTN=Pulse para establecer atajo
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Esperando
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Presione para hablar
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Activar la detección de teclas especiales
 plugin.keybindings.PLUGIN_NAME=Asignación de teclas
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Charla
 plugin.keybindings.MAIN=Principal
 plugin.keybindings.GLOBAL=Accesos rápidos globales
@@ -1389,6 +1268,7 @@ plugin.notificationconfig.tableheader.SOUND=Reproducir un sonido a través del d
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Reproducir un sonido a través del dispositivo de reproducción
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Reproducir un sonido a través del dispositivo de altavoz del PC
 plugin.notificationconfig.tableheader.DESCRIPTION=Descripción del evento
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Llamada Entrante
 plugin.notificationconfig.event.SecurityMessage=Mensaje de Seguridad
 plugin.notificationconfig.event.IncomingFile=Recibiendo Archivo
@@ -1490,6 +1370,7 @@ impl.neomedia.configform.VIDEO=Vídeo
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Actualización Periodica de Intra
 impl.neomedia.configform.H264.defaultProfile=Perfil para codificar en:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Base
 impl.neomedia.configform.H264.defaultProfile.high=Alto
 impl.neomedia.configform.H264.defaultProfile.main=Principal
@@ -1520,7 +1401,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Contraseña actual:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Escriba su nueva contraseña:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Reescribir la contraseña:
 plugin.securityconfig.masterpassword.MP_TITLE=Contraseña Maestra
-plugin.securityconfig.masterpassword.MP_NOT_SET=(no configurado)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=No introdujo la Contraseña Maestra correcta. Por favor inténtelo nuevamente.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=¡La Contraseña Maestra no es correcta!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Falló el Cambio de Contraseña
@@ -1632,7 +1512,7 @@ plugin.globalproxy.PROXY_PORT=Puerto del proxy
 plugin.globalproxy.PROXY_USERNAME=Usuario del Proxy
 plugin.globalproxy.PROXY_PASSWORD=Contraseña del Proxy
 plugin.globalproxy.DESCRIPTION={0} usará la configuración del proxy para todas las redes a las que está conectado o se conecte de ahora en adelante. \nEl soporte de proxy es experimental y solo funciona con algunos protocolos. Revise la siguiente tabla para más detalles:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
+plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Proxy también de DNS
 plugin.globalproxy.FWD_DNS_NOTE=Es útil con Tor. Ayuda a evitar las fuga de DNS mediante el envío de todo el tráfico de DNS al proxy de Tor. Requiere reiniciar.
@@ -1670,7 +1550,6 @@ plugin.provisioning.RESTART_WARNING=¡Tenga en cuenta que los cambios sólo surt
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Copiar UUID al portapapeles
 plugin.provisioning.CLIPBOARD_FAILED=Falló el copiado de UUID al portapapeles
-plugin.provisioning.EXIT_ON_FAIL=Salir de la aplicación si el aprovisionamiento falla
 plugin.provisioning.CREDENTIALS=Últimas credenciales de aprovisionamiento almacenadas
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=¿Está seguro que desea eliminar la contraseña de aprovisionamiento?
 plugin.provisioning.PROV_FAILED=Falló el aprovisonamiento
@@ -1737,8 +1616,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} ha tratado de conectarse al s
 #plugin spellcheck
 plugin.spellcheck.TITLE=Ortografía y Gramática
 plugin.spellcheck.MENU=Mostrar Ortografía y Gramática
-plugin.spellcheck.LANG=Idioma
-plugin.spellcheck.EDIT_PERSONAL_DICT=Editar
 plugin.spellcheck.ENABLE_SPELL_CHECK=Activar revisión ortográfica
 plugin.spellcheck.dialog.FIND=Buscar siguiente
 plugin.spellcheck.dialog.REPLACE=Reemplazar
diff --git a/resources/languages/resources_fi.properties b/resources/languages/resources_fi.properties
index 2fe17fc..726c514 100644
--- a/resources/languages/resources_fi.properties
+++ b/resources/languages/resources_fi.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,38 +43,33 @@ service.gui.ACCOUNT_ME=Minä
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Tilin Rekisteröinti Apuri
 service.gui.ACCOUNTS=Tilit
 service.gui.ADD=&Lisää
-service.gui.ADD_ACCOUNT=Lisää tili
 service.gui.ADD_CONTACT=&Lisää kontakti
 service.gui.ADD_AUTHORIZED_CONTACT=Lisää {0} kontakti listallesi
+service.gui.ADD_CONTACT_TO_CONTACTLIST=Lisää henkilö kontaktilistallesi
 service.gui.ADD_CONTACT_TO=&Lisää kontakti
 service.gui.ADD_CONTACT_ERROR=Epäonnistui lisäämään kontaktin tunnuksella: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Kontaktin lisäys Virhe
-service.gui.ADD_CONTACT_EXIST_ERROR=Kontakti {0} löytyy jo sinun kontakti listalta.
+service.gui.ADD_CONTACT_EXIST_ERROR=Kontakti {0} löytyy jo sinun kontaktilistalta.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Palvelin ei vastannut pyyntöön lisätä kontaktia tunnuksella: {0}
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Epäonnistui lisäämään kontaktin tunnuksella: {0}. Ei tuettu toiminto.
-service.gui.ADD_CONTACT_IDENTIFIER=Anna alapuolella olevaan kenttään lisättävän kontaktin tunniste.
-service.gui.ADD_CONTACT_WIZARD=Lisää kontakti apuri
 service.gui.ADD_CONTACT_NOT_CONNECTED=Sinun täytyy olla yhdistettynä lisääksesi kontaktin. Kirjaudu sisään valituun palveluun ja yritä uudelleen.
 service.gui.ADD_GROUP_LOCAL_ERROR=Ryhmän {0} nimen lisääminen epäonnistui. Ongelma tapahtui paikallisen IO operaation aikana.
-service.gui.ADD_GROUP_EXIST_ERROR=Ryhmä {0} löytyy jo kontakti listasta. Valitse toinen nimi.
+service.gui.ADD_GROUP_EXIST_ERROR=Ryhmä {0} löytyy jo kontaktilistasta. Valitse toinen nimi.
 service.gui.ADD_GROUP_NET_ERROR=Ryhmän {0} nimen lisääminen epäonnistui. Ongelma tapahtui verkko ongelman takia. Tarkista että verkkoyhteys toimii ja yritä uudelleen.
 service.gui.ADD_GROUP_ERROR=Ryhmän {0} nimen lisääminen epäonnistui.
 service.gui.ADD_GROUP_EMPTY_NAME=Ryhmän nimi ei voi olla tyhjä.
-service.gui.ADD_GROUP=Luo ryhmä
-service.gui.ADD_SUBCONTACT=&Lisää ali-kontakti
 service.gui.ADDRESS=Osoite
 service.gui.ADMINISTRATOR=ylläpitäjä
 service.gui.ADVANCED=&Edistynyt
-service.gui.ALL=&Kaikki
 service.gui.ALL_CONTACTS=&Kaikki kontaktit
+service.gui.ALTERNATE_ADDRESS=Toissijainen osoite
 service.gui.APPLY=&Käytä
-service.gui.ARE_CALLING=soittaa...
+service.gui.ARE_CALLING={0} soittaa...
 service.gui.ARE_NOW=Olet nyt {0}
 service.gui.AT=at
 service.gui.AUTHORIZE=&Vahvista
 service.gui.AUTHORIZATION_ACCEPTED=on hyväksynyt vahvistuspyynnön.
 service.gui.AUTHENTICATION_FAILED=Tunnistus virhe {0}. Syötetty salasana ei ole oikein.
-service.gui.AUTHENTICATION_REQUESTED=Tunnistautuminen lähetetty
 service.gui.AUTHENTICATION_REQUESTED_SERVER={0} palvelin pyytää sinulta tunnistautumista.
 service.gui.AUTHENTICATION_REJECTED=eväsi sinun vahvistuspyynnön.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} tunnistautuminen
@@ -73,6 +79,7 @@ service.gui.AUTHORIZATION_RESPONSE=Vahvistus vastaus
 service.gui.AWAY_STATUS=Poissa
 service.gui.EXTENDED_AWAY_STATUS=Pidennetty poissaolo
 service.gui.BAN=&Estä
+service.gui.BANNED=estetty
 service.gui.BAN_FAILED=Estäminen epäonnistui
 service.gui.BAN_FAILED_GENERAL_ERROR=Estäminen epäonnistui {0}. Tapahtui yleinen palvelin virhe.
 service.gui.BAN_FAILED_NOT_ALLOWED=Estäminen epäonnistui {0}. Huoneen ylläpitäjää tai omistajaa ei voi estää.
@@ -85,6 +92,7 @@ service.gui.CALL=Soita
 service.gui.CALL_CONTACT=Soita kontaktille
 service.gui.CALL_FAILED=Soitto epäonnistui
 service.gui.CALL_HISTORY_TOOL_TIP=Paina tästä nähdäksesi soitto historia
+service.gui.CALL_HISTORY_GROUP_NAME=Soittohistoria
 service.gui.CALL_VIA=Soita:
 service.gui.CALL_NAME_OR_NUMBER=Soita nimellä tai numerolla
 service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=Tämä puhelu tukee ainoastaan osallistujat {0} verkosta ja sinun {1} tunnuksesta. {2} ei ole osoitetta tähän verkkoon tai tunnukseen.
@@ -100,26 +108,41 @@ service.gui.CHANGE_ROOM_SUBJECT_LABEL=Alla olevaan kenttään voit laittaa huone
 service.gui.CHANGE_NICK=Vaihda kutsumanimi
 service.gui.CHANGE_NICKNAME=Vaihda kutsumanimi...
 service.gui.CHANGE_NICKNAME_LABEL=Alla olevaan kenttään voit laittaa uuden kutsumanimen.
-service.gui.CHANGE_NICKNAME_ERROR=Tapahtui virhe muutettaessa nimeä
+service.gui.CHANGE_NICKNAME_ERROR=Lempinimeä muutettaessa tapahtui virhe
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nimi on jo käytössä
 service.gui.CHANGE_VIDEO_QUALITY=Vaihda etävideon laatu
-service.gui.CHAT_CONFERENCE_LABEL=Kokous
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=käyttäjän {0} kokouksessa
-service.gui.CHAT_ROOM_USER_JOINED=liittyi
+service.gui.CHAT_ROOM_ALREADY_JOINED=Huoneeseen {0} on jo liitytty
+service.gui.CHAT_ROOM_CONFIGURATION={0} huoneen asetukset
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Huoneen {0} asetuslomakkeen haku epäonnistui
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Huoneen {0} asetuslomakkeen haku epäonnistui. Vain huoneen omistajat voivat nähdä ja muokata asetuslomaketta.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Virhe huoneen {0} asetuslomakkeen lähetyksessä.
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_TITLE=Muokkaa jäsenlistaa
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_DESCRIPTION=Oikealla olevassa listassa on huoneen jäsenet. Kun huoneen tila on "vain jäsenille", vain listassa olevat henkilöt voivat liittyä.
+service.gui.CHAT_ROOM_USER_JOINED=liittyi {0}
 service.gui.CHAT_ROOM_USER_LEFT=on poistunut {0}
-service.gui.CHAT_ROOM_USER_QUIT=poistui {0}
+service.gui.CHAT_ROOM_USER_KICKED=potkaistiin huoneesta {0}
+service.gui.CHAT_ROOM_USER_QUIT=poistui huoneesta {0}
+service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Viestin lähetys estetty.
 service.gui.CHAT_ROOM_NAME=Keskusteluhuoneen nimi
 service.gui.ROOM_NAME=Keskusteluhuone
 service.gui.CHANGE_PASSWORD=Vaihda salasana
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Huone {0} vaatii salasanan.
 service.gui.CHAT_ROOMS=Keskusteluhuone
 service.gui.CHAT_ROOM=Keskusteluhuone
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} vaihtoi aiheeksi {1}
+service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=Voit jatkaa keskustelua huoneessa {0}
+service.gui.CHAT_NICKNAME_CHANGE={0} on nyt {1}
+service.gui.CHOOSE_CONTACT=Valitse yhteyshenkilö
+service.gui.CHOOSE_NUMBER=Valitse numero
+service.gui.CHOOSE_ACCOUNT=Valitse yksi tunnuksista
 service.gui.CLOSE=&Sulje
-service.gui.CONFIRM=Vahvista
 service.gui.CONNECTED_STATUS=Yhdistetty
 service.gui.CONNECTING=Yhdistää...
 service.gui.CONNECTING_STATUS=Yhdistää
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Yhdistää*
 service.gui.CONNECTION=Yhdistetään...
+service.gui.CONNECTION_EXPIRED_MSG=Yhteys palvelimeen {0} on katkaistu.
 service.gui.CONTACT_NAME=Tunnus tai Numero
 service.gui.CONTACT_TYPING={0} kirjoittaa viestiä
 service.gui.COPY=&Kopioi
@@ -129,8 +152,7 @@ service.gui.DELETE=Poista
 service.gui.DENY=&Estä
 service.gui.DO_NOT_ASK_AGAIN=Älä kysy uudestaan
 service.gui.DO_NOT_SHOW_AGAIN=Älä näytä tätä viestiä uudestaan
-service.gui.DOWNLOAD_NOW=&Lataa nyt
-service.gui.DRAG_FOR_SHARING=Raahaa hiirellä tähän mitä haluat jakaa...
+service.gui.DRAG_FOR_SHARING=Vedä tähän tiedosto, jonka haluat jakaa...
 service.gui.DURATION=kesto
 service.gui.EDIT=&Muokkaa
 service.gui.EMPTY_HISTORY=&Tyhjennä historia
@@ -155,16 +177,14 @@ service.gui.HIDE=Piilota
 service.gui.HISTORY=&Historia
 service.gui.HISTORY_CONTACT=Historia - {0}
 service.gui.HOME=Koti
+service.gui.INSERT_SMILEY=Lisää hymiö
 service.gui.IS_CALLING=soittaa...
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Sulje
 service.gui.KICK_FAILED_GENERAL_ERROR=Estäminen epäonnistui {0}. Tapahtui yleinen palvelin virhe.
 service.gui.KICK_FAILED_NOT_ALLOWED=Estäminen epäonnistui {0}. Huoneen ylläpitäjää tai omistajaa ei voi estää.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Estäminen epäonnistui {0}. Sinulla ei ole tarpeeksi oikeuksia estämiseen.
-service.gui.LAST=Viimeinen
 service.gui.LIST=Viimeinen
 service.gui.LOADING=Lataa...
 service.gui.MESSAGE=Viesti
-service.gui.MORE=Näytä enemmän
 service.gui.MORE_LABEL=Siirrä
 service.gui.MOVE=Siirrä
 service.gui.NEXT=&Seuraava
@@ -175,17 +195,20 @@ service.gui.NO=Ei
 service.gui.NONE=Ei mitään
 service.gui.NO_CAMERA_AVAILABLE=Ei kameraa saatavilla
 service.gui.NO_MESSAGE=Uusi viesti
+service.gui.OFFLINE=Offline
+service.gui.OK=&OK
 service.gui.ONLINE=Paikalla
 service.gui.OPEN=Avaa
 service.gui.OPEN_FOLDER=Avaa kansio
-service.gui.OPEN_IN_BROWSER=Avaa &selaimeen
+service.gui.OPEN_IN_BROWSER=Avaa &selaimessa
 service.gui.OPTIONS=Asetukset
 service.gui.OR=tai
 service.gui.ORGANIZATION=Yritys:
+service.gui.chat.role.ADMINISTRATOR=ylläpitäjä
 service.gui.PASSWORD=Salasana
 service.gui.PASTE=&Liitä
+service.gui.PORT=Portti
 service.gui.PREVIOUS=Edellinen
-service.gui.PREVIOUS_TOOLTIP=Selaa vanhoja keskusteluja
 service.gui.PRINT=&Tulosta
 service.gui.PROACTIVE_NOTIFICATION=kirjoittaa viestiä
 service.gui.PROTOCOL=Protokolla
@@ -193,34 +216,28 @@ service.gui.QUIT=&Lopeta
 service.gui.READY=Valmis
 service.gui.REASON=Syy
 service.gui.REJECT=&Hylkää
-service.gui.REMIND_ME_LATER=Muistuta myöhemmin
 service.gui.REMEMBER_PASSWORD=Muista salasana
 service.gui.REMOVE=&Poista
 service.gui.REMOVE_ACCOUNT=&Poista tili
 service.gui.REMOVE_ACCOUNT_MESSAGE=Haluatko varmasti poistaa tämän tilin?
 service.gui.SAVE=&Tallenna
-service.gui.SAVE_AS_DEFAULT=Tallenna oletuksena
 service.gui.SEARCH=&Etsi
-service.gui.SELECT_ACCOUNT=Valitse tili
-service.gui.SELECT_PROVIDERS_WIZARD=Valitse tili
 service.gui.SEND=&Lähetä
 service.gui.SEND_FILE=Lähetä &tiedosto
 service.gui.SET_STATUS_MESSAGE=Uusi tilaviesti
 service.gui.SETTINGS=&Asetukset
 service.gui.SHOW=Näytä
-service.gui.SHOW_MORE=näytä lisää...
+service.gui.SHOW_MORE=Näytä lisää...
 service.gui.SIGN_IN=Kirjaudu sisään
 service.gui.STATUS=Tila
 service.gui.SUBJECT=Aihe
 service.gui.TELEPHONY=Puhelin
-service.gui.TODAY=Tänään
 service.gui.TOOLS=&Työkalut
 service.gui.VALUE=Arvo:
 service.gui.VOICEMAIL_NO_MESSAGES=Uusi viesti
 service.gui.WARNING=Varoitus
 service.gui.YES=Kyllä
 service.gui.NEW=Uusi
-service.gui.UPDATE=Päivitys
 service.gui.MOBILE_PHONE=Matkapuhelin
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Työ
@@ -239,19 +256,22 @@ service.gui.OCTOBER=Lok
 service.gui.NOVEMBER=Mar
 service.gui.DECEMBER=Jou
 
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.COMPLETED=Valmis
 
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_O=Yritys:
 service.gui.CERT_INFO_C=Maa:
 service.gui.CERT_INFO_ST=Osavaltio tai lääni:
 service.gui.CERT_INFO_SER_NUM=Sarjanumero:
 service.gui.CERT_INFO_VER=Versio:
-service.gui.CONTINUE=Jatka
 
 service.gui.AUTO_ANSWER_VALUE=Arvo:
 service.gui.AUTO_ANSWER_VIDEO=Video
 
-service.gui.security.NO_VIDEO=Ei videoa
 # keep the following string short
 
 service.gui.avatar.CHOOSE_ICON=Valitse kuva
@@ -264,9 +284,6 @@ service.gui.avatar.imagepicker.CHOOSE_FILE=Valitse ...
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -274,20 +291,20 @@ service.gui.avatar.imagepicker.CHOOSE_FILE=Valitse ...
 # New Account Dialog
 
 # LDAP
-impl.ldap.NEW=Uusi
 impl.ldap.EDIT=&Muokkaa
-impl.ldap.REMOVE=&Poista
 impl.ldap.AUTH_NONE=Ei mitään
 impl.ldap.SAVE=&Tallenna
 impl.ldap.CANCEL=&Peruuta
 impl.ldap.PASSWORD=Salasana
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
-impl.googlecontacts.NEW=Uusi
 impl.googlecontacts.EDIT=&Muokkaa
-impl.googlecontacts.REMOVE=&Poista
 impl.googlecontacts.SAVE=&Tallenna
 impl.googlecontacts.CANCEL=&Peruuta
 impl.googlecontacts.PASSWORD=Salasana
@@ -303,9 +320,6 @@ impl.googlecontacts.PASSWORD=Salasana
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=&Tietoja
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 plugin.generalconfig.SHOW_HISTORY=Näytä
@@ -315,29 +329,22 @@ plugin.generalconfig.SHOW_HISTORY=Näytä
 # icqaccregwizz
 
 # irc accregwizz
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} tunnistautuminen
 
 # jabber accregwizz
 plugin.jabberaccregwizz.VIDEO=Video
 
-# mailbox
-plugin.mailbox.CONFIRM=Vahvista
-
-# msn accregwizz
-
 # plugin manager
-plugin.pluginmanager.UPDATE=Päivitys
 plugin.pluginmanager.NEW=Uusi
 
 # simple accregwizz
 
 # sipaccregwizz
 plugin.sipaccregwizz.XCAP_PASSWORD=Salasana
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-plugin.sshaccregwizz.OPTIONAL=Asetukset
-
 # status update
 
 # updatechecker
@@ -350,24 +357,21 @@ plugin.whiteboard.OPEN=Avaa
 plugin.whiteboard.COLOR=Väri
 plugin.whiteboard.DELETE=Poista
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=&Kopioi
 plugin.keybindings.CHAT_PASTE=&Liitä
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Keskustelu
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -381,6 +385,7 @@ impl.media.security.zrtp.TITLE=Soita
 
 impl.neomedia.configform.VIDEO=Video
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
@@ -389,7 +394,6 @@ impl.neomedia.configform.VIDEO=Video
 plugin.securityconfig.masterpassword.TITLE=Salasana
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Muista salasana
 plugin.securityconfig.masterpassword.COL_PASSWORD=Salasana
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=&Poista
 
 # otr plugin
 plugin.otr.authbuddydialog.CANCEL=&Peruuta
@@ -415,7 +419,6 @@ plugin.chatconfig.TITLE=Keskustelu
 net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=&Estä
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=&Muokkaa
 
 
 #Certificate configuration plugin
diff --git a/resources/languages/resources_fr.properties b/resources/languages/resources_fr.properties
index 6f81b83..e9aac93 100644
--- a/resources/languages/resources_fr.properties
+++ b/resources/languages/resources_fr.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Moi
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Assistant d'enregistrement de compte
 service.gui.ACCOUNTS=Comptes
 service.gui.ADD=&Ajouter
-service.gui.ADD_ACCOUNT=Ajouter un compte
 service.gui.ADD_CONTACT=&Ajouter un contact
 service.gui.ADD_AUTHORIZED_CONTACT=Ajouter {0} à votre liste de contacts
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Ajouter le contact à votre liste de contacts
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Échec lors de l'ajout du contact
 service.gui.ADD_CONTACT_EXIST_ERROR=Le contact {0} existe déjà dans votre liste de contact.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Le serveur n''a pas répondu à la requête d''ajout du contact avec l''id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Échec lors de l''ajout du contact id: {0}. L''opération n''est pas prise en charge.
-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_CONTACT_NOT_CONNECTED=Vous devez être connecté pour ajouter un contact. Veuillez vous connecter au fournisseur sélectionné avant de réessayer.
 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_EXIST_ERROR=Le groupe {0} existe déjà dans votre liste de contact. Veuillez choisir un nom différent.
 service.gui.ADD_GROUP_NET_ERROR=Échec lors de l''ajout du groupe : {0}. Le problème est dû à une erreur réseau. Veuillez vérifier votre connexion au réseau puis réessayez.
 service.gui.ADD_GROUP_ERROR=Échec lors de l''ajout du groupe : {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Le nom du groupe ne doit pas être vide.
-service.gui.ADD_GROUP=Créer un groupe
-service.gui.ADD_SUBCONTACT=&Ajouter un sous-contact
 service.gui.ADDRESS=Adresse
 service.gui.ADMINISTRATOR=administrateur
 service.gui.ADVANCED=&Avancé
-service.gui.ALL=&Tous
 service.gui.ALL_CONTACTS=&Tous les contacts
 service.gui.ALTERNATE_ADDRESS=Autre adresse
 service.gui.APPLY=&Appliquer
@@ -65,7 +70,6 @@ service.gui.AT=à
 service.gui.AUTHORIZE=Autoriser
 service.gui.AUTHORIZATION_ACCEPTED={0} a accepté votre demande d''autorisation.
 service.gui.AUTHENTICATION_FAILED=L''authentification a échoué pour {0}. Le mot de passe que vous avez fourni est incorrect.
-service.gui.AUTHENTICATION_REQUESTED=Authentification requise
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Le serveur {0} demande votre authentification.
 service.gui.AUTHENTICATION_REJECTED={0} a rejeté votre demande d''authentification.
 service.gui.AUTHENTICATION_WINDOW_TITLE=Authentification de {0}
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Vous pouvez saisir votre surnom dans le champ
 service.gui.CHANGE_NICKNAME_ERROR=Erreur lors du changement de pseudonyme
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Ce pseudonyme existe déjà
 service.gui.CHANGE_VIDEO_QUALITY=Changer la qualité de la vidéo
-service.gui.CHAT_CONFERENCE_LABEL=Conférence
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Conférence de {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Vous avez déjà rejoint la conversation {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=Configuration de la conversation {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=a quitté la conversation {0}
 service.gui.CHAT_ROOM_USER_KICKED=a été banni par {0}
 service.gui.CHAT_ROOM_USER_QUIT=a mis un terme à {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=L'envoi de message est interdit (voix annulée)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Enregistrer la discussion pour un usage futur
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Supprime la discussion sélectionnée de ma liste de favoris
 service.gui.CHAT_ROOM_NAME=Nom de la conversation
 service.gui.CLEAR_CUSTOM_MESSAGES=Effacer les messages personnalisés
 service.gui.ROOM_NAME=Conversation
-service.gui.AUTOJOIN=Connexion automatique
 service.gui.CHANGE_PASSWORD=Modifier le mot de passe
 service.gui.CHAT_ROOM_NAME_INFO=Dans le champ suivant, veuillez entrer le nom de la conversation que vous souhaitez créer.
 service.gui.CHAT_ROOM_NOT_EXIST=Le salon {0} est introuvable sur le serveur {1}. Veuillez vérifier la validité du nom que vous avez saisi.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Vous devez vous connecter pour rejoindre la conversation {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Vous devez être connecté pour pouvoir quitter une conversation.
-service.gui.CHAT_ROOM_NOT_JOINED=Vous devez d'abord rejoindre une conversation pour effectuer cette opération.
 service.gui.CHAT_ROOM_OPTIONS=Options de la conversation
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Vous devez être enregistré afin de pouvoir le rejoindre le salon {0}.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Le salon {0} nécessite un mot de passe.
@@ -151,22 +150,20 @@ service.gui.CLEAR=Effacer
 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.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Des fichier sont en cours de transfert. Êtes-vous sûr de vouloir les annuler ?
-service.gui.CONFIRM=Confirmer
 service.gui.CONNECTED_STATUS=Connecté
 service.gui.CONNECTING=Connexion...
 service.gui.CONNECTING_STATUS=Connexion
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Connexion*
 service.gui.CONNECTION=Connexion
-service.gui.CONNECTION_FAILED_MSG=Échec de connexion pour le compte : Nom d''utilisateur : {0}, Nom du serveur : {1}. Veuillez vérifier votre connexion au réseau ou contacter votre administrateur réseau pour plus d''informations.
 service.gui.CONNECTION_EXPIRED_MSG=Vous êtes déconnecté du serveur {0}.
 service.gui.CONTACT_NAME=ID ou numéro
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Le contact {0} ne supporte pas la téléphonie.
+service.gui.CONTACT_NAME_PROMPT=joan.martin@exemple.com
+service.gui.CONTACT_NAME_INFO=Ajoutez soit une adresse de messagerie instantanée - telle que joan.martin@exemple.com - ou un numéro VoIP.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Le contact {0} ne supporte pas les conférences de messagerie.
 service.gui.CONTACT_PAUSED_TYPING={0} s''est arrêté d''écrire le message
 service.gui.CONTACT_TYPING={0} écrit un message
 service.gui.CONTACT_TYPING_SEND_FAILED=Oups...nous ne pouvons envoyer à {0} la notification d''écriture
 service.gui.CONTACT_INFO=Informations sur le &contact
-service.gui.CONTACTLIST=Liste de contacts
 service.gui.CONTACTS=Contacts
 service.gui.COPY=&Copier
 service.gui.COPY_LINK=Copier &l'adresse
@@ -176,28 +173,26 @@ 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_CONFERENCE_CALL=&Créer une conférence téléphonique...
-service.gui.CREATE_CONFERENCE_CHAT=&Créer une conférence de messagerie...
 service.gui.CREATE_GROUP=&Créer un groupe...
 service.gui.CREATE_GROUP_NAME=Veuillez saisir dans le champ suivant le nom du groupe que vous désirez créer.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Votre liste de contacts ne contient aucun groupe. Veuillez créer un groupe (Fichier/Créer un groupe) en premier lieu.
 service.gui.CREATE_VIDEO_BRIDGE=Créer un &pont vidéo
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Créer un &pont vidéo
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Créer / Joindre la video conférence
 service.gui.CREATE_VIDEO_CONFERENCE=Créer une nouvelle conférence vidéo pour ce salon de discussion
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Ce contact ne dispose pas d'informations en ligne
 service.gui.CUT=&Couper
-service.gui.DATE=Date
 service.gui.DELETE=Supprimer
 service.gui.DENY=&Refuser
 service.gui.DESKTOP_SHARING_WARNING=<b>Êtes vous certain de vouloir démarrer le partage d'écran?</b> <br> En cliquant sur OK, vos correspondants sur cet appel pourront voir votre écran.
 service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Vous partagez votre écran
 service.gui.DIALPAD=Clavier téléphonique
 service.gui.DISPLAY_NAME=Nom affiché
+service.gui.DISPLAY_NAME_PROMPT=Joan Martin
+service.gui.DISPLAY_NAME_INFO=Ajouter un nom à ce contact. Si laissé vide, l'adresse de messagerie instantanée ou le numéro VoIP sera utilisé à la place. (Optionnel)
 service.gui.DISCONNECTED_STATUS=Déconnecté
 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.DOWNLOAD_NOW=&Télécharger maintenant
 service.gui.DRAG_FOR_SHARING=Glisser ici pour partager
 service.gui.DURATION=durée
 service.gui.DESTROY_CHATROOM=Supprimer le salon
@@ -218,7 +213,6 @@ service.gui.ERROR_RECEIVED_FROM=Erreur reçu de {0}
 service.gui.ESTIMATED_TIME=Temps estimé :
 service.gui.EVENTS=Événements
 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 du groupe
@@ -260,7 +254,6 @@ service.gui.FONT_ITALIC=Italique
 service.gui.FONT_SIZE=Taille
 service.gui.FONT_STYLE=Style
 service.gui.FONT_UNDERLINE=Souligné
-service.gui.FROM={0} sur {1}
 service.gui.GRANT_OWNERSHIP=Attribuer la propriété...
 service.gui.GRANT_ADMIN=Attribuer le statut administrateur...
 service.gui.GRANT_MODERATOR=Attribuer le statut modérateur
@@ -286,7 +279,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Voulez-vous vraiment supprimer définitiv
 service.gui.HISTORY_REMOVE_ERROR=Erreur lors de la suppression des messages.
 service.gui.HOME=Domicile
 service.gui.HOME_PAGE=Page d'accueil
-service.gui.HOUR=Heure
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifiant
 service.gui.IGNORE=&Ignorer
@@ -310,13 +302,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Inviter des contacts à la visio-conf
 service.gui.INVITE_REASON=Motif de l'invitation
 service.gui.IS_CALLING={0} appelle...
 service.gui.IS_NOW={0} est maintenant {1}
-service.gui.JITSI_WARNING=Le communicateur SIP a récemment été renommé Jitsi.<br/>Si vous souhaitez garder votre version à jour, veuillez télécharger Jitsi.<br/><br/>Nous sommes désolés pour ce désagrément.<br/><br/>L'équipe de développement de Jitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator devient Jitsi
 service.gui.JOIN=&Rejoindre
 service.gui.JOIN_AS=&Rejoindre comme
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Joindre une conférence vidéo existante
 service.gui.JOIN_VIDEO=Joindre avec vidéo
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Fermer
 service.gui.JOB_TITLE=Profession
 service.gui.JOIN_CHAT_ROOM=Re&joindre la conversation...
 service.gui.JOIN_CHAT_ROOM_TITLE=Rejoindre la conversation
@@ -329,7 +318,6 @@ service.gui.KICK_FAILED=Échec de la tentative d'exclusion
 service.gui.KICK_FAILED_GENERAL_ERROR=Échec de l''exclusion de {0}. Une erreur du serveur est survenue.
 service.gui.KICK_FAILED_NOT_ALLOWED=Échec de l''exclusion de {0}. Le propriétaire et l''administrateur de la conversation ne peuvent être exclus.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Échec de l''exclusion de {0}. Vous n''avez pas les droits suffisants pour cela.
-service.gui.LAST=Dernier
 service.gui.LAST_NAME=Nom :
 service.gui.LEAVE=&Quitter
 service.gui.LIMIT_REACHED_FOR_IP=Vous avez trop de connexions existantes de l''adresse IP locale et le serveur {0} ne permet pas d''en ouvrir plus.
@@ -349,7 +337,6 @@ service.gui.MESSAGE=Message
 service.gui.MISSED_CALLS_TOOL_TIP=Appels en absence de:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= ainsi que {0} autre(s)
 service.gui.MODERATOR=modérateur
-service.gui.MORE=Voir d'avantage
 service.gui.MORE_LABEL=Plus
 service.gui.MOVE=Déplacer
 service.gui.MOVE_SUBCONTACT=D&éplacer le sous-contact
@@ -358,7 +345,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Le contact choisi est le même que celui que
 service.gui.MOVE_SUBCONTACT_QUESTION=Êtes-vous sûr de vouloir déplacer {0} vers {1} ?
 service.gui.MOVE_TO_GROUP=&Déplacer vers le groupe
 service.gui.MOVE_CONTACT=D&éplacer le contact
-service.gui.MOVE_CONTACT_ERROR=Le &contact ne peut pas être déplacé
 service.gui.MSG_DELIVERY_FAILURE=Le message ci-dessus n'a pas pu être délivré
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Le protocole que vous utilisez n''offre pas le support de l''envoi de messages en mode déconnecté. Vous pouvez essayer de joindre {0} au moyen d''un autre protocole ou attendre que celui-ci se connecte.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Une erreur interne est survenue. Il s''agit certainement d''un bug. Veuillez le signaler ici : https://jitsi.org/Development/BugsAndIssues.
@@ -372,7 +358,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Vous devez être connecté pour pouvoir
 service.gui.MULTIPLE_LOGINS=Vous vous êtes connecté plus d''une fois avec le même compte. Le compte suivant : Nom d''utilisateur : {0}, Nom du serveur : {1} est actuellement déconnecté.
 service.gui.MY_CHAT_ROOMS=Ajouter un salon de discussion
 service.gui.MY_CHAT_ROOMS_TITLE=Ajouter un salon de discussion
-service.gui.MUTE=Muet
 service.gui.MUTUALLY_ON_HOLD_STATUS=Les deux en attente
 service.gui.NAME=Nom
 service.gui.NETWORK=Réseau
@@ -404,7 +389,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Pas dans la liste de contacts
 service.gui.SD_QUALITY=Qualité standard
 service.gui.OFFLINE=Déconnecté
 service.gui.OK=&Ok
-service.gui.OLDER_CALLS=Anciens appels
 service.gui.ONLINE=Connecté
 service.gui.OPEN=Ouvrir
 service.gui.OPEN_FILE_FROM_IMAGE=Double-cliquez pour ouvrir le fichier.
@@ -416,7 +400,6 @@ service.gui.OPEN_ON_ACTIVITY=Ouvrir lors d'activité
 service.gui.OPEN_ON_MESSAGE=Ouvrir seulement lors d'un message
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Ouvrir seulement lors de messages importants
 service.gui.OR=ou
-service.gui.OR_ENTER_PHONE_NUMBER=Ou entrez un numéro de téléphone ici...
 service.gui.ORGANIZATION=Entreprise :
 service.gui.OTHER=Autre
 service.gui.chat.role.OWNER=Propriétaire
@@ -442,7 +425,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Entrée' pour les suggestions
 service.gui.PRESS_FOR_CALL_INFO=Détails d'appel
 service.gui.PRESS_TO_OPEN_CRM=Appuyer pour ouvrir l'application CRM
 service.gui.PREVIOUS=Précédent
-service.gui.PREVIOUS_TOOLTIP=Parcourir les anciennes conversations
 service.gui.PRINT=&Imprimer
 service.gui.PROACTIVE_NOTIFICATION=est en train d'écrire un message
 service.gui.PROBLEMS_ENCOUNTERED=Problème survenu
@@ -458,7 +440,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Vous vous êtes déconnecté et reconnec
 service.gui.RE_REQUEST_AUTHORIZATION=Re-demander l'autorisation
 service.gui.REFERRED_STATUS=Renvoyé
 service.gui.REJECT=&Rejeter
-service.gui.REMIND_ME_LATER=Rappelez-moi plus tard
 service.gui.REMEMBER_PASSWORD=Mémoriser le mot de passe
 service.gui.REMOVE=&Supprimer
 service.gui.REMOVE_ACCOUNT=&Supprimer le compte
@@ -484,29 +465,22 @@ service.gui.REVOKE_ADMIN=Révoquer le statut administrateur
 service.gui.REVOKE_MODERATOR=Révoquer le statut modérateur
 service.gui.REVOKE_MEMBERSHIP=Révoquer le statut membre
 service.gui.REVOKE_VOICE=Révoquer le droit de parole
-service.gui.ROOT_GROUP=Groupe racine
 service.gui.SAVE=&Sauvegarder
-service.gui.SAVE_AS_DEFAULT=Enregistrer comme valeur par défaut
 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.SEARCH_STRING_CONTACT_SOURCE=Contact recherché
 service.gui.SECURITY=Sécurité
-service.gui.SELECT_ACCOUNT=Choix d'un compte
+service.gui.SELECT_ACCOUNT_INFO=Quel compte souhaitez-vous utiliser pour communiquer avec ce contact ?
 service.gui.SELECT_COLOR=Choix de la couleur
 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 celui auquel vous souhaitez ajouter un nouveau contact.
+service.gui.SELECT_GROUP_INFO=Quel groupe souhaitez-vous afficher pour ce contact ? (Optionnel)
 service.gui.SELECT_NO_GROUP=Pas de groupe
-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 celui que vous souhaitez utiliser pour communiquer avec le nouveau contact.
-service.gui.SELECT_PROVIDERS_WIZARD=Choisir un compte
 service.gui.SELECT_VIDEO_CONFERENCE=Sélectionner une vidéoconférence
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Sélectionner un salon de discussion sur la liste et appuyer sur OK pour l'ajouter.
 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 en tant que SMS
 service.gui.SEND_PRIVATE_MESSAGE=Envoyer un message privé
 service.gui.SEND_SMS=E&nvoyer un SMS
 service.gui.SEND_SMS_DETAILS=Vous devez entrer le numéro de téléphone dans un format international, par exemple en commençant par +33 pour téléphoner en France.
@@ -545,7 +519,6 @@ service.gui.STREET=Rue
 service.gui.SUBJECT=Sujet
 service.gui.SUMMARY=Résumé
 service.gui.TELEPHONY=Téléphonie
-service.gui.TODAY=Aujourd'hui
 service.gui.TOOLS=&Outils
 service.gui.TRANSFER=Trans&férer
 service.gui.TO=À :
@@ -555,7 +528,6 @@ service.gui.TRANSFER_CALL_TO=Transférer à :
 service.gui.TRANSPARENCY_NOT_ENABLED=La transparence ne peut pas être prise en charge avec votre configuration actuelle.
 service.gui.TYPE_YOUR_REQUEST=Saisissez ici votre demande
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Nous n'avons pas pu changer la qualité vidéo pour cet appel.
-service.gui.UNMUTE=Désactiver muet
 service.gui.USER_IDENTIFIER=Identificateur :
 service.gui.USER_EXISTS_ERROR=Cet utilisateur existe déjà sur le réseau sélectionné. Veuillez choisir un autre utilisateur ou réseau.
 service.gui.USERNAME_NULL=Veuillez renseigner votre nom d'utilisateur et votre mot de passe.
@@ -568,7 +540,6 @@ service.gui.USE_PROVISIONING=Utiliser le service en ligne
 service.gui.VALUE=Valeur
 service.gui.VIDEO_CALL=Appel video
 service.gui.VIA=via
-service.gui.VIA_SMS=Par SMS
 service.gui.VIEW=&Voir
 service.gui.VIEW_HISTORY=Voir l'&historique
 service.gui.VIEW_SMILEYS=Afficher les &smileys
@@ -588,9 +559,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Ajuster le volume
 service.gui.WAITING_AUTHORIZATION=Attente d'autorisation
 service.gui.WARNING=Avertissement
 service.gui.YES=Oui
-service.gui.YESTERDAY=Hier
-service.gui.EXISTING_ACCOUNT_ERROR=Le compte saisi est déjà installé.
-service.gui.NEW_MAIL=<b>Vous avez un nouvel email !</b><br/><b>De :</b> {0} {1} <br/><b>Sujet :</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Vous avez reçu un nouvel email dans votre <a href="{1}">boîte de réception</a> {0} :<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Vous avez reçu {2} nouveaux emails dans votre <a href="{1}">boîte de réception</a> {0} :<br/>
 service.gui.NEW_GMAIL_FOOTER=une conversation non-lue supplémentaire dans votre <a href="{0}">boîte de réception</a>.<br/>
@@ -602,6 +570,9 @@ service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Activer le mode plein-écran
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Désactiver le mode plein-écran
 service.gui.HOLD_BUTTON_TOOL_TIP=Activer/Désactiver la mise en attente
 service.gui.MUTE_BUTTON_TOOL_TIP=Activer/Désactiver le microphone ou ajuster le volume du microphone
+service.gui.PARK=Parcage
+service.gui.PARKING_SLOT=Place de parcage:
+service.gui.PARK_BUTTON_TOOL_TIP=Parcage de l'appel
 service.gui.RECORD_BUTTON_TOOL_TIP=Activer/Désactiver l'Enregistrement
 service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=Activer/Désactiver la Vidéo
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Montrer/cacher la vidéo locale
@@ -614,7 +585,6 @@ service.gui.SECURITY_ERROR=Erreur de sécurité
 service.gui.SPEED=Vitesse :
 service.gui.SILENT_MEMBER=membre muet
 service.gui.NON_SECURE_CONNECTION=Aucune connexion sécurisée ne peut être établie avec le compte {0}. Pour établir une connexion non sécurisée du serveur, l''option "autoriser une connexion non sécurisée" doit être activée.
-service.gui.UPDATE=Mise à jour
 service.gui.MOBILE_PHONE=Mobile
 service.gui.VIDEO_PHONE=Vidéo
 service.gui.WORK_PHONE=Professionnel
@@ -649,12 +619,10 @@ service.gui.callinfo.CALL_INFORMATION=Information d'appel
 service.gui.callinfo.CALL_IDENTITY=Identité
 service.gui.callinfo.PEER_COUNT=Nombre de participants
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Organisateur de conférences
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Encodage actif
 service.gui.callinfo.CALL_TRANSPORT=Transport du canal de signalisation
 service.gui.callinfo.CALL_DURATION=Durée d'appel
 service.gui.callinfo.TLS_PROTOCOL=Protocole TLS
 service.gui.callinfo.TLS_CIPHER_SUITE=Liste de chiffrement TLS
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Liste de certificats du serveur TLS
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Le contenu du certificat du serveur TLS est affiché ci-dessous.
 service.gui.callinfo.VIEW_CERTIFICATE=Voir le certificat
 service.gui.callinfo.CODEC=Codec / Fréquence
@@ -664,7 +632,7 @@ service.gui.callinfo.AUDIO_INFO=Information audio
 service.gui.callinfo.VIDEO_INFO=Information vidéo
 service.gui.callinfo.LOCAL_IP=IP local / Port
 service.gui.callinfo.REMOTE_IP=IP partenaire / Port
-service.gui.callinfo.BANDWITH=Largeur de bande
+service.gui.callinfo.BANDWITH=Bande passante
 service.gui.callinfo.LOSS_RATE=taux de perte
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -674,10 +642,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Protocole d'échange de clés
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Amélioration du candidat type ICE
 service.gui.callinfo.ICE_STATE=Statut du traitement ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Candidats regroupés
 service.gui.callinfo.ICE_STATE.RUNNING=contrôles de connexion
 service.gui.callinfo.ICE_STATE.COMPLETED=Terminé
 service.gui.callinfo.ICE_STATE.FAILED=Échec
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=IP local / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=IP local réfléchi / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=IP local transmis / Port
@@ -698,11 +669,12 @@ service.gui.ALWAYS_TRUST=Toujours faire confiance à ce certificat
 service.gui.CERT_DIALOG_TITLE=Vérifier le certificat
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} ne peut pas vérifier l''identité du serveur lors de la connexion à <b>{1}</b>.<br><br> Le certificat est inconnu, ce qui signifie que l''identité du serveur n''a pu être vérifiée automatiquement.<br><br>Voulez-vous poursuivre la connexion ?<br><br> Pour plus d''informations, cliquez sur "Afficher le certificat".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} ne peut pas vérifier l''identité du serveur.<br><br> Le certificat est inconnu, ce qui signifie que l''identité du serveur n''a pu être vérifiée automatiquement. Voulez-vous poursuivre la connexion ?<br><br> Pour plus d''informations, cliquez sur "Afficher le certificat".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} ne peut pas vérifier l''identité du client.<br><br> Le certificat est inconnu, ce qui signifie que l''identité du client n''a pu être vérifiée automatiquement. <br><br> Voulez-vous poursuivre la connexion ?<br><br> Pour plus d''informations, cliquez sur "Afficher le certificat".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} ne peut vérifier l''identité du vis-àvis {1}.<br><br> Le certificat est inconnu, ce qui signifie que l''identité du vis-à-vis n''a pu être vérifiée automatiquement. <br><br>Voulez-vous poursuivre la connexion ?<br><br> Pour plus d''informations, cliquez sur "Afficher le certificat".</html>
 service.gui.CONTINUE_ANYWAY=Continuer quand même
 service.gui.CERT_INFO_CHAIN=Chaîne de certificat :
 service.gui.CERT_INFO_ISSUED_TO=Émis pour
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nom Commun :
 service.gui.CERT_INFO_O=Organisation :
 service.gui.CERT_INFO_C=Pays :
@@ -721,16 +693,14 @@ service.gui.CERT_INFO_SIGN_ALG=Algorithme de signature :
 service.gui.CERT_INFO_PUB_KEY_INFO=Information sur la clé publique
 service.gui.CERT_INFO_ALG=Algorithme :
 service.gui.CERT_INFO_PUB_KEY=Clé publique :
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} octets : {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Exposant
 service.gui.CERT_INFO_KEY_SIZE=Taille de la clé :
 service.gui.CERT_INFO_SIGN=Signature :
-service.gui.CONTINUE=Continuer
 service.gui.SHOW_CERT=Afficher le certificat
 service.gui.HIDE_CERT=Masquer le certificat
 
-service.gui.AUTO_ANSWER=Réponse automatique et transmisssion de l'appel
+service.gui.AUTO_ANSWER=Réponse automatique et transmission de l'appel
 service.gui.AUTO_ANSWER_LABEL=Réponse automatique
 service.gui.AUTO_ANSWER_ALL_CALLS=Tous les appels
 service.gui.AUTO_ANSWER_ALERT_INFO_FIELDS=Uniquement pour les appels qui demandent une réponse automatique ("Alerte-info" avec "réponse automatique")
@@ -749,12 +719,9 @@ service.gui.security.SECURE_AUDIO=Audio crypté
 service.gui.security.AUDIO_NOT_SECURED=Audio non crypté
 service.gui.security.SECURE_VIDEO=Vidéo crypté
 service.gui.security.VIDEO_NOT_SECURED=Vidéo non crypté
-service.gui.security.NO_VIDEO=Aucune vidéo
-service.gui.security.CIPHER=Algorithme: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Appel crypté. Cliquez pour plus d'information.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Appel non crypté.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Cliquez ici pour comparer le secret sécurisé avec votre interlocuteur.
-service.gui.security.COMPARE_WITH_PARTNER=Comparez avec votre correspondant et cliquez sur le cadenas pour confirmer.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Comparez avec votre correspondant:
 service.gui.security.STRING_COMPARED=SAS confirmé
@@ -772,20 +739,14 @@ service.gui.avatar.imagepicker.CLICK=Cliquez et souriez
 service.gui.avatar.imagepicker.IMAGE_FILES=Fichiers d'images
 service.gui.avatar.imagepicker.IMAGE_PICKER=Image
 service.gui.avatar.imagepicker.IMAGE_SIZE=Taille de l'image
-service.gui.avatar.imagepicker.INITIALIZING=Initialisation
 service.gui.avatar.imagepicker.RESET=Réinitialiser
 service.gui.avatar.imagepicker.SET=Définir
 service.gui.avatar.imagepicker.TAKE_PHOTO=Prendre une photo
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Erreur de la webcam
 
 service.gui.security.encryption.required=Cryptage requis
 
 service.protocol.ICE_FAILED=Impossible d'établir la connexion (ICE a échoué et aucun relais n'a été trouvé)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Erreur dans les contacts SIP itinérants
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=La ressource{0} ne peut être lu. Compte: {1}
@@ -815,9 +776,7 @@ impl.ldap.QUERY_CUSTOM=Requête personnalisée
 impl.ldap.QUERY_CUSTOM_HINT=Utilisez {0} comme espace réservé pour la recherche.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Ajouter automatiquement des caractères génériques pour la requête
 impl.ldap.QUERY_PHOTO_INLINE=Récupérer la photo avec d'autres attributs
-impl.ldap.NEW=Nouveau
 impl.ldap.EDIT=Édition
-impl.ldap.REMOVE=Supprimer
 impl.ldap.ENABLED=Activer
 impl.ldap.SERVER_NAME=Nom du serveur
 impl.ldap.SERVER_NAME_EXAMPLE=Mon serveur LDAP
@@ -850,6 +809,12 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=TéléphoneDomicile
 impl.ldap.PHONE_PREFIX=Indicatif téléphonique
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ex.: 00
 
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS=''{0}'' n'est pas une adresse SIP correcte.
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS=''{0}'' n'est pas un JID XMPP valide.
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Carnet d'adresses
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Activer les recherches dans le carnet MacOSX
@@ -864,9 +829,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Définir Outlook comme logiciel
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Contacts Google
-impl.googlecontacts.NEW=Nouveau
 impl.googlecontacts.EDIT=Édition
-impl.googlecontacts.REMOVE=Supprimer
 impl.googlecontacts.ENABLED=Activer
 impl.googlecontacts.ACCOUNT_NAME=Nom du compte
 impl.googlecontacts.SAVE=Enregistrer
@@ -875,6 +838,9 @@ impl.googlecontacts.USERNAME=Nom du compte
 impl.googlecontacts.PASSWORD=Mot de passe
 impl.googlecontacts.PREFIX=Indicatif téléphonique
 impl.googlecontacts.WRONG_CREDENTIALS=Mauvais identifiants pour le compte Google {0}
+impl.googlecontacts.OAUTH_DIALOG_TITLE=Autorisation de contacts Google
+impl.googlecontacts.CODE=Code : 
+impl.googlecontacts.HYPERLINK_TEXT=Cliquer ici pour donner accès à {0}
 
 # account info
 plugin.accountinfo.TITLE=Informations du compte
@@ -905,11 +871,8 @@ plugin.accountinfo.ORGANIZATION=Entreprise:
 plugin.accountinfo.JOB_TITLE=Profession:
 plugin.accountinfo.ABOUT_ME=À mon propos:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Images du contact
 plugin.accountinfo.GLOBAL_ICON=Utilisez l'icône global
 plugin.accountinfo.LOCAL_ICON=Utiliser cette icône:
-plugin.accountinfo.CHANGE=Changer
-plugin.accountinfo.ONLY_MESSAGE=Messages uniquement
 
 # connection info
 plugin.connectioninfo.TITLE=Informations de connexion
@@ -929,49 +892,13 @@ plugin.aimaccregwizz.USERNAME=Nom d'utilisateur AIM :
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Nom d'utilisateur et mot de passe
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Enregistrer un nouveau compte
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Si vous n'avez pas de compte AIM, cliquez sur ce bouton pour en créer un nouveau.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Passer outre les paramètres par défaut du serveur
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=À propos de {0}
 plugin.branding.LOGO_MESSAGE=VoIP && Messagerie instantanée Open Source
-plugin.branding.LOADING=Chargement
 plugin.branding.ABOUT_MENU_ENTRY=&À propos
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} est actuellement en développement intensif. Cette version est expérimentale et peut NE PAS fonctionner comme elle devrait. Plus d''informations sur {2}.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Tous droits réservés. Rendez-vous sur <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> est distribué selon les conditions de la LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-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}", peut-être vouliez vous 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.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Protocole du service Dict
-plugin.dictaccregwizz.HOST=Hôte
-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 stratégies
-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\nVous pouvez ajouter d'autres serveurs de dictionnaires en utilisant à nouveau cet assistant. Renseignez le champ Hôte avec le dictionnaire que vous souhaitez ajouter.
-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
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Pour utiliser la discussion instantanée de Facebook, vous devez vous créer un "nom d'utilisateur"<br>depuis la page "Paramètres du compte" sur Facebook.</a><br><br>Note: lorsque vous créez votre nom d'utilisateur, vous devrez vous déconnecter de la page web.<br>Cela peut prendre un peu de temps avant que vous puissiez vous connecter avec votre nouveau nom d'utilisateur !</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Protocole de discussion instantanée Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nom d'utilisateur :
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nom d'utilisateur et mot de passe
+
+plugin.busylampfield.PICKUP=Répondre à l'appel
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Ouvrir {0} automatiquement au démarrage de l''ordinateur
@@ -982,9 +909,6 @@ plugin.generalconfig.SHOW_HISTORY=Afficher les
 plugin.generalconfig.HISTORY_SIZE=derniers messages
 plugin.generalconfig.SEND_MESSAGES_WITH=Envoyer les messages avec :
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Fenêtre de conversation au premier plan
-plugin.generalconfig.ERROR_PERMISSION=Vous n'avez pas les droits requis pour désactiver le démarrage automatique
-plugin.generalconfig.TRANSPARENCY=Transparence
-plugin.generalconfig.ENABLE_TRANSPARENCY=Activer la transparence
 plugin.generalconfig.DEFAULT_LANGUAGE=Langue
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Les modifications prendront effet au prochain démarrage de l'application.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% traduit
@@ -1000,6 +924,7 @@ plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Enlever les symboles spéciaux
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Convertir les lettres en chiffres
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=Ex. +1-800-MONTEL-> +1-800-666895
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Taux d'échantillonnage
 plugin.generalconfig.OPUS_BITRATE=Taux de transfert moyen (kbps):
@@ -1043,13 +968,18 @@ plugin.ircaccregwizz.EXAMPLE_SERVER=Ex. : chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Utiliser une connexion sécurisée
 plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=Présence contacts activé
 plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=Présence salon de discussion activé
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=Authentification SASL
+plugin.ircaccregwizz.ENABLE_SASL_AUTHENTICATION=Activer l'authentification SASL
+plugin.ircaccregwizz.SASL_USERNAME=Nom d'utilisateur
+plugin.ircaccregwizz.SASL_AUTHZ_ROLE=Rôle
+plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED=Le mot de passe ci-dessus est utilisé pour l'authentification SASL
+plugin.ircaccregwizz.RESOLVE_DNS_THROUGH_PROXY=Toujours résoudre les noms DNS au travers du proxy
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Protocole XMPP
 plugin.jabberaccregwizz.USERNAME=Nom d'utilisateur XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirmer le mot de passe
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID et mot de passe
 plugin.jabberaccregwizz.CSERVER=Serveur
 plugin.jabberaccregwizz.SERVER=Serveur
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Activer keep alive
@@ -1065,13 +995,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Commentaire
 plugin.jabberaccregwizz.RESOURCE=Ressource
 plugin.jabberaccregwizz.AUTORESOURCE=Ressource auto-générée
 plugin.jabberaccregwizz.PRIORITY=Priorité
-plugin.jabberaccregwizz.XMPP_ERROR=Erreur XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Erreur XMPP inconnue ({0}). Vérifiez que le nom du serveur est correct.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Les mots de passe ne correspondent pas.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Passer outre les paramètres par défaut du serveur
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Options avancées
 plugin.jabberaccregwizz.USE_ICE=Utiliser ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Utiliser ICE/Jingle Google  (Expérimental !)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Découverte automatique des serveurs STUN/TURN
 plugin.jabberaccregwizz.SUPPORT_TURN=Support TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Nom d'utilisateur TURN
@@ -1099,11 +1025,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Désactiver les messages en copie cachée
 plugin.jabberaccregwizz.DTMF_AUTO=Choix automatique entre RTP et l'intrabande
 plugin.jabberaccregwizz.SERVER_OPTIONS=Options du serveur
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Modifier le mot de passe du compte
-plugin.jabberaccregwizz.NEW_PASSWORD=nouveau mot de passe
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirmer le mot de passe
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Prière de saisir un numéro de port valide pour continuer.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Le compte doit être connecté pour modifier le mot de passe.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Le mot de passe est vide
 plugin.jabberaccregwizz.TLS_REQUIRED=La connexion n'utilise aucun SSL/TLS, une modification du mot de passe n'est pas pris en charge.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Le mot de passe a été modifié avec succès
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Le serveur ne prend aucune modification de mot de passe en charge.
@@ -1117,25 +1040,9 @@ plugin.jabberaccregwizz.RESET=Réinitialiser
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Réinitialiser les paramètres globaux
 plugin.jabberaccregwizz.DISABLE_JINGLE=Désactiver Jingle ( Son et appel visio avec XMPP)
 
-# mailbox
-plugin.mailbox.OUTGOING=Message sortant :
-plugin.mailbox.INCOMING=Messages entrants :
-plugin.mailbox.WAIT_TIME=Délai avant de rediriger l'appel sur la messagerie vocale
-plugin.mailbox.MAX_MESSAGE_TIME=Durée maximum pour les messages entrants
-plugin.mailbox.CONFIRM=Confirmer
-plugin.mailbox.DEFAULTS=Par défaut
-plugin.mailbox.MAILBOX=Boîte aux lettres
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Un protocole pour se connecter et discuter sur le service MSN.
-plugin.msnaccregwizz.USERNAME=Email :
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Nom d'utilisateur et mot de passe
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Installer
 plugin.pluginmanager.UNINSTALL=Désinstaller
-plugin.pluginmanager.UPDATE=Mise à jour
 plugin.pluginmanager.PLUGINS=Plug-ins
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.CHOOSE_FILE=Sélectionner un fichier
@@ -1160,9 +1067,9 @@ plugin.sipaccregwizz.SERVER_PORT=Port du serveur
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Port du proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Transport privilégié
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Options avancées
 plugin.sipaccregwizz.PROXY_OPTIONS=Options du proxy
 plugin.sipaccregwizz.PROXY_AUTO=Configuration automatique du proxy
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Outrepasser la vérification de sécurité du proxy en cas de scénario de haute disponibilité (à utiliser si nécessaire) 
 plugin.sipaccregwizz.ENABLE_PRESENCE=Activer la présence (SIMPLE)
 plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Forcer le mode de présence peer-to-peer
 plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Période d'interrogation des contacts déconnectés (en s.)
@@ -1180,8 +1087,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Choix automatique entre RTP et l'intrabande (pas
 plugin.sipaccregwizz.DTMF_RTP=RTP (RFC2833 / RFC4733)
 plugin.sipaccregwizz.DTMF_SIP_INFO=INFO SIP
 plugin.sipaccregwizz.DTMF_INBAND=Intrabande
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Passer outre les paramètres par défaut du serveur
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Activer le support pour les appels chiffrés
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Montrez le soutien de ZRTP dans le protocole de signalisation
 plugin.sipaccregwizz.AUTH_NAME=Nom d'autorisation
@@ -1202,10 +1107,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Récupération du répondeur URI
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Les mots de passe ne correspondent pas.
 plugin.sipaccregwizz.NO_CERTIFICATE=<aucun> (utiliser l'enregistrement régulier)
 plugin.sipaccregwizz.SAVP_OPTION=Indication RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Á partir de (proposer seulement RTP/AVP)
 plugin.sipaccregwizz.SAVP_OPTION_1=Obligatoire (proposer et offrir seulement RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=En option (d'abord proposer RTP/SAVP puis RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Activer le cryptage S-Descriptor ( aussi connu comme SDES ou SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Protocole de décryptage activé et priorité:
 plugin.sipaccregwizz.CIPHER_SUITES=Suite de cryptage activée
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} tente automatiquement de crypter toutes les communications avec ZRTP. Les deux interlocuteurs entendent et voient une alerte lorsqu''une connexion sécurisée est établie. Les paramètres avancés sur cette page ne ​​doivent pas être modifiées sans expertise.</div></html>
@@ -1219,15 +1124,6 @@ plugin.skinmanager.DEFAULT_SKIN=Thème par défaut
 plugin.skinmanager.ADD_NEW_SKIN=Ajouter un nouveau thème...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Le thème par défaut pour l'application.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Un protocole pour se connecter à des machines distantes avec SSH.
-plugin.sshaccregwizz.USERNAME=Identifiant du compte :
-plugin.sshaccregwizz.IDENTITY_FILE=Fichier d'identité :
-plugin.sshaccregwizz.KNOWN_HOSTS=Hôtes connus :
-plugin.sshaccregwizz.OPTIONAL=Optionnel
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Détails du compte
-
 # status update
 plugin.autoaway.AUTO_STATUS=Statut d'absence automatique
 plugin.autoaway.ENABLE_CHANGE_STATUS=Changer le statut en cas d'absence
@@ -1275,22 +1171,6 @@ plugin.whiteboard.DESELECT=Dé-sélectionner
 plugin.whiteboard.DELETE=Supprimer
 plugin.whiteboard.PROPERTIES=Propriétés
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Un protocole pour se connecter et discuter sur le service Yahoo!
-plugin.yahooaccregwizz.USERNAME=Nom d'utilisateur :
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID et mot de passe
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Protocole Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Prénom :
-plugin.zeroaccregwizz.LAST_NAME=Nom :
-plugin.zeroaccregwizz.EMAIL=Email :
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Se rappeler des contacts Bonjour ?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID et mot de passe
-plugin.zeroaccregwizz.USERID=Identifiant utilisateur
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Protocole Google Talk
@@ -1304,19 +1184,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, le portail de télécommu
 plugin.iptelaccregwizz.USERNAME=Nom d'utilisateur
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=S'enregistrer à iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP et messagerie instantanée
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Nom d'utilisateur
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Entrez à nouveau votre mot de passe
 plugin.sip2sipaccregwizz.EMAIL=Adresse email
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Pour une aide concernant ce service rendez-vous sur<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>L'adresse email est utilisée pour les envois de messages audio, <br>de notifications d'appels manqués et pour la récupération de mots de passe perdus</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Pour une aide concernant ce service rendez-vous sur <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Compte sip2sip.info existant
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Créer une compte sip2sip.info gratuit
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Messagerie Instantanée
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Pour une aide concernant ce service rendez-vous sur<br>http://ippi.fr
@@ -1325,6 +1197,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Compte SIP existant
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Créer un compte ippi gratuit
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Fermer la fenêtre de conversation
 plugin.keybindings.CHAT_COPY=Copier
 plugin.keybindings.CHAT_CUT=Couper
@@ -1347,10 +1220,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Action
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Raccourci primaire
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Raccourci secondaire
 plugin.keybindings.globalchooser.PRESS_BTN=Appuyez sur le bouton pour régler le lien
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=en attente
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Bouton interphone
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Activer la reconnaissance des touches spéciales
 plugin.keybindings.PLUGIN_NAME=Raccourcis
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Fenêtre principal
 plugin.keybindings.GLOBAL=Raccourcis globaux
@@ -1378,6 +1251,7 @@ plugin.notificationconfig.tableheader.SOUND=Jouer un son à travers le dispositi
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Jouer un son à travers le dispositif de reproduction
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Jouer un son à travers les haut-parleurs de l'ordinateur
 plugin.notificationconfig.tableheader.DESCRIPTION=Description de la norification
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Appel entrant
 plugin.notificationconfig.event.SecurityMessage=Message de sécurité
 plugin.notificationconfig.event.IncomingFile=Fichier entrant
@@ -1479,6 +1353,7 @@ impl.neomedia.configform.VIDEO=Vidéo
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Utiliser les images intra périodique pour le rafraîchissement
 impl.neomedia.configform.H264.defaultProfile=Profile d'encodage par défaut à utiliser :
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Ligne de base
 impl.neomedia.configform.H264.defaultProfile.high=Haute
 impl.neomedia.configform.H264.defaultProfile.main=Principal
@@ -1509,7 +1384,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Mot de passe actuel :
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Entrez le nouveau mot de passe :
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Retaper le nouveau mot de passe :
 plugin.securityconfig.masterpassword.MP_TITLE=Mot de passe principal
-plugin.securityconfig.masterpassword.MP_NOT_SET=(non défini)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Vous n'avez pas entré le bon mot de passe principal. Veuillez réessayer.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Le mot de passe principal est incorrect !
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Échec du changement de mot de passe
@@ -1525,7 +1399,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Mot de passe
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(inconnu)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(impossible de déchiffrer)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Mot de passe enregistré
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Supprimer
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Tout supprimer
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Êtes-vous certain de supprimer tous les mots de passe ?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Supprimer tous les mots de passe
@@ -1621,7 +1494,6 @@ plugin.globalproxy.PROXY_PORT=Port du proxy
 plugin.globalproxy.PROXY_USERNAME=Utilisateur du proxy
 plugin.globalproxy.PROXY_PASSWORD=Mot de passe proxy
 plugin.globalproxy.DESCRIPTION={0} utilisera les paramètres de proxy ci-dessus pour tous les réseaux auxquels vous vous connectez ou vous reconnecterez à partir de maintenant. La prise en charge du proxy est encore expérimentale et ne fonctionne qu''avec certains protocoles. Reportez-vous au tableau ci-dessous pour plus de détails :
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Utiliser le proxy aussi pour DNS
 plugin.globalproxy.FWD_DNS_NOTE=Utile lorsque vous utilisez Tor. Évite la divulgation de données DNS en filtrant tout, le trafic DNS est redirigée par le proxy Tor. Ne prendra effet qu'après le redémarrage.
@@ -1659,7 +1531,6 @@ plugin.provisioning.RESTART_WARNING=Veuillez noter que les changements prendront
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Copier l'UUID dans le presse-papiers
 plugin.provisioning.CLIPBOARD_FAILED=Échec de la copie de l'UUID dans le presse-papiers
-plugin.provisioning.EXIT_ON_FAIL=Fermer le programme lors de l'échec de l'approvisionnement
 plugin.provisioning.CREDENTIALS=Dernières informations d'identification stockées
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Êtes-vous sûr de vouloir supprimer le mot de passe approvisioné?
 plugin.provisioning.PROV_FAILED=Échec de l'approvisionnement
@@ -1726,8 +1597,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600"> a essayé de contacter le serveu
 #plugin spellcheck
 plugin.spellcheck.TITLE=Grammaire et Orthographe
 plugin.spellcheck.MENU=Afficher Grammaire et Orthographe
-plugin.spellcheck.LANG=Langue
-plugin.spellcheck.EDIT_PERSONAL_DICT=Éditer
 plugin.spellcheck.ENABLE_SPELL_CHECK=Activer la vérification d'orthographe
 plugin.spellcheck.dialog.FIND=Chercher Suivant
 plugin.spellcheck.dialog.REPLACE=Remplacer
diff --git a/resources/languages/resources_ga.properties b/resources/languages/resources_ga.properties
index 92bd41c..da083f3 100644
--- a/resources/languages/resources_ga.properties
+++ b/resources/languages/resources_ga.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -31,14 +42,11 @@ service.gui.ACCOUNT=Cuntas
 service.gui.ACCOUNT_ME=Mise
 service.gui.ACCOUNTS=Cuntais
 service.gui.ADD=&Cuir leis
-service.gui.ADD_ACCOUNT=Cuir cuntas leis
 service.gui.ADD_CONTACT=&Cuir teagmhálaí leis
 service.gui.ADD_CONTACT_TO=&Cuir an teagmhálaí le
-service.gui.ADD_GROUP=Cruthaigh baicle
 service.gui.ADDRESS=Seoladh
 service.gui.ADMINISTRATOR=riarthóir
 service.gui.ADVANCED=&Ardroghanna
-service.gui.ALL=&Uile
 service.gui.ALL_CONTACTS=&Gach teagmhálaí
 service.gui.ALTERNATE_ADDRESS=Seoladh malartach
 service.gui.APPLY=&Cuir i bhfeidhm
@@ -46,7 +54,6 @@ service.gui.ARE_CALLING=Tá {0} ag glaoch...
 service.gui.ARE_NOW=Tá tú {0} anois
 service.gui.AT=ag
 service.gui.AUTHORIZE=&Ceadaigh
-service.gui.AUTHENTICATION_REQUESTED=Fíordheimhniú iarrtha
 service.gui.AUTHORIZATION_REQUESTED=Fíordheimhniú iarrtha
 service.gui.BUSY_MESSAGE=Is dona liom ach tá mé gnóthach faoi láthair.
 service.gui.BUSY_STATUS=Gnóthach
@@ -58,7 +65,6 @@ service.gui.CANCEL=&Cealaigh
 service.gui.CHAT=Comhrá
 service.gui.CHANGE_FONT=Athraigh an chlófhoireann
 service.gui.CHANGE_ROOM_SUBJECT=Athraigh ábhar an tseomra...
-service.gui.CHAT_CONFERENCE_LABEL=Comhdhálacha
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Comhdháil {0}
 service.gui.CHAT_ROOM_USER_LEFT=d'fhág {0}
 service.gui.CHANGE_PASSWORD=Athraigh an focal faire
@@ -71,7 +77,6 @@ service.gui.COUNTRY=Tír
 service.gui.SHOW_MORE_TOOLTIP=Brúigh anseo chun tuilleadh torthaí a thaispeáint
 service.gui.CLEAR=Glan
 service.gui.CLOSE=Dún
-service.gui.CONFIRM=Deimhnigh
 service.gui.CONNECTED_STATUS=Nasctha
 service.gui.CONNECTING=Ag nascadh...
 service.gui.CONNECTING_STATUS=Ag nascadh
@@ -103,7 +108,6 @@ service.gui.FONT_ITALIC=Iodálach
 service.gui.FONT_SIZE=Méid
 service.gui.FONT_STYLE=Nós
 service.gui.FONT_UNDERLINE=Cuir líne faoi
-service.gui.FROM={0} ó {1}
 service.gui.GUEST=cuairteoir
 service.gui.HANG_UP=Críochnaigh
 service.gui.HD_QUALITY=Físeán ardghléine
@@ -112,7 +116,6 @@ service.gui.HIDE=Folaigh
 service.gui.HIDE_OFFLINE_CONTACTS=Cuir teagmhálacha nach bhfuil ceangailte i bhfolach
 service.gui.HOME=Baile
 service.gui.HOME_PAGE=Leathanach baile
-service.gui.HOUR=Uair
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Aitheantóir
 service.gui.IGNORE=&Déan neamhaird de
@@ -126,6 +129,11 @@ service.gui.NO_MESSAGE=Níl teachtaireacht ann
 
 
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
 # keep the following string short
@@ -134,9 +142,6 @@ service.gui.NO_MESSAGE=Níl teachtaireacht ann
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -149,9 +154,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=roghnaigh líonra
 # LDAP
 impl.ldap.FIELDS=Réimsí
 impl.ldap.QUERY=Iarrtas
-impl.ldap.NEW=Nua
 impl.ldap.EDIT=eagar
-impl.ldap.REMOVE=Bain
 impl.ldap.ENABLED=Cumasaithe
 impl.ldap.AUTH_NONE=Dada
 impl.ldap.AUTH_SIMPLE=Diúid
@@ -165,14 +168,16 @@ impl.ldap.SCOPE=Cuimse
 impl.ldap.MAIL_FIELD_EXAMPLE=post
 impl.ldap.PHONE_PREFIX_EXAMPLE=M.sh.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.PREFIX_EXAMPLE=M.sh.: 00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Teagmhálacha Google
-impl.googlecontacts.NEW=Nua
 impl.googlecontacts.EDIT=eagar
-impl.googlecontacts.REMOVE=Bain
 impl.googlecontacts.ENABLED=Cumasaithe
 impl.googlecontacts.ACCOUNT_NAME=Ainm an chuntais
 impl.googlecontacts.SAVE=Taisc
@@ -196,8 +201,6 @@ plugin.accountinfo.PHONE=Uimhir ghutháin:
 plugin.accountinfo.ABOUT_ME=Maidir Liomsa:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
 plugin.accountinfo.LOCAL_ICON=Bain feidhm as an deilbhín seo:
-plugin.accountinfo.CHANGE=Athraigh
-plugin.accountinfo.ONLY_MESSAGE=Teachtaireachtaí amháin
 
 # connection info
 
@@ -212,26 +215,14 @@ plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Cláraigh cuntas nua
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Maidir le {0}
 plugin.branding.LOGO_MESSAGE=Cur teachtaireachtaí meandracha && VoIP Foinse Oscailte
-plugin.branding.LOADING=Ag luchtú
 plugin.branding.ABOUT_MENU_ENTRY=&Maidir le
 
-# Dict protocol
-service.protocol.DICTIONARIES=Foclóirí
-plugin.dictaccregwizz.ANY_DICTIONARY=Foclóir ar bith
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.HOST=Óstach
-plugin.dictaccregwizz.CLOSING_CONNECTION=Ag dúnadh an naisc
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
 
 # generalconfig
 plugin.generalconfig.SHOW_HISTORY=Taispeáin
 plugin.generalconfig.HISTORY_SIZE=teachtaireachtaí le gairid i gcomhráite nua
 plugin.generalconfig.SEND_MESSAGES_WITH=Seol teachtaireachtaí le:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Tabhair fuinneog an chomhrá chun tosaigh
-plugin.generalconfig.TRANSPARENCY=Trédhearcacht
-plugin.generalconfig.ENABLE_TRANSPARENCY=Cumasaigh trédhearcacht
 plugin.generalconfig.DEFAULT_LANGUAGE=Teanga an chomhéadain
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Cuirfear na hathruithe a rinne tú i bhfeidhm an chéad uair eile a tosófar é.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% aistrithe
@@ -249,30 +240,16 @@ plugin.generalconfig.SILK_CONFIG=Síoda
 # irc accregwizz
 
 # jabber accregwizz
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Ardroghanna
 plugin.jabberaccregwizz.USE_ICE=Bain feidhm as ICE
 plugin.jabberaccregwizz.SERVER_OPTIONS=Roghanna an fhreastalaithe
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Athraigh focal faire an chuntais
-plugin.jabberaccregwizz.NEW_PASSWORD=Focal faire nua
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Deimhnigh an focal faire nua
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Tá an focal faire folamh.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Athraíodh an focal faire go rathúil.
 plugin.jabberaccregwizz.AUDIO=Fuaim
 plugin.jabberaccregwizz.VIDEO=Físeán
 
-# mailbox
-plugin.mailbox.INCOMING=Teachtaireachtaí isteach:
-plugin.mailbox.CONFIRM=Deimhnigh
-plugin.mailbox.DEFAULTS=Réamhshocruithe
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.USERNAME=Seoladh ríomhphoist:
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Suiteáil
 plugin.pluginmanager.UNINSTALL=Díshuiteáil
-plugin.pluginmanager.UPDATE=Nuashonrú
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=Roghnaigh comhad
 plugin.pluginmanager.SYSTEM=Córas
@@ -282,11 +259,10 @@ plugin.pluginmanager.NEW=Nua
 plugin.simpleaccregwizz.SIGNUP=Nach bhfuil tú cláraithe fós?
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -310,26 +286,17 @@ plugin.whiteboard.MODIFICATION=Mionathrú
 plugin.whiteboard.THICKNESS=Tiús:
 plugin.whiteboard.GRID=Mogallra
 
-# yahoo accregwizz
-
-# zero accregwizz
-plugin.zeroaccregwizz.FIRST_NAME=Ainm:
-plugin.zeroaccregwizz.LAST_NAME=Sloinne:
-plugin.zeroaccregwizz.EMAIL=Seoladh ríomhphoist:
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 
 # iptel accregwizz
 
-# sip2sip accregwizz
+# ippi accregwizz
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Clóscríobh arís an focal faire
 plugin.sip2sipaccregwizz.EMAIL=Seoladh ríomhphoist
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Cruthaigh cuntas sip2sip.info saor in aisce
-
-# ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=Macasamhlaigh
 plugin.keybindings.CHAT_CUT=Gearr
 plugin.keybindings.CHAT_NEXT_TAB=Cluaisín ar aghaidh
@@ -339,6 +306,7 @@ plugin.keybindings.MAIN_RENAME=Athainmnigh an teagmhálaí
 plugin.keybindings.globalchooser.ANSWER_CALL=Freagair an glao
 plugin.keybindings.globalchooser.HANGUP_CALL=Críochnaigh an glao
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Brúigh chun labhairt
+#Enum KeybindingSet.Category
 plugin.keybindings.GLOBAL=Aicearraí coiteanna
 
 # Notification Configuration Form
@@ -352,6 +320,7 @@ plugin.notificationconfig.BROWSE_SOUND=Roghnaigh comhad fuaime
 plugin.notificationconfig.BROWSE_PROGRAM=Roghnaigh ríomhchlár
 plugin.notificationconfig.tableheader.ENABLE=Cumasaigh nó díchumasaigh an ghné seo
 plugin.notificationconfig.tableheader.DESCRIPTION=Cur síos ar imeacht
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Glao isteach
 plugin.notificationconfig.event.SecurityMessage=Teachtaireacht Slándála
 plugin.notificationconfig.event.IncomingFile=Comhad isteach
@@ -367,6 +336,7 @@ plugin.notificationconfig.event.NetworkNotifications=Fógraí an líonra
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
@@ -375,7 +345,6 @@ plugin.notificationconfig.event.NetworkNotifications=Fógraí an líonra
 plugin.securityconfig.masterpassword.CURRENT_PASSWORD=An focal faire reatha:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Cuir isteach focal faire nua:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Cuir isteach arís an focal faire nua:
-plugin.securityconfig.masterpassword.MP_NOT_SET=(gan socrú)
 
 # otr plugin
 
@@ -409,8 +378,6 @@ net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult
 #plugin spellcheck
 plugin.spellcheck.TITLE=Litriú agus Gramadach
 plugin.spellcheck.MENU=Taispeáin Litriú agus Gramadach
-plugin.spellcheck.LANG=Teanga
-plugin.spellcheck.EDIT_PERSONAL_DICT=Eagar
 plugin.spellcheck.ENABLE_SPELL_CHECK=Cumasaigh an litreoir
 plugin.spellcheck.dialog.FIND=Aimsigh ar aghaidh
 plugin.spellcheck.dialog.REPLACE=Ionadaigh
diff --git a/resources/languages/resources_gd.properties b/resources/languages/resources_gd.properties
index a578b7b..3e8aa90 100644
--- a/resources/languages/resources_gd.properties
+++ b/resources/languages/resources_gd.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Mise
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Draoidh clàradh nan cunntasan
 service.gui.ACCOUNTS=Cunntasan
 service.gui.ADD=&Cuir ris
-service.gui.ADD_ACCOUNT=Cuir cunntas ris
 service.gui.ADD_CONTACT=C&uir neach-aithne ris
 service.gui.ADD_AUTHORIZED_CONTACT=Cuir {0} ri liosta an luchd-aithne agad
 service.gui.ADD_CONTACT_TO=Cuir an &neach-aithne ri
@@ -41,20 +51,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Mearachd a' cur ris neach-aithne
 service.gui.ADD_CONTACT_EXIST_ERROR=Tha an neach-aithne {0} air liosta an luchd-aithne agad mu thràth.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Cha do fhreagair am frithealaiche nuair a dh''iarr sinn an neach-aithne aig a bheil an ID {0} a chur ris.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Cha b'' urrainn dhuinn an neach-aithne aig a bheil an ID {0} a chur ris. Chan eil taic ris a leithid seo a ghnìomh.
-service.gui.ADD_CONTACT_IDENTIFIER=Cuir aithnichear an neach-aithne a tha thu airson cur ris san raon gu h-ìosal.
-service.gui.ADD_CONTACT_WIZARD=Draoidh cur ris an luchd-aithne
 service.gui.ADD_CONTACT_NOT_CONNECTED=Feumaidh ceangal a bhith agad mus urrainn dhut neach-aithne a chur ris. Clàraich a-steach aig an t-solaraiche a thagh thu ''s feuch ris a-rithist.
 service.gui.ADD_GROUP_LOCAL_ERROR=Cha b'' urrainn dhuinn am buidheann air a bheil {0} a chur ris. Dh''èirich an duilgheadas seo ri linn gnìomh IO ionadail.
 service.gui.ADD_GROUP_EXIST_ERROR=Tha am buidheann {0} air liosta an luchd-aithne agad mu thràth. Nach tagh thu ainm eile?
 service.gui.ADD_GROUP_NET_ERROR=Cha b'' urrainn dhuinn am buidheann air a bheil {0} a chur ris. Dh''èirich an duilgheadas seo ri linn fàilligeadh an lìonraidh. Dèan cinnteach gu bheil ceangal agad ris an lìonra ''s feuch ris a-rithist.
 service.gui.ADD_GROUP_ERROR=Cha b'' urrainn dhuinn am buidheann air a bheil {0} a chur ris.
 service.gui.ADD_GROUP_EMPTY_NAME=Chan fhaod ainm a'' bhuidhinn a bhith falamh.
-service.gui.ADD_GROUP=Cruthaich buidheann
-service.gui.ADD_SUBCONTACT=C&uir fo-neach-aithne ris
 service.gui.ADDRESS=Seòladh
 service.gui.ADMINISTRATOR=rianaire
 service.gui.ADVANCED=&Adhartach
-service.gui.ALL=A &h-uile
 service.gui.ALL_CONTACTS=&A h-uile neach-aithne
 service.gui.APPLY=&Cuir an sàs
 service.gui.ARE_CALLING=Tha {0} a'' cur fòn...
@@ -63,7 +68,6 @@ service.gui.AT=aig
 service.gui.AUTHORIZE=&Thoir ùghdarras
 service.gui.AUTHORIZATION_ACCEPTED=Ghabh {0} ris d'' iarrtas ùghdarrachaidh.
 service.gui.AUTHENTICATION_FAILED=Dh''fhàillig dearbhadh {0}. Chuir thu a-steach facal-faire nach eil dligheach.
-service.gui.AUTHENTICATION_REQUESTED=Dearbhadh ''ga iarraidh
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Dh''iarr frithealaiche {0} dearbhadh ort.
 service.gui.AUTHENTICATION_REJECTED=Dhiùlt {0} d'' iarrtas ùghdarrachaidh.
 service.gui.AUTHENTICATION_WINDOW_TITLE=Dearbhadh {0}
@@ -103,7 +107,6 @@ service.gui.CHANGE_NICKNAME_LABEL=''S urrainn dhut am far-ainm ùr agad a chur a
 service.gui.CHANGE_NICKNAME_ERROR=Mearachd le atharrachadh an fhar-ainm
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Tha am far-ainm seo ann mu thràth
 service.gui.CHANGE_VIDEO_QUALITY=Atharraich càileachd a'' video chèin
-service.gui.CHAT_CONFERENCE_LABEL=Co-labhairtean
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=A'' cho-labhairt aig {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Chaidh an seòmar cabadaich {0} a cheangal ris mu thràth.
 service.gui.CHAT_ROOM_CONFIGURATION=Rèiteachadh an t-seòmair chabadaich {0}
@@ -114,18 +117,14 @@ service.gui.CHAT_ROOM_USER_JOINED=- chaidh iad a-steach dha {0}
 service.gui.CHAT_ROOM_USER_LEFT=- dh''fhàg iad {0}
 service.gui.CHAT_ROOM_USER_KICKED=- air breab fhaighinn às an t-seòmar {0}
 service.gui.CHAT_ROOM_USER_QUIT=- dh''fhàg iad {0}
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Sàbhailidh seo an seòmar cabadaich air eagal ''s gum bi feum agad uaireigin eile
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Bheir seo air falbh an seòmar a thagh thu o liosta nan seòmraichean a chaidh a shàbhaladh
 service.gui.CHAT_ROOM_NAME=Ainm an t-seòmair chabadaich
 service.gui.CLEAR_CUSTOM_MESSAGES=Falamhaich na teachdaireachdan gnàthaichte
 service.gui.ROOM_NAME=Seòmar cabadaich
-service.gui.AUTOJOIN=Gabh pàirt gu fèin-obrachail
 service.gui.CHANGE_PASSWORD=Atharraich am facal-faire
 service.gui.CHAT_ROOM_NAME_INFO=Cuir ainm an t-seòmair chabadaich a tha thu airson cruthachadh san raon gu h-ìosal.
 service.gui.CHAT_ROOM_NOT_EXIST=Cha b'' urrainn dhuinn an seòmar {0} a lorg air an fhrithealaiche {1}. Dèan cinnteach gu bheil an t-ainm a chuir thu a-steach ceart.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Feumaidh tu clàradh a-steach mus urrainn dhut a dhol a-steach dhan t-seòmar chabadaich {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Feumaidh tu clàradh a-steach mus urrainn dhut seòmar cabadaich fhàgail.
-service.gui.CHAT_ROOM_NOT_JOINED=Feumaidh tu a bhith ceangailte ris an t-seòmar chabadaich mus urrainn dhut rudan a dhèanamh ann.
 service.gui.CHAT_ROOM_OPTIONS=Roghainnean an t-seòmair chabadaich
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Feumaidh tu clàradh mus urrainn dhut ceangal ris an t-seòmar chabadaich {0}.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Dh''iarr an seòmar cabadaich {0} facal-faire.
@@ -142,22 +141,18 @@ service.gui.CLEAR=Falamhaich
 service.gui.CLOSE=Dùi&n
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Fhuair thu teachdaireachd ùr diog no dhà air ais. A bheil thu cinnteach gu bheil thu airson a'' chabadaich seo a dhùnadh?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Tha faidhlichean ''gan tar-aiseag agad fhathast. A bheil thu cinnteach gu bheil thu airson sgur dheth?
-service.gui.CONFIRM=Dearbhaich
 service.gui.CONNECTED_STATUS=Ceangailte ris
 service.gui.CONNECTING=A'' dèanamh ceangal...
 service.gui.CONNECTING_STATUS=A'' dèanamh ceangal
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=A'' dèanamh ceangal*
 service.gui.CONNECTION=Ceangal
-service.gui.CONNECTION_FAILED_MSG=Dh''fhàillig an ceangal aig a'' chunntas a leanas: Ainm-cleachdaiche: {0}, ainm an fhrithealaiche: {1}. Dèan cinnteach gu bheil ceangal agad ris an lìonra no cuir fios gu rianaire an lìonraidh agad airson barrachd fiosrachaidh.
 service.gui.CONNECTION_EXPIRED_MSG=Chan eil ceangal agad ris an fhrithealaiche {0} aig an àm seo.
 service.gui.CONTACT_NAME=ID no àireamh
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Chan eil an neach-aithne a thagh thu, {0}, comasach air fònadh.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Chan eil an neach-aithne a thagh thu, {0}, comasach air co-labhairtean cabadaich.
 service.gui.CONTACT_PAUSED_TYPING=Sguir {0} de sgrìobhadh na teachdaireachd
 service.gui.CONTACT_TYPING=Tha {0} a'' sgrìobhadh teachdaireachd
 service.gui.CONTACT_TYPING_SEND_FAILED=ìoc... cha b'' urrainn dhuinn innse dha {0} gun robh thu a'' sgrìobhadh rud
 service.gui.CONTACT_INFO=&Fiosrachadh conaltraidh
-service.gui.CONTACTLIST=Liosta an luchd-aithne
 service.gui.CONTACTS=Luchd-aithne
 service.gui.COPY=Dèan lethbhrea&c
 service.gui.COPY_LINK=Dèan &lethbhreac dhen cheangal
@@ -167,17 +162,14 @@ service.gui.CREATE_CHAT_ROOM=&Cruthaich seòmar cabadaich...
 service.gui.CREATE_CHAT_ROOM_ERROR=Dh''fhàillig cruthachadh an t-seòmair chabadaich {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Draoidh cruthachadh nan seòmraichean cabadaich
 service.gui.CREATE_CONFERENCE_CALL=&Cruthaich gairm co-labhairt...
-service.gui.CREATE_CONFERENCE_CHAT=&Cruthaich cabadaich co-labhairt...
 service.gui.CREATE_GROUP=&Cruthaich buidheann...
 service.gui.CREATE_GROUP_NAME=Cuir ainm a'' bhuidhinn a tha thu airson cruthachadh san raon gu h-ìosal.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Chan eil buidheann sam bith air liosta an luchd-aithne agad. Nach cruthaich thu buidheann an toiseach (Faidhle » Cruthaich buidheann).
 service.gui.CREATE_VIDEO_BRIDGE=Cruthaich drochaid &video...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Cruthaich drochaid &video
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Cruthaich / Gabh pàirt ann an co-labhairt video
 service.gui.CREATE_VIDEO_CONFERENCE=Cruthaich co-labhairt video ùr dhan t-seòmar chabadaich seo
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Chan eil an neach-aithne seo comasach air fiosrachadh conaltraidh-lìn a làimhseachadh
 service.gui.CUT=&Gearr às
-service.gui.DATE=Ceann-là
 service.gui.DELETE=Sguab às
 service.gui.DENY=&Diùlt
 service.gui.DESKTOP_SHARING_WARNING=<b>A bheil thu cinnteach gu bheil thu airson tòiseachadh air co-roinneadh na sgrìn agad?</b> <br>Ma bhriogas tu air "Ceart ma-thà", chì càch sa chòmhradh seo an sgrìn agad.
@@ -187,7 +179,6 @@ service.gui.DISCONNECTED_STATUS=Air a dhì-cheangal
 service.gui.DND_STATUS=Na bris a-steach orm
 service.gui.DO_NOT_ASK_AGAIN=Na faighnich dhìom a-rithist
 service.gui.DO_NOT_SHOW_AGAIN=Na seall an teachdaireachd seo a-rithist
-service.gui.DOWNLOAD_NOW=L&uchdaich a-nuas an-dràsta
 service.gui.DRAG_FOR_SHARING=Slaod dad an-seo a bu toigh leat co-roinneadh...
 service.gui.DURATION=faid
 service.gui.EDIT=D&easaich
@@ -206,7 +197,6 @@ service.gui.ERROR_RECEIVED_FROM=Fhuaras mearachd o {0}
 service.gui.ESTIMATED_TIME=Tuairmeas ama:
 service.gui.EVENTS=Tachartasan
 service.gui.EXIT=&Fàg an-seo
-service.gui.EXTENDED_CRITERIA=Cuspair-deuchainnean adhartach
 service.gui.GENERAL=Coitcheann
 service.gui.GENERAL_ERROR=Mearachd choitcheann
 service.gui.GROUP_NAME=Ainm a'' bhuidhinn
@@ -248,7 +238,6 @@ service.gui.FONT_ITALIC=Eadailteach
 service.gui.FONT_SIZE=Meud
 service.gui.FONT_STYLE=Stoidhle
 service.gui.FONT_UNDERLINE=Loidhne fodha
-service.gui.FROM={0} o {1}
 service.gui.GRANT_OWNERSHIP=Thoir seachad seilbheachd...
 service.gui.GRANT_ADMIN=Thoir seachad inbhe rianaire...
 service.gui.GRANT_MODERATOR=Thoir seachad inbhe modaratair
@@ -274,7 +263,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=A bheil thu cinnteach gu bheil thu airson
 service.gui.HISTORY_REMOVE_ERROR=Mearachd a'' toirt air falbh nan teachdaireachdan a tha ''gan stòradh gu h-ionadail.
 service.gui.HOME=Dhachaigh
 service.gui.HOME_PAGE=Duilleag-dhachaigh
-service.gui.HOUR=Uair a thìde
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Aithnichear
 service.gui.IGNORE=&Leig seachad
@@ -295,13 +283,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Thoir cuireadh dhan luchd-aithne gu d
 service.gui.INVITE_REASON=Adhbhar a'' chuiridh
 service.gui.IS_CALLING=Tha {0} a'' cur fòn...
 service.gui.IS_NOW=Tha {0} {1} an-dràsta
-service.gui.JITSI_WARNING=''S e Jitsi an t-ainm ùr air SIP Communicator.<br/>Ma tha thu airson ''s gum fan am prògram cho ùr ''s a ghabhas, nach luchdaich thu a-nuas Jitsi an-dràsta?<br/><br/>Tha sinn duilich ma chuir sin fo mhì-ghoireas sam bith thu.<br/><br/>Sgioba leasachadh Jitsi
-service.gui.JITSI_WARNING_TITLE=''S e Jitsi an t-ainm ùr air an SIP Communicator
 service.gui.JOIN=&Rach ann
 service.gui.JOIN_AS=Rach &ann mar
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Gabh pàirt ann an co-labhairt video a tha ann mu thràth
 service.gui.JOIN_VIDEO=Gabh pàirt sa video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Dùi&n
 service.gui.JOB_TITLE=Ainm an dreuchd
 service.gui.JOIN_CHAT_ROOM=Rach &dhan t-seòmar chabadaich...
 service.gui.JOIN_CHAT_ROOM_TITLE=Rach dhan t-seòmar chabadaich
@@ -314,7 +299,6 @@ service.gui.KICK_FAILED=Dh''fhàillig a b(h)reabadh
 service.gui.KICK_FAILED_GENERAL_ERROR=Dh''fhàillig breabadh {0}. Thachair mearachd air an fhrithealaiche.
 service.gui.KICK_FAILED_NOT_ALLOWED=Dh''fhàillig breabadh {0}. Cha b'' urrainn dhuinn sealbhadair is rianaire an t-seòmair a bhreabadh.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Dh''fhàillig breabadh {0}. Chan eil cead gu leòr agad sin a dhèanamh.
-service.gui.LAST=Sloinneadh
 service.gui.LAST_NAME=Sloinneadh
 service.gui.LEAVE=&Fàg
 service.gui.LIMIT_REACHED_FOR_IP=Rinn cus dhaoine clàradh on t-seòladh IP ionadail agad agus chan eil am frithealaiche {0} a'' dol a cheadachadh barrachd dhiubh.
@@ -334,7 +318,6 @@ service.gui.MESSAGE=Teachdaireachd
 service.gui.MISSED_CALLS_TOOL_TIP=Chaill thu gairmean o:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= agus {0} a bharrachd
 service.gui.MODERATOR=modaratair
-service.gui.MORE=Fac an corr
 service.gui.MORE_LABEL=Barrachd
 service.gui.MOVE=Gluais
 service.gui.MOVE_SUBCONTACT=G&luais an neach-aithne
@@ -343,7 +326,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Tha an neach-aithne a thagh thu co-ionnann ri
 service.gui.MOVE_SUBCONTACT_QUESTION=A bheil thu cinnteach gu bheil thu airson {1} a ghluasad dha {0}?
 service.gui.MOVE_TO_GROUP=&Gluais dhan bhuidheann
 service.gui.MOVE_CONTACT=Gluais an neach-aithne
-service.gui.MOVE_CONTACT_ERROR=&Cha ghabh an neach-aithne a ghluasad
 service.gui.MSG_DELIVERY_FAILURE=Cha b'' urrainn dhuinn an teachdaireachd gu h-àrd a libhrigeadh
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Chan eil am pròtacal a thagh thu a'' cur taic ri teachdaireachdan far loidhne. ''S urrainn dhut feuchainn ri {0} a ruigsinn slighe pròtacail eile no fuireach gus am bi e/i air loidhne.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Thachair mearachd inntearnail. Tha coltas gur e buga a dh''adhbharaich seo, nach dèan thu aithris air an-seo: https://jitsi.org/Development/BugsAndIssues.
@@ -356,7 +338,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Bu chòir dhut ceangal a dhèanamh ma th
 service.gui.MULTIPLE_LOGINS=Rinn thu clàradh a-steach barrachd air aon turas leis an aon chunntas. Tha an cunntas (ainm-cleachdaiche: {0}, ainm an fhrithealaiche: {1}) gun cheangal an-dràsta fhèin.
 service.gui.MY_CHAT_ROOMS=Cuir seòmar cabadaich ris
 service.gui.MY_CHAT_ROOMS_TITLE=Cuir seòmar cabadaich ris
-service.gui.MUTE=Mùch
 service.gui.MUTUALLY_ON_HOLD_STATUS=An dà chuid ''ga chumail
 service.gui.NAME=Ainm
 service.gui.NETWORK=Lìonra
@@ -387,7 +368,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Chan-eil-e-air-liosta-an-luchd-aithne
 service.gui.SD_QUALITY=Càileachd stannardach
 service.gui.OFFLINE=Far loidhne
 service.gui.OK=&Ceart ma-thà
-service.gui.OLDER_CALLS=Gairmean nas sine
 service.gui.ONLINE=Air loidhne
 service.gui.OPEN=Fosgail
 service.gui.OPEN_FILE_FROM_IMAGE=Dèan briogadh dùbailte gus am faidhle fhosgladh.
@@ -399,7 +379,6 @@ service.gui.OPEN_ON_ACTIVITY=ma bhios gnìomhachd ann
 service.gui.OPEN_ON_MESSAGE=ma bhios teachdaireachd ann a-mhàin
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=ma bhios teachdaireachd chudromach ann a-mhàin
 service.gui.OR=no
-service.gui.OR_ENTER_PHONE_NUMBER=No cuir a-steach àireamh fòn an-seo...
 service.gui.ORGANIZATION=Buidheann
 service.gui.OTHER=Eile
 service.gui.OWNER=seilbheadair an t-seòmair
@@ -418,7 +397,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS="Enter" airson molaidhean
 service.gui.PRESS_FOR_CALL_INFO=Dèan brùthadh airson fiosrachadh mun ghairm
 service.gui.PRESS_TO_OPEN_CRM=Brùth gus an aplacaid CRM fhosgladh
 service.gui.PREVIOUS=Air ais
-service.gui.PREVIOUS_TOOLTIP=Brabhsaich còmhraidhean nas sine
 service.gui.PRINT=Clò-&bhuail
 service.gui.PROACTIVE_NOTIFICATION=- a'' sgrìobhadh teachdaireachd
 service.gui.PROBLEMS_ENCOUNTERED=Thachair sinn ri duilgheadas
@@ -433,7 +411,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Rinn thu ''s bhris thu an ceangal ris an
 service.gui.RE_REQUEST_AUTHORIZATION=Iarr ùghdarachadh a-rithist
 service.gui.REFERRED_STATUS=Air ath-threòrachadh
 service.gui.REJECT=&Diùlt
-service.gui.REMIND_ME_LATER=Cuir ''nam chuimhne às a dhèidh seo
 service.gui.REMEMBER_PASSWORD=Cuimhnich am facal-faire
 service.gui.REMOVE=&Thoir air falbh
 service.gui.REMOVE_ACCOUNT=Thoi&r air falbh an cunntas
@@ -459,29 +436,20 @@ service.gui.REVOKE_ADMIN=Thoir air falbh inbhe rianaire
 service.gui.REVOKE_MODERATOR=Thoir air falbh inbhe modaratair
 service.gui.REVOKE_MEMBERSHIP=Thoir air falbh a'' bhallrachd
 service.gui.REVOKE_VOICE=Thoir air falbh an guth
-service.gui.ROOT_GROUP=Buidheann root
 service.gui.SAVE=&Sàbhail
-service.gui.SAVE_AS_DEFAULT=Sàbhail mar roghainn bhunaiteach
 service.gui.SEARCH=&Lorg
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Briog air a'' phutan gu h-ìosal airson liosta shlàn nan seòmraichean cabadaich a tha air an fhrithealaiche a thagh thu. Tagh am fear a tha thu ag iarraidh a dhol ann is briog air a'' phutan "Rach ann" an uairsin.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Neach-aithne a chaidh a lorg
 service.gui.SECURITY=Tèarainteachd
-service.gui.SELECT_ACCOUNT=Tagh cunntas
 service.gui.SELECT_COLOR=Tagh dath
 service.gui.SELECT_GROUP=Tagh buidheann
-service.gui.SELECT_GROUP_WIZARD_MSG=Tha gach buidheann a tha air liosta an luchd-aithne agad air an liosta gu h-ìosal. Tagh am fear a chuireas sinn an neach-aithne ùr ris.
 service.gui.SELECT_NO_GROUP=Gun bhuidheann
-service.gui.SELECT_GROUP_WIZARD=Sònraich buidheann
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Tha gach cunntas a chuireas taic ri cabadaich iomadh cleachdaiche air an liosta gu h-ìosal. Tagh am fear a bu mhath leat cleachdadh gus an seòmar cabadaich agad a chruthachadh.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Tha gach cunntas clàraichte air an liosta gu h-ìosal. Tagh am fear a bu chaomh leat cleachdadh gus conaltradh a dhèanamh ris an neach-aithne ùr.
-service.gui.SELECT_PROVIDERS_WIZARD=Tagh cunntas
 service.gui.SELECT_VIDEO_CONFERENCE=Tagh co-labhairt video
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Tagh seòmar cabadaich on liosta is briog air "Ceart ma-thà" gus a chur ris.
 service.gui.SEND=C&uir
 service.gui.SEND_FILE=Cuir am &faidhle
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Chan eil fiosrachadh ann mun neach-aithne seo.
 service.gui.SEND_MESSAGE=C&uir teachdaireachd
-service.gui.SEND_AS_SMS=Cuir mar SMS
 service.gui.SEND_PRIVATE_MESSAGE=Cuir teachdaireachd phrìobhaideach
 service.gui.SEND_SMS=Cu&ir SMS
 service.gui.SEND_SMS_DETAILS=Cuimhnich gum bi agad an àireamh a chur a-steach sa chruth eadar-nàiseanta, m.e. a'' tòiseachadh le +44 airson na Rìoghachd Aonaichte , mar eisimpleir +447777000000
@@ -520,7 +488,6 @@ service.gui.STREET=Sràid
 service.gui.SUBJECT=Cuspair
 service.gui.SUMMARY=Gearr-chunntas
 service.gui.TELEPHONY=Fònadh
-service.gui.TODAY=An-diugh
 service.gui.TOOLS=&Innealan
 service.gui.TRANSFER=&Sìn air adhart
 service.gui.TO=&Gu:
@@ -530,7 +497,6 @@ service.gui.TRANSFER_CALL_TO=Sìn air adhart gu:
 service.gui.TRANSPARENCY_NOT_ENABLED=Chan eil an rèiteachadh làithreach agad a'' cur taic ri trìd-shoilleireachd.
 service.gui.TYPE_YOUR_REQUEST=Sgrìobh d'' iarrtas an-seo
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Cha b'' urrainn dhuinn càileachd a'' video atharrachadh airson a'' ghairm seo.
-service.gui.UNMUTE=Till an fhuaim
 service.gui.USER_IDENTIFIER=Aithnichear a'' chleachdaiche:
 service.gui.USER_EXISTS_ERROR=Tha an cleachdaiche seo air an lìonra a thagh thu mu thràth. Feuch is tagh cleachdaiche no lìonra eile.
 service.gui.USERNAME_NULL=Cuir a-steach an t-ainm-cleachdaiche ''s am facal-faire agad.
@@ -543,7 +509,6 @@ service.gui.USE_PROVISIONING=Cleachd solar air loidhne
 service.gui.VALUE=Luach
 service.gui.VIDEO_CALL=Gairm &video
 service.gui.VIA=slighe
-service.gui.VIA_SMS=Slighe SMS
 service.gui.VIEW=&Sealladh
 service.gui.VIEW_HISTORY=Seall an eachdraid&h
 service.gui.VIEW_SMILEYS=Seall na &samhlaidhean-gnùise
@@ -563,9 +528,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Atharraich àirde na fuaime
 service.gui.WAITING_AUTHORIZATION=A'' feitheamh ri ùghdarachadh
 service.gui.WARNING=Rabhadh
 service.gui.YES=Tha
-service.gui.YESTERDAY=An-dè
-service.gui.EXISTING_ACCOUNT_ERROR=Chaidh an cunntas a chuir thu a-steach a stàladh mu thràth.
-service.gui.NEW_MAIL=<b>Tha aon teachdaireachd ùr agad!</b><br/><b>O:</b> {0} {1} <br/><b>Cuspair:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Fhuair thu teachdaireachd puist ùr sa <a href="{1}">bhogsa a-steach</a> {0} agad:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Fhuair thu {2} teachdaireachd(an) puist ùr(a) sa <a href="{1}">bhogsa a-steach</a> {0} agad:<br/>
 service.gui.NEW_GMAIL_FOOTER=aon chòmhradh eile gun leughadh sa <a href="{0}">bhogsa a-steach</a> agad.<br/>
@@ -589,7 +551,6 @@ service.gui.SECURITY_ERROR=Mearachd tèarainteachd
 service.gui.SPEED=Astar:
 service.gui.SILENT_MEMBER=ball sàmhach
 service.gui.NON_SECURE_CONNECTION=Chan urrainn dhuinn ceangal tèarainte a dhèanamh airson a'' chunntais {0}. Ma tha thu airson ceangal ri frithealaiche nach eil tèarainte, cuir cromag ri "Ceadaich ceanglaichean nach eil tèarainte" ann an rèiteachadh a'' chunntais agad.
-service.gui.UPDATE=Ùraich
 service.gui.MOBILE_PHONE=Fòn-làimhe
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Obair
@@ -624,7 +585,6 @@ service.gui.callinfo.CALL_INFORMATION=Fiosrachadh mun ghairm
 service.gui.callinfo.CALL_IDENTITY=Dearbh-aithne
 service.gui.callinfo.PEER_COUNT=Àireamh nan com-pàirtichean
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Fòcas na co-labhairt
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Tha an crioptachadh an comas
 service.gui.callinfo.CALL_TRANSPORT=A'' siognaileadh giùlanair na gairm
 service.gui.callinfo.CALL_DURATION=Faid na gairm
 service.gui.callinfo.VIEW_CERTIFICATE=Seall an teisteanas
@@ -635,7 +595,6 @@ service.gui.callinfo.AUDIO_INFO=Fiosrachadh mun fhuaim
 service.gui.callinfo.VIDEO_INFO=Fiosrachadh mun video
 service.gui.callinfo.LOCAL_IP=IP/Port ionadail
 service.gui.callinfo.REMOTE_IP=IP/Port cèin
-service.gui.callinfo.BANDWITH=Tar-chur dàta
 service.gui.callinfo.LOSS_RATE=Reat a'' challa
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -645,10 +604,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Pròtacal malairt na h-iuchrach
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Seòrsa de thagraiche ICE leudaichte
 service.gui.callinfo.ICE_STATE=Staid pròiseasadh ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Cruinnich na tagraichean
 service.gui.callinfo.ICE_STATE.RUNNING=Sgrùdaidhean a'' chomais-cheangail
 service.gui.callinfo.ICE_STATE.COMPLETED=Air a choileanadh
 service.gui.callinfo.ICE_STATE.FAILED=Dh''fhàillig e
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=IP/Port an òstair ionadail
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=IP/Port faileasach ionadail
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=IP/Port ath-sheachadaichte ionadail
@@ -669,9 +631,10 @@ service.gui.ALWAYS_TRUST=Cuir earbsa san teisteanas seo an-còmhnaidh
 service.gui.CERT_DIALOG_TITLE=Dearbh an teisteanas
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>Chan urrainn dha {0} dearbh-àithne an fhrithealaiche a dhearbhadh nuair a cheanglas e ri <br><b>{1}</b>.<br><br> Chan eil earbsa san teisteanas agus is ciall dha sin nach urrainn dhuinn dearbh-àithne an fhrithealaiche a dhearbhadh gu fèin-obrachail.<br><br> A bheil thu airson ceangal co-dhiù?<br> Airson barrachd fiosrachaidh, briog air "Seall an teisteanas".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>Chan urrainn dha {0} dearbh-àithne an fhrithealaiche a dhearbhadh.<br><br> Chan eil earbsa san teisteanas agus is ciall dha sin nach urrainn dhuinn<br> dearbh-àithne an fhrithealaiche a dhearbhadh gu fèin-obrachail. A bheil thu airson ceangal co-dhiù?<br><br> Airson barrachd fiosrachaidh, briog air "Seall an teisteanas".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>Chan urrainn dha {0} dearbh-àithne a'' chliaint a tha a'' ceangal a dhearbhadh.<br><br> Chan eil earbsa san teisteanas agus is ciall dha sin nach urrainn dhuinn<br> dearbh-àithne a'' chliaint a dhearbhadh gu fèin-obrachail. A bheil thu airson gabhail ris a'' cheangal co-dhiù?<br><br> Airson barrachd fiosrachaidh, briog air "Seall an teisteanas".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>Chan urrainn dha {0} dearbh-àithne an t-seise {1} a dhearbhadh.<br><br> Chan eil earbsa san teisteanas agus is ciall dha sin nach urrainn dhuinn<br> dearbh-àithne an t-seise a dhearbhadh gu fèin-obrachail. A bheil thu airson ceangal co-dhiù?<br><br> Airson barrachd fiosrachaidh, briog air "Seall an teisteanas".</html>
 service.gui.CONTINUE_ANYWAY=Lean air adhart co-dhiù
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Ainm cumanta:
 service.gui.CERT_INFO_O=Buidheann:
 service.gui.CERT_INFO_C=Ainm na dùthcha:
@@ -685,12 +648,10 @@ service.gui.CERT_INFO_VER=Tionndadh:
 service.gui.CERT_INFO_SIGN_ALG=Algairim an t-soidhnidh:
 service.gui.CERT_INFO_ALG=Algairim:
 service.gui.CERT_INFO_PUB_KEY=Iuchair phoblach:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Easponant:
 service.gui.CERT_INFO_KEY_SIZE=Meud na h-iuchrach:
 service.gui.CERT_INFO_SIGN=Soidhneadh:
-service.gui.CONTINUE=Lean air adhart
 service.gui.SHOW_CERT=Seall an teisteanas
 service.gui.HIDE_CERT=Falaich an teisteanas
 
@@ -713,11 +674,8 @@ service.gui.security.SECURE_AUDIO=Fuaim thèarainte
 service.gui.security.AUDIO_NOT_SECURED=Chan eil an fhuaim tèarainte
 service.gui.security.SECURE_VIDEO=Video tèarainte
 service.gui.security.VIDEO_NOT_SECURED=Chan eil a'' video tèarainte
-service.gui.security.NO_VIDEO=Chan eil video ann
-service.gui.security.CIPHER=Sifir: {0}
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Chan eil a'' ghairm tèarainte.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Briog an-seo gus coimeas a dhèanamh eadar an rùn tèarainteachd agadsa agus aig a'' chèile agad.
-service.gui.security.COMPARE_WITH_PARTNER=Dèan coimeas leis a'' chèile agus briog air a'' ghlas gus a dhearbhadh.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Dèan coimeas leis a'' chèile:
 service.gui.security.STRING_COMPARED=Chaidh coimeas a dhèanamh eadar an dà shreang!
@@ -735,19 +693,13 @@ service.gui.avatar.imagepicker.CLICK=Dèan briogadh is fiamh-ghàire
 service.gui.avatar.imagepicker.IMAGE_FILES=Faidhlichean deilbh
 service.gui.avatar.imagepicker.IMAGE_PICKER=Dealbh
 service.gui.avatar.imagepicker.IMAGE_SIZE=Meud an deilbh
-service.gui.avatar.imagepicker.INITIALIZING=''Ga thòiseachadh
 service.gui.avatar.imagepicker.RESET=Ath-shuidhich
 service.gui.avatar.imagepicker.SET=Suidhich
 service.gui.avatar.imagepicker.TAKE_PHOTO=Tog dealbh
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Mearachd leis a'' chamara-lìn
 
 service.gui.security.encryption.required=Tha feum air crioptachadh!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Mearachd ann an stòras liosta an luchd-aithne SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Cha ghabh an goireas {0} a leughadh. Airson {1}
@@ -777,9 +729,7 @@ impl.ldap.QUERY_CUSTOM=Ceist ghnàthaichte
 impl.ldap.QUERY_CUSTOM_HINT=Cleachd {0} mar glèidheadair-àite airson an fhacail-luirg seo.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Cuir saoragan ri teirm na ceiste gu fèin-obrachail
 impl.ldap.QUERY_PHOTO_INLINE=Faigh an dealbh an cois nam buadhan eile
-impl.ldap.NEW=Ùr
 impl.ldap.EDIT=deasaich
-impl.ldap.REMOVE=Thoir air falbh
 impl.ldap.ENABLED=An comas
 impl.ldap.SERVER_NAME=Ainm an fhrithealaiche
 impl.ldap.SERVER_NAME_EXAMPLE=Am frithealaiche LDAP agam
@@ -812,6 +762,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=fòn dachaidh
 impl.ldap.PHONE_PREFIX=Ro-leasachan fòn
 impl.ldap.PHONE_PREFIX_EXAMPLE=M.e.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Leabhar nan seòladh
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Cuir an comas lorg ann an leabhar sheòlaidhean MacOSX
@@ -822,9 +776,7 @@ plugin.addrbook.PREFIX_EXAMPLE=M.e.: 00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Luchd-aithne Google
-impl.googlecontacts.NEW=Ùr
 impl.googlecontacts.EDIT=deasaich
-impl.googlecontacts.REMOVE=Thoir air falbh
 impl.googlecontacts.ENABLED=An comas
 impl.googlecontacts.ACCOUNT_NAME=Ainm a'' chunntais
 impl.googlecontacts.SAVE=Sàbhail
@@ -863,11 +815,8 @@ plugin.accountinfo.ORGANIZATION=Ainm a' bhuidhinn:
 plugin.accountinfo.JOB_TITLE=Ainm an dreuchd:
 plugin.accountinfo.ABOUT_ME=Mu mo dhèidhinn:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Dealbhan a'' chleachdaiche
 plugin.accountinfo.GLOBAL_ICON=Cleachd ìomhaigheag uile-choitcheann
 plugin.accountinfo.LOCAL_ICON=Cleachd an ìomhaigheag seo:
-plugin.accountinfo.CHANGE=Atharraich
-plugin.accountinfo.ONLY_MESSAGE=Teachdaireachdan a-mhàin
 
 # connection info
 
@@ -886,49 +835,12 @@ plugin.aimaccregwizz.USERNAME=Ainm-sgrìn AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Ainm-sgrìn ''s facal-faire
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Clàraich cunntas ùr
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Mur eil cunntas AIM agad, briog air a'' phutan seo gus fear ùr a chruthachadh.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Tar-àithn bun-roghainnean an fhrithealaiche
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Mu dhèidhinn {0}
 plugin.branding.LOGO_MESSAGE=VoIP ⁊ grad-theachdaireachdan le còd fosgailte
-plugin.branding.LOADING=''Ga luchdadh
 plugin.branding.ABOUT_MENU_ENTRY=&Mu dheidhinn
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>Tha {1} ''ga leasachadh an-dràsta fhèin. ''S e tionndadh deuchainneil a tha agad agus DH''FHAOIDTE nach obraich e mar a tha dùil. Thoir sùil air {2} airson barrachd fiosrachaidh.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Còir-lethbhreac <b>jitsi.org</b>. Gach còir glèidhte. Tadhail air <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>Tha <b>Jitsi</b> ''ga sgaoileadh fo theirmichean an LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Faclairean
-plugin.dictaccregwizz.ANY_DICTIONARY=Faclair sam bith
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Faclair sam bith o {0}
-plugin.dictaccregwizz.FIRST_MATCH=A'' chiad mhaids
-plugin.dictaccregwizz.NO_MATCH=Gun mhaids
-plugin.dictaccregwizz.MATCH_RESULT=Cha deach deifinisean a lorg airson "{0}", an robh na leanas fa-near dhut:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Chan eil am faclair làithreach "{0}" air an fhrithealaiche tuilleadh.
-plugin.dictaccregwizz.INVALID_STRATEGY=Chan eil an ro-innleachd làithreach ri fhaighinn air an fhrithealaiche.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal seirbheis Dict
-plugin.dictaccregwizz.HOST=Òstair
-plugin.dictaccregwizz.SERVER_INFO=Fiosrachadh mun fhrithealaiche
-plugin.dictaccregwizz.STRATEGY_SELECTION=Taghadh na ro-innleachd
-plugin.dictaccregwizz.STRATEGY_LIST=Liosta nan ro-innleachdan:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Ro-innleachdan luirg
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Thèid an ro-innleachd a chleachdadh gus faclan a tha coltach ri chèile a lorg mur an deach eadar-theangachadh a lorg, stèidhichte air diofar dòighean-obrach. Ma eisimpleir, lorgaidh ro-innleachdan nan ro-leasachan faclan a tha a'' tòiseachadh mar a tha am facal air an dèanadh tu eadar-theangachadh.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Fiosrachadh a'' chunntais Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Cruthaichidh an draoidh seo a' chiad chunntas Dict dhut air dict.org.\n\n'S urrainn dhut faclair ùr a chruthachadh ma thèid thu gu draoidh clàradh nan cunntasan. Cuir am faclair a bu toigh leat a chur ris ann an lìon an òstair.
-plugin.dictaccregwizz.THREAD_CONNECT=A'' feuchainn ri ceangal a dhèanamh ris an fhrithealaiche
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Dh''fhàillig an ceangal, chan e frithealaiche Dict a tha seo no tha am frithealaiche far loidhne
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=A'' faighinn nan ro-innleachdan
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Cha deach ro-innleachd a lorg air an fhrithealaiche
-plugin.dictaccregwizz.POPULATE_LIST=A'' lìonadh na liosta
-plugin.dictaccregwizz.CLOSING_CONNECTION=A'' dùnadh a'' cheangail
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Mus urrainn dhut Facebook Chat a chleachdadh, feumaidh tu ainm-cleachdaiche<br>a chruthachadh air duilleag nan "Account Settings" air Facebook.</a><br><br>An aire: Nuair a chruthaicheas tu ainm-cleachdaiche,<br>feumaidh tu clàradh às an duilleag-lìn is faodaidh gum bi greis mus urrainn dhut clàradh a-steach leis an ainm ùr!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal Facebook Chat
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Ainm-cleachdaiche:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Ainm-cleachdaiche ''s facal-faire
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Tòisich {0} gu fèin-obrachail nuair a thòisicheas an coimpiutair agad
@@ -939,9 +851,6 @@ plugin.generalconfig.SHOW_HISTORY=Seall
 plugin.generalconfig.HISTORY_SIZE=teachdaireachdan a sgrìobhadh o chionn goirid ann an cabadaich ùr
 plugin.generalconfig.SEND_MESSAGES_WITH=Cuir teachdaireachdan le:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Gluais uinneag na cabadaich gun bheulaibh
-plugin.generalconfig.ERROR_PERMISSION=Chan eil pribhleidean gu leòr agad gus casg a chur air an fhèin-tòiseachadh
-plugin.generalconfig.TRANSPARENCY=Trìd-shoilleireachd
-plugin.generalconfig.ENABLE_TRANSPARENCY=Cuir an comas trìd-shoilleireachd
 plugin.generalconfig.DEFAULT_LANGUAGE=Cànan na h-eadar-aghaidh
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Bidh na h-atharraichean agad an sàs ann an ath-thuras a thòisicheas tu.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% air eadar-theangachadh
@@ -995,11 +904,9 @@ plugin.ircaccregwizz.HOST=Ainm an òstair:
 plugin.ircaccregwizz.IRC_SERVER=Frithealaiche
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal XMPP
 plugin.jabberaccregwizz.USERNAME=Ainm-cleachdaiche XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Dearbhaich am facal-faire
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID is am facal-faire
 plugin.jabberaccregwizz.CSERVER=Frithealaiche
 plugin.jabberaccregwizz.SERVER=Ceangail am frithealaiche
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Cuir an comas an ceangal buan
@@ -1015,13 +922,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Beachd
 plugin.jabberaccregwizz.RESOURCE=Goireas
 plugin.jabberaccregwizz.AUTORESOURCE=Gin an goireas gu fèin-obrachail
 plugin.jabberaccregwizz.PRIORITY=Prìomhachas
-plugin.jabberaccregwizz.XMPP_ERROR=Mearachd XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Mearachd XMPP nach aithne dhuinn ({0}). Dèan cinnteach gu bheil ainm an fhrithealaiche ceart.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Chan eil an dà fhacal-faire co-ionnann.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Tar-àithn bun-roghainnean an fhrithealaiche
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Roghainnean adhartach
 plugin.jabberaccregwizz.USE_ICE=Cleachd ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Cleachd Jingle Google/ICE (deuchainneil)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Mothaich do dh''fhrithealaichean STUN/TURN gu fèin-obrachail
 plugin.jabberaccregwizz.SUPPORT_TURN=Cuir taic ri TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Ainm-cleachdaiche TURN
@@ -1049,11 +952,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Cuir carboin nan teachdaireachdan à coma
 plugin.jabberaccregwizz.DTMF_AUTO=Gu fèin-obrachail: Dèan taghadh eadar RTP is Inband gu fèin-obrachail
 plugin.jabberaccregwizz.SERVER_OPTIONS=Roghainnean an fhrithealaiche
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Atharraich facal-faire a'' chunntais
-plugin.jabberaccregwizz.NEW_PASSWORD=Facal-faire ùr
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Dearbh am facal-faire ùr
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Nach cuir thu a-steach àireamh puirt dhligheach mus lean thu air adhart?
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Feumaidh tu clàradh a-steach mus gabh am facal-faire atharrachadh.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Tha am facal-faire bàn.
 plugin.jabberaccregwizz.TLS_REQUIRED=Chan eil an ceangal seo a'' cleachdadh TLS, chan fheuch sinn ris am facal-faire atharrachadh.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Chaidh am facal-faire atharrachadh
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Chan eil am frithealaiche XMPP agad a'' ceadachadh atharrachadh fhaclan-faire.
@@ -1067,25 +967,9 @@ plugin.jabberaccregwizz.RESET=Ath-shuidhich
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Ath-shuidhich na roghainnean uile-choitcheann
 plugin.jabberaccregwizz.DISABLE_JINGLE=Cuir às comas Jingle (gairmean gutha is video le XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Teachdaireachdan a thèid a-mach:
-plugin.mailbox.INCOMING=Teachdaireachdan a thig a-steach:
-plugin.mailbox.WAIT_TIME=Cuir dàil air gus an deach a'' ghairm a chur gun phost-ghutha
-plugin.mailbox.MAX_MESSAGE_TIME=Faid as motha de theachdaireachdan a thig a-steach
-plugin.mailbox.CONFIRM=Dearbhaich
-plugin.mailbox.DEFAULTS=Bun-roghainnean
-plugin.mailbox.MAILBOX=Bogsa-puist
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal leis an urrainn dhut ceangal ri seirbheis MSN agus cabadaich air.
-plugin.msnaccregwizz.USERNAME=Post-d:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID is am facal-faire
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Stàlaich
 plugin.pluginmanager.UNINSTALL=Dì-stàlaich
-plugin.pluginmanager.UPDATE=Ùraich
 plugin.pluginmanager.PLUGINS=Plugain
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.CHOOSE_FILE=Tagh faidhle
@@ -1110,7 +994,6 @@ plugin.sipaccregwizz.SERVER_PORT=Port an fhrithealaiche
 plugin.sipaccregwizz.PROXY=Progsaidh
 plugin.sipaccregwizz.PROXY_PORT=Port a'' phrogsaidh
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Giùlanair as fhearr leat
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Roghainnean adhartach
 plugin.sipaccregwizz.PROXY_OPTIONS=Roghainnean a'' phrogsaidh
 plugin.sipaccregwizz.PROXY_AUTO=Rèitich am progsaidh gu fèin-obrachail
 plugin.sipaccregwizz.ENABLE_PRESENCE=Cuir làthaireachd an comas (SIMPLE)
@@ -1130,8 +1013,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Gu fèin-obrachail: Dèan taghadh eadar RTP is In
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Tar-àithn bun-roghainnean an fhrithealaiche
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Cuir an comas taic ri gairmean crioptaichte
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Nochd gu bheil taic ri ZRTP sa phròtacal siognailidh
 plugin.sipaccregwizz.AUTH_NAME=Ainm an ùghdarachaidh
@@ -1152,10 +1033,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=URI sgrùdadh puist-ghutha
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Chan eil an dà fhacal-faire co-ionnann.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none> (cleachd dearbhadh àbhaisteach)
 plugin.sipaccregwizz.SAVP_OPTION=Taisbeanadh RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Dheth (taisbean RTP/AVP a-mhàin) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Èigneachail (na tairg is na gabh ach ri RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Roghainneil (tairg RTP/SAVP an toiseach is RTP/AVP an uairsin)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Cuir an comas S-Descriptor (air a bheil SDES no SRTP cuideachd)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Tagh pròtacalan crioptachaidh a tha an comas agus na prìomhachasan aca (am pròtacal aig a'' bharr an toiseach):
 plugin.sipaccregwizz.CIPHER_SUITES=Cipher suites a tha an comas:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>Feuchaidh {0} gu fèin-obrachail ris na gairmean uile agad a dhèanamh tèarainte le ZRTP agus cluinnidh an dithis agaibh brath turas a chaidh ceangal tèarainte a stèidheachadh. Cha bu chòir dhut na roghainnean adhartach gu h-ìosal atharrachadh ach ma tha thu gu math eòlach air a leithid a rud.</div></html>
@@ -1169,15 +1050,6 @@ plugin.skinmanager.DEFAULT_SKIN=An craiceann bunaiteach
 plugin.skinmanager.ADD_NEW_SKIN=Cuir craiceann ùr ris...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Craiceann bunaiteach na h-aplacaid.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal leis an urrainn dhut ceangal a dhèanamh ri innealan cèin slighe SSH.
-plugin.sshaccregwizz.USERNAME=ID a'' chunntais:
-plugin.sshaccregwizz.IDENTITY_FILE=Faidhle na dearbh-aithne:
-plugin.sshaccregwizz.KNOWN_HOSTS=Òstairean as aithne dhuinn:
-plugin.sshaccregwizz.OPTIONAL=Roghainneil
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Fiosrachadh a'' chunntais
-
 # status update
 plugin.autoaway.AUTO_STATUS=Suidhich "Air falbh" gu fèin-obrachail
 plugin.autoaway.ENABLE_CHANGE_STATUS=Atharraich mo làthaireachd nuair a bhios mi air falbh
@@ -1224,22 +1096,6 @@ plugin.whiteboard.DESELECT=Dì-thagh
 plugin.whiteboard.DELETE=Sguab às
 plugin.whiteboard.PROPERTIES=Roghainnean
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal leis an urrainn dhut ceangal ri seirbheis Yahoo! agus cabadaich air.
-plugin.yahooaccregwizz.USERNAME=Ainm-cleachdaiche:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID is am facal-faire
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal na seirbheise Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Ainm:
-plugin.zeroaccregwizz.LAST_NAME=Sloinneadh
-plugin.zeroaccregwizz.EMAIL=Post-d:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=A bheil thu airson luchd-aithne Bonjour a chumail an cuimhne?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID is facal-faire
-plugin.zeroaccregwizz.USERID=ID a'' chleachdaiche
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Pròtacal Google Talk
@@ -1253,19 +1109,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, am portal cian-chonaltrad
 plugin.iptelaccregwizz.USERNAME=Ainm-cleachdaiche
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Fo-sgrìobh gu iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP agus cabadaich
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Ainm-cleachdaiche
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Cuir am facal-faire a-steach a-rithist
 plugin.sip2sipaccregwizz.EMAIL=Seòladh puist-d
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Airson cobhar leis an t-seirbheis seo, tadhail air<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Thèid an seòladh puist-d a chleachdadh gus post-gutha agus brathan mu, <br>ghairmean a chaill thu a chur agus faclan-faire a dhìochuimhnich thu aiseag</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Airson cobhair leis an t-seirbheis seo, tadhail air <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Cunntas sip2sip.info a tha ann mu thràth
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Cruthaich cunntas sip2sip.info saor an-asgaidh
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP ⁊ grad-theachdaireachdan
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Airson cobhar leis an t-seirbheis seo, tadhail air<br>http://ippi.fr
@@ -1274,6 +1122,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Cunntas ippi a tha ann mu thràth
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Cruthaich cunntas ippi ùr
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Dùin uinneag na cabadaich
 plugin.keybindings.CHAT_COPY=Dèan lethbhreac
 plugin.keybindings.CHAT_CUT=Gearr às
@@ -1296,10 +1145,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Ainm
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Prìomh ath-ghoirid
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Dàrna ath-ghoirid
 plugin.keybindings.globalchooser.PRESS_BTN=Dèan brùthadh gus an ath-ghoirid a shuidheachadh
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=A'' feitheamh
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Brùth airson bruidhinn
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Cuir an comas mothachadh do dh''iuchraichean sònraichte
 plugin.keybindings.PLUGIN_NAME=Ceanglaichean iuchrach
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Cabadaich
 plugin.keybindings.MAIN=Prìomh-cheangal iuchrach
 plugin.keybindings.GLOBAL=Ath-ghoiridean uile-choitcheann
@@ -1326,6 +1175,7 @@ plugin.notificationconfig.tableheader.SOUND=Cluich fuaim tro uidheam bhrathan
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Cluich fuaim tro uidheam cluiche
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Cluich fuaim tro glaodhaire a'' PC
 plugin.notificationconfig.tableheader.DESCRIPTION=Tuairisgeul tachartais
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Gairm a'' tighinn a-steach
 plugin.notificationconfig.event.SecurityMessage=Teachdaireachd tèarainteachd
 plugin.notificationconfig.event.IncomingFile=Faidhle a'' tighinn a-steach
@@ -1427,6 +1277,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Ath-nuadhachadh Intra cunbhalach
 impl.neomedia.configform.H264.defaultProfile=A'' phròifil bhunaiteach dhan a nithear còdachadh:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Bun-loidhne
 impl.neomedia.configform.H264.defaultProfile.high=Àrd
 impl.neomedia.configform.H264.defaultProfile.main=Prìomh-phròifil
@@ -1457,7 +1308,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Am facal-faire làithreach
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Cuir a-steach am facal-faire ùr:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Cuir a-steach am facal-faire a-rithist:
 plugin.securityconfig.masterpassword.MP_TITLE=Prìomh-fhacal-faire
-plugin.securityconfig.masterpassword.MP_NOT_SET=(cha deach a shuidheachadh)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Cha do chuir thu a-steach am prìomh fhacal-faire làithreach ceart. Feuch ris a-rithist.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Tha am prìomh fhacal-faire cearr!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Dh''fhàillig atharrachadh an fhacail-fhaire
@@ -1473,7 +1323,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Facal-faire
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(neo aithnichte)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(cha ghabh a dhì-chrioptachadh)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Faclan-faire a tha ''gan stòradh
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Thoir air falbh
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Thoir air falbh a h-uile
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=A bheil thu airson gach facal-faire a thoirt air falbh?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Thoir air falbh a h-uile facal-faire
@@ -1569,7 +1418,6 @@ plugin.globalproxy.PROXY_PORT=Port a'' phrogsaidh
 plugin.globalproxy.PROXY_USERNAME=Ainm-cleachdaiche a'' phrogsaidh
 plugin.globalproxy.PROXY_PASSWORD=Facal-faire a'' phrogsaidh
 plugin.globalproxy.DESCRIPTION=Cleachdaidh {0} na roghainnean progsaidh gu h-àrd airson a h-uile lìonra a cheanglas tu ris no a dh'ath-cheanglas tu ris. \nTha an taic ri progsaidhean caran deuchainneil an-dràsta agus chan obraich e ach le cuid a phròtacalan. Thoir sùil air a' chlàr gu h-ìosal airson barrachd fiosrachaidh:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=DNS progsaidh cuideachd
 plugin.globalproxy.FWD_DNS_NOTE=Feumail le Tor. ''S urrainn dhut aoideanan DNS a sheachnadh leis is e a'' sìneadh air adhart an trafaig DNS air fad gun phrogsaidh Tor. Bidh agad ri ath-thòiseachadh.
@@ -1602,7 +1450,6 @@ plugin.provisioning.RESTART_WARNING=Thoir an aire nach dèid na h-atharraichean
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Cuir lethbhreac dhen UUID air an stòr-bhòrd
 plugin.provisioning.CLIPBOARD_FAILED=Cha b'' urrainn dhuinn lethbhreac dhen UUID a chur air an stòr-bhòrd
-plugin.provisioning.EXIT_ON_FAIL=Fàg an aplacaid ma dh''fhàilligeas am provisioning
 plugin.provisioning.CREDENTIALS=Na teisteasan provisioning mu dheireadh a chaidh a stòradh
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=A bheil thu airson facal-faire a'' provisioning a thoirt air falbh?
 plugin.provisioning.PROV_FAILED=Dh''fhàillig am provisioning
@@ -1669,8 +1516,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">Dh''fheuch {0} ri ceangal a dhèa
 #plugin spellcheck
 plugin.spellcheck.TITLE=Litreachadh is gràmar
 plugin.spellcheck.MENU=Seall dearbhadh an litreachaidh is a'' ghràmair
-plugin.spellcheck.LANG=Cànan
-plugin.spellcheck.EDIT_PERSONAL_DICT=Deasaich
 plugin.spellcheck.ENABLE_SPELL_CHECK=Cuir an comas an dearbhair-litreachaidh
 plugin.spellcheck.dialog.FIND=Lorg an ath-fhear
 plugin.spellcheck.dialog.REPLACE=Cuir ''na àite   
diff --git a/resources/languages/resources_he.properties b/resources/languages/resources_he.properties
index 8dc5f1e..5199796 100644
--- a/resources/languages/resources_he.properties
+++ b/resources/languages/resources_he.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=אני
 service.gui.ACCOUNT_REGISTRATION_WIZARD=אשף הרשמת חשבון
 service.gui.ACCOUNTS=חשבונות
 service.gui.ADD=&הוסף
-service.gui.ADD_ACCOUNT=הוסף חשבון
 service.gui.ADD_CONTACT=&הוסף איש קשר
 service.gui.ADD_AUTHORIZED_CONTACT=הוסף את {0} אל רשימת אישי הקשרים שלך
 service.gui.ADD_CONTACT_TO=&הוסף אנשי קשר אל
@@ -41,17 +51,12 @@ service.gui.ADD_CONTACT_ERROR_TITLE=שגיאת הוספת איש קשר
 service.gui.ADD_CONTACT_EXIST_ERROR=איש הקשר {0} כבר מצוי ברשימת אישי הקשרים שלך.
 service.gui.ADD_CONTACT_NETWORK_ERROR=שרת לא הגיב לבקשתנו להוספת איש קשר עם מזהה: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=כשל בהוספת איש קשר עם מזהה: {0}. פעולה לא נתמכת.
-service.gui.ADD_CONTACT_IDENTIFIER=בשדה להלן, הזן המזהה של איש הקשר אשר ברצונך להוסיף.
-service.gui.ADD_CONTACT_WIZARD=אשף הוספת איש קשר
 service.gui.ADD_GROUP_EXIST_ERROR=הקבוצה {0} כבר מצויה ברשימת הקשרים שלך. אנא בחר שם אחר.
 service.gui.ADD_GROUP_ERROR=כשל בהוספת קבוצה בשם: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=שם הקבוצה לא יכול להיות ריק.
-service.gui.ADD_GROUP=צור קבוצה
-service.gui.ADD_SUBCONTACT=&הוסף איש קשר משני
 service.gui.ADDRESS=כתובת
 service.gui.ADMINISTRATOR=מנהלן
 service.gui.ADVANCED=&מתקדם
-service.gui.ALL=&הכל
 service.gui.ALL_CONTACTS=&כל אנשי הקשר
 service.gui.APPLY=&החל
 service.gui.ARE_CALLING=מתקשרים כעת...
@@ -59,7 +64,6 @@ service.gui.ARE_NOW=הינך {0} כעת
 service.gui.AUTHORIZE=&הרשאה
 service.gui.AUTHORIZATION_ACCEPTED=איש הקשר קיבל את בקשת הרשאתך.
 service.gui.AUTHENTICATION_FAILED=אימות עבור {0} נכשל. הסיסמה שהזנת הינה שגויה.
-service.gui.AUTHENTICATION_REQUESTED=התבקש אישור
 service.gui.AUTHENTICATION_REQUESTED_SERVER=השרת {0} ביקש את אישורך.
 service.gui.AUTHENTICATION_REJECTED=איש הקשר דחה את בקשת הרשאתך.
 service.gui.AUTHENTICATION_WINDOW_TITLE=‫{0} אימות
@@ -101,7 +105,6 @@ service.gui.CHAT_ROOM_USER_QUIT={0} יצא/ה
 service.gui.CHAT_ROOM_NAME=שם חדר שיחה
 service.gui.CLEAR_CUSTOM_MESSAGES=טהר הודעות מותאמות
 service.gui.ROOM_NAME=חדר שיחה
-service.gui.AUTOJOIN=הצטרף אוטומטית
 service.gui.CHANGE_PASSWORD=שנה סיסמה
 service.gui.CHAT_ROOM_NAME_INFO=בשדה להלן, הזן את השם של חדר השיחה אשר ברצונך ליצור.
 service.gui.CHAT_ROOM_NOT_EXIST=החדר {0} לא נמצא בתוך השרת {1}. אנא ודא אם השם שהקלדת הינו מדויק.
@@ -120,7 +123,6 @@ service.gui.CLEAR=טהר
 service.gui.CLOSE=&סגור
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=קיבלת הודעה חדשה מלפני פחות משתי שניות. האם אתה בטוח כי ברצונך לסגור את שיחה זו?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=יש לך העברות קובץ פעילות. האם אתה בטוח כי ברצונך לבטלן?
-service.gui.CONFIRM=אמת
 service.gui.CONNECTED_STATUS=מחובר
 service.gui.CONNECTING=מתחבר כעת...
 service.gui.CONNECTING_STATUS=מתחבר כעת
@@ -128,12 +130,10 @@ service.gui.CONNECTING_EARLY_MEDIA_STATUS=מתחבר כעת*
 service.gui.CONNECTION=חיבור
 service.gui.CONNECTION_EXPIRED_MSG=אתה מנותק כעת מהשרת {0}.
 service.gui.CONTACT_NAME=מזהה או מספר
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=איש קשר נבחר {0} לא תומך בטלפוניה.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=איש קשר נבחר {0} לא תומך בשיחת ועידה.
 service.gui.CONTACT_PAUSED_TYPING=‏{0} פסק מלהקליד את ההודעה
 service.gui.CONTACT_TYPING=‏{0} מקליד כעת הודעה
 service.gui.CONTACT_INFO=&מידע איש קשר
-service.gui.CONTACTLIST=רשימת קשר
 service.gui.CONTACTS=ה&עתק
 service.gui.COPY=ה&עתק
 service.gui.COPY_LINK=העתק &קישור
@@ -143,14 +143,11 @@ service.gui.CREATE_CHAT_ROOM=&צור חדר שיחה...
 service.gui.CREATE_CHAT_ROOM_ERROR=נכשל ליצור חדר שיחה {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=אשף יצירת חדר שיחה
 service.gui.CREATE_CONFERENCE_CALL=&צור קריאת ועידה...
-service.gui.CREATE_CONFERENCE_CHAT=&צור שיחת ועידה...
 service.gui.CREATE_GROUP=&צור קבוצה...
 service.gui.CREATE_GROUP_NAME=בשדה להלן, הזן את השם של הקבוצה אשר ברצונך ליצור.
-service.gui.CREATE_FIRST_GROUP_WIZARD=רשימת הקשרים של לא מכילה אף קבוצה. אנא צור קבוצה צחילה (קובץ/צור קבוצה).
 service.gui.CREATE_VIDEO_BRIDGE=יצירת &גשר וידאו...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=צור &גשר וידאו
 service.gui.CUT=&גזור
-service.gui.DATE=תאריך
 service.gui.DELETE=מחק
 service.gui.DENY=&אסור
 service.gui.DESKTOP_SHARING_WARNING=<b>האם אתה בטוח כי ברצונך להתחיל שיתוף מסך?</b> <br> לחיצה על אישור תתיר לאנשים בשיחה זה לראות את המסך שלך.
@@ -159,7 +156,6 @@ service.gui.DISPLAY_NAME=שם צג
 service.gui.DND_STATUS=נא לא להפריע
 service.gui.DO_NOT_ASK_AGAIN=אל תשאל שוב
 service.gui.DO_NOT_SHOW_AGAIN=אל תציג את הודעה זו שוב
-service.gui.DOWNLOAD_NOW=&הורד כעת
 service.gui.DRAG_FOR_SHARING=גרור לכאן כל דבר אשר ברצונך לשתף...
 service.gui.DURATION=משך
 service.gui.EDIT=&ערוך
@@ -173,7 +169,6 @@ service.gui.ERROR_WAS=השגיאה היתה: {0}
 service.gui.ESTIMATED_TIME=אומדן זמן:
 service.gui.EVENTS=אירועים
 service.gui.EXIT=י&ציאה
-service.gui.EXTENDED_CRITERIA=קריטריון מורחב
 service.gui.GENERAL=כללי
 service.gui.GENERAL_ERROR=שגיאה גנרית
 service.gui.GROUP_NAME=שם קבוצה
@@ -227,7 +222,6 @@ service.gui.HIDE_OFFLINE_CONTACTS=התר אנשי קשר לא מקוונים
 service.gui.HISTORY=&היסטוריה
 service.gui.HISTORY_CONTACT=היסטוריה - {0}
 service.gui.HOME=בית
-service.gui.HOUR=שעה
 service.gui.IDENTIFIER=מזהה
 service.gui.IGNORE=&התעלם
 service.gui.INSERT_SMILEY=שבץ סמיילי
@@ -241,10 +235,8 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=הזמן אנשי קשר לגשר ו�
 service.gui.INVITE_REASON=סיבת הזמנה
 service.gui.IS_CALLING=מתקשר/ת כעת...
 service.gui.IS_NOW=‏{0} כעת {1}
-service.gui.JITSI_WARNING_TITLE=‏SIP Communicator נהיה Jitsi
 service.gui.JOIN=ה&צטרף
 service.gui.JOIN_AS=הצטרף &בתור
-service.gui.CLOSE_CHAT_ROOM_DIALOG=ס&גור
 service.gui.JOIN_CHAT_ROOM_NAME=אנא הזן את השם של חדר השיחה אליו ברצונך להצטרף.
 service.gui.KICK=&בעט
 service.gui.KICK_FAILED=בעיטה נכשלה
@@ -258,19 +250,16 @@ service.gui.MESSAGE=הודעה
 service.gui.MISSED_CALLS_TOOL_TIP=שיחה אשר לא נענתה מן:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= ועוד {0} נוספות
 service.gui.MODERATOR=אחראי
-service.gui.MORE=ראה עוד
 service.gui.MORE_LABEL=הזז
 service.gui.MOVE=הזז
 service.gui.MOVE_SUBCONTACT=ה&זז איש קשר
 service.gui.MOVE_SUBCONTACT_QUESTION=האם אתה בטוח כי ברצונך להעביר את {0} אל {1}?
 service.gui.MOVE_TO_GROUP=&העבר אל קבוצה
 service.gui.MOVE_CONTACT=הזז איש קשר
-service.gui.MOVE_CONTACT_ERROR=&איש קשר לא ניתן להזזה
 service.gui.MSG_DELIVERY_FAILURE=ההודעה לעיל לא היתה יכולה להימסר
 service.gui.MSG_DELIVERY_ERROR=נכשל למסור הודעה.
 service.gui.MSG_DELIVERY_UNKNOWN_ERROR=אירעה שגיאה לא מוכרת בעת מסירת הודעתך.
 service.gui.MSG_RECEIVED={0} כתב/ה
-service.gui.MUTE=השתק
 service.gui.NAME=שם
 service.gui.NETWORK=רשת עבודה
 service.gui.NETWORK_FAILURE=כשל רשת עבודה
@@ -297,7 +286,6 @@ service.gui.OPEN_FILE_FROM_IMAGE=קליק כפול כדי לפתוח קובץ.
 service.gui.OPEN_FOLDER=פתח תיקייה
 service.gui.OPEN_IN_BROWSER=פתח בתוך &דפדפן
 service.gui.OPTIONS=אפשרויות
-service.gui.OR_ENTER_PHONE_NUMBER=או הזן מספר טלפון כאן...
 service.gui.ORGANIZATION=ארגון:
 service.gui.OTHER=אחר
 service.gui.PASSWORD=סיסמה
@@ -310,7 +298,6 @@ service.gui.PREFERENCES=העדפות
 service.gui.PREFIX=קידומת
 service.gui.PRESS_FOR_CALL_INFO=לחץ למידע שיחה
 service.gui.PREVIOUS=קודם
-service.gui.PREVIOUS_TOOLTIP=עיון בשיחות ישנות
 service.gui.PRINT=&הדפס
 service.gui.PROTOCOL=פרוטוקול
 service.gui.QUIT=י&ציאה
@@ -318,7 +305,6 @@ service.gui.READY=מוכן
 service.gui.REASON=סיבה
 service.gui.RE_REQUEST_AUTHORIZATION=בקש שוב הרשאה
 service.gui.REJECT=&סרב
-service.gui.REMIND_ME_LATER=הזכר לי מאוחר יותר
 service.gui.REMEMBER_PASSWORD=זכור סיסמה
 service.gui.REMOVE=&הסר
 service.gui.REMOVE_ACCOUNT=&הסר חשבון
@@ -339,22 +325,15 @@ service.gui.REVOKE_ADMIN=שלול מנהלן
 service.gui.REVOKE_MODERATOR=שלול אחראי
 service.gui.REVOKE_MEMBERSHIP=שלול חברות
 service.gui.REVOKE_VOICE=שלול ביטוי
-service.gui.ROOT_GROUP=קבוצת שורש
 service.gui.SAVE=&שמור
-service.gui.SAVE_AS_DEFAULT=שמור כברירת מחדל
 service.gui.SEARCH=&חפש
 service.gui.SECURITY=אבטחה
-service.gui.SELECT_ACCOUNT=בחירת חשבון
 service.gui.SELECT_COLOR=בחירת צבע
 service.gui.SELECT_GROUP=בחירת קבוצה
 service.gui.SELECT_NO_GROUP=אין קבוצה
-service.gui.SELECT_GROUP_WIZARD=ציין קבוצה
-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=שלח בצורה של SMS
 service.gui.SEND_SMS=&שלח SMS
 service.gui.SEND_SMS_DETAILS=זכור כי עליך להזין את המספר בפורמט בינלאומי למשל ‎+44 עבור הממלכה המאוחדת לדוגמא, ‎+447777000000
 service.gui.SEND_SMS_NOT_SUPPORTED=הפרוטוקול בו בחרת לא תומך בהודעות SMS.
@@ -383,7 +362,6 @@ service.gui.STREET=רחוב
 service.gui.SUBJECT=נושא
 service.gui.SUMMARY=תמצית
 service.gui.TELEPHONY=טלפוניה
-service.gui.TODAY=היום
 service.gui.TOOLS=&כלים
 service.gui.TRANSFER=&העבר
 service.gui.TO=&אל:
@@ -391,7 +369,6 @@ service.gui.TRANSFER_CALL_MSG=בחר את שם של איש הקשר אשר בר�
 service.gui.TRANSFER_CALL_TITLE=העבר קריאה
 service.gui.TRANSFER_CALL_TO=העבר אל:
 service.gui.TYPE_YOUR_REQUEST=הקלד את בקשתך כאן
-service.gui.UNMUTE=איין השתקה
 service.gui.USER_IDENTIFIER=מזהה משתמש:
 service.gui.USER_EXISTS_ERROR=משתמש זה כבר קיים בשת הנבחרת. נא לבחור משתמש או רשת אחרים.
 service.gui.USERNAME_NULL=נא למלא שם משתמש וסיסמה.
@@ -401,7 +378,6 @@ service.gui.UNKNOWN_STATUS=מצב לא מוכר
 service.gui.UNREGISTERED_MESSAGE=לא ניתן להתקשר עם החשבון הבא: שם משתמש: {0}, שם שרת: {1}. הינך כעת לא מקוון.
 service.gui.VALUE=ערך:
 service.gui.VIDEO_CALL=&שיחת וידאו
-service.gui.VIA_SMS=באמצעות SMS
 service.gui.VIEW=&תצוגה
 service.gui.VIEW_HISTORY=הצג &היסטוריה
 service.gui.VIEW_SMILEYS=הצג &סמיילים
@@ -419,8 +395,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=התאם עוצמה
 service.gui.WAITING_AUTHORIZATION=ממתין להרשאה
 service.gui.WARNING=אזהרה
 service.gui.YES=כן
-service.gui.YESTERDAY=אתמול
-service.gui.EXISTING_ACCOUNT_ERROR=החשבון שהזנת כבר קיים.
 service.gui.NEW=חדש
 service.gui.ENTER_FULL_SCREEN_TOOL_TIP=הפעל מסך מלא
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=נטרל מסך מלא
@@ -436,7 +410,6 @@ service.gui.SECURITY_WARNING=אזהרת אבטחה
 service.gui.SECURITY_ERROR=שגיאת אבטחה
 service.gui.SPEED=מהירות:
 service.gui.SILENT_MEMBER=השתק חבר
-service.gui.UPDATE=עדכון
 service.gui.MOBILE_PHONE=נייד
 service.gui.VIDEO_PHONE=וידאו
 service.gui.WORK_PHONE=עבודה
@@ -465,7 +438,6 @@ service.gui.DECEMBER=דצמבר
 service.gui.callinfo.TECHNICAL_CALL_INFO=מידע שיחה טכני
 service.gui.callinfo.CALL_INFORMATION=מידע שיחה
 service.gui.callinfo.CALL_IDENTITY=זהות
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=הצפנה מאופשרת
 service.gui.callinfo.CALL_DURATION=משך שיחה
 service.gui.callinfo.VIEW_CERTIFICATE=הצג תעודה
 service.gui.callinfo.CODEC=קודק / תדירות
@@ -475,15 +447,19 @@ service.gui.callinfo.AUDIO_INFO=מידע אודיו
 service.gui.callinfo.VIDEO_INFO=מידע וידאו
 service.gui.callinfo.LOCAL_IP=‏IP מקומי / פורט
 service.gui.callinfo.REMOTE_IP=‏IP מרוחק / פורט
-service.gui.callinfo.BANDWITH=Bandwith
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.MEDIA_STREAM_RTP=RTP
 service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
+
+#enum values from IceProcessingState
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=‏IP מארח מקומי / פורט
 service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=‏IP מארח מרוחק / פורט
 
 service.gui.CERT_DIALOG_TITLE=אמת תעודה
 service.gui.CONTINUE_ANYWAY=המשך בכל אופן
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=שם כללי:
 service.gui.CERT_INFO_O=ארגון:
 service.gui.CERT_INFO_C=שם ארץ:
@@ -498,7 +474,6 @@ service.gui.CERT_INFO_SIGN_ALG=אלגוריתם חתימה:
 service.gui.CERT_INFO_ALG=אלגוריתם:
 service.gui.CERT_INFO_PUB_KEY=מפתח פומבי:
 service.gui.CERT_INFO_SIGN=חתימה:
-service.gui.CONTINUE=המשך
 service.gui.SHOW_CERT=הצג תעודה
 service.gui.HIDE_CERT=הסתר תעודה
 
@@ -511,8 +486,6 @@ service.gui.security.SECURE_AUDIO=אודיו מאובטח
 service.gui.security.AUDIO_NOT_SECURED=אודיו לא מאובטח
 service.gui.security.SECURE_VIDEO=וידאו מאובטח
 service.gui.security.VIDEO_NOT_SECURED=וידאו לא מאובטח
-service.gui.security.NO_VIDEO=אין וידאו
-service.gui.security.CIPHER=צופן: {0}
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=שיחה לא מאובטחת.
 # keep the following string short
 
@@ -526,15 +499,10 @@ service.gui.avatar.imagepicker.IMAGE_PICKER=תמונה
 service.gui.avatar.imagepicker.IMAGE_SIZE=מידת תמונה
 service.gui.avatar.imagepicker.RESET=איפוס
 service.gui.avatar.imagepicker.TAKE_PHOTO=לקיחת תמונה
-service.gui.avatar.imagepicker.WEBCAM_ERROR=שגיאת מצלמת רשת
 
 service.gui.security.encryption.required=נדרשת הצפנה!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 
 # systray
@@ -550,9 +518,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=בחר רשת עבודה
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=תצורת LDAP
 impl.ldap.GENERAL=כללי
-impl.ldap.NEW=חדש
 impl.ldap.EDIT=ערוך
-impl.ldap.REMOVE=הסר
 impl.ldap.ENABLED=מאופשרת
 impl.ldap.SERVER_NAME=שם שרת
 impl.ldap.SERVER_NAME_EXAMPLE=שרת LDAP
@@ -568,6 +534,10 @@ impl.ldap.MAILSUFFIX_FIELD_EXAMPLE=‏‎@domain.org (לא לשכוח להוסי
 impl.ldap.PHONE_PREFIX=קידומת טלפון
 impl.ldap.PHONE_PREFIX_EXAMPLE=דוגמא: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=ספר כתובות
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=אפשר חיפוש ספר טלפונים MacOSX
@@ -576,9 +546,7 @@ plugin.addrbook.PREFIX_EXAMPLE=דוגמא: 00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=אנשי קשר של Google
-impl.googlecontacts.NEW=חדש
 impl.googlecontacts.EDIT=ערוך
-impl.googlecontacts.REMOVE=הסר
 impl.googlecontacts.ENABLED=מאופשרת
 impl.googlecontacts.ACCOUNT_NAME=שם חשבון
 impl.googlecontacts.SAVE=שמור
@@ -601,9 +569,6 @@ plugin.accountinfo.GENDER=מין:
 plugin.accountinfo.COUNTRY=ארץ
 plugin.accountinfo.EMAIL=דוא״ל:
 plugin.accountinfo.PHONE=טלפון:
-plugin.accountinfo.USER_PICTURES=תמונת משתמש
-plugin.accountinfo.CHANGE=שנה
-plugin.accountinfo.ONLY_MESSAGE=הודעות בלבד
 
 # connection info
 
@@ -619,34 +584,16 @@ plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=פרוטוקול השירות AIM
 plugin.aimaccregwizz.USERNAME=שם תצוגה AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=שם תצוגה וסיסמה
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=רישום חשבון חדש
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=עקוף הגדרות שרת משתמטות
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=אודות {0}
 plugin.branding.ABOUT_MENU_ENTRY=&אודות
 
-# Dict protocol
-service.protocol.DICTIONARIES=מילונים
-plugin.dictaccregwizz.ANY_DICTIONARY=הוסף מילון
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=הוסף מילון מן {0}
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=פרוטוקול השירות Dict
-plugin.dictaccregwizz.HOST=מארח
-plugin.dictaccregwizz.SERVER_INFO=מידע שרת
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=מידע חשבון Dict
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=הפרוטוקול Facebook Chat
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=שם משתמש:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=שם משתמש וסיסמה
 
 # generalconfig
 plugin.generalconfig.SHOW_HISTORY=הצג
 plugin.generalconfig.HISTORY_SIZE=הודעות חדשות בשיחה חדשה
 plugin.generalconfig.SEND_MESSAGES_WITH=שלח הודעות עם:
-plugin.generalconfig.TRANSPARENCY=שקיפות
-plugin.generalconfig.ENABLE_TRANSPARENCY=אפשר שקיפות
 plugin.generalconfig.DEFAULT_LANGUAGE=שפת ממשק
 plugin.generalconfig.SIP_CLIENT_PORT=פורט לקוח SIP
 plugin.generalconfig.SIP_CLIENT_SECURE_PORT=פורט לקוח SIP מאובטח
@@ -680,11 +627,9 @@ plugin.ircaccregwizz.HOST=שם מארח:
 plugin.ircaccregwizz.IRC_SERVER=שרת
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=הפרוטוקול XMPP
 plugin.jabberaccregwizz.USERNAME=שם משתמש XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=אמת סיסמה
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=מזהה וסיסמה
 plugin.jabberaccregwizz.CSERVER=שרת
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=אפשר keep alive
 plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=רישום חשבון חדש XMPP
@@ -695,13 +640,9 @@ plugin.jabberaccregwizz.SERVER_COLUMN=שרת
 plugin.jabberaccregwizz.RESOURCE=משאב
 plugin.jabberaccregwizz.AUTORESOURCE=חולל משאב אוטומטית
 plugin.jabberaccregwizz.PRIORITY=עדיפות
-plugin.jabberaccregwizz.XMPP_ERROR=שגיאת XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=שגיאת XMPP לא מוכרת. ודא ששם השרת מדויק.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=סיסמתך לא תאמה.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=עקוף הגדרות שרת משתמטות
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=אפשרויות מתקדמות
 plugin.jabberaccregwizz.USE_ICE=השתמש ב־ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=נצל Google's Jingle/ICE (ניסיוני)
 plugin.jabberaccregwizz.TURN_USERNAME=שם משתמש TURN
 plugin.jabberaccregwizz.IP_ADDRESS=כתובת IP
 plugin.jabberaccregwizz.ADD_STUN_SERVER=הוסף שרת STUN
@@ -717,9 +658,6 @@ plugin.jabberaccregwizz.USE_UPNP=השתמש ב־UPnP
 plugin.jabberaccregwizz.EXISTING_ACCOUNT=חשבון XMPP קיים
 plugin.jabberaccregwizz.SERVER_OPTIONS=אפשרויות שרת
 plugin.jabberaccregwizz.CHANGE_PASSWORD=שנה סיסמת חשבון
-plugin.jabberaccregwizz.NEW_PASSWORD=סיסמה חדשה
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=אמת סיסמה חדשה
-plugin.jabberaccregwizz.PASSWORD_EMPTY=הסיסמה ריקה.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=הסיסמה שונתה בהצלחה
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=שרת jabber זה לא תומך בשינוי סיסמה.
 plugin.jabberaccregwizz.PASSWORD_NOT_STORED=הסיסמה שונתה בתוך השרת, אך תצורה מקומית לא עודכנה
@@ -731,23 +669,9 @@ plugin.jabberaccregwizz.VIDEO=וידאו
 plugin.jabberaccregwizz.RESET=איפוס
 plugin.jabberaccregwizz.RESET_DESCRIPTION=אפס אל ההגדרות הגלובליות
 
-# mailbox
-plugin.mailbox.OUTGOING=הודעות יוצאות:
-plugin.mailbox.INCOMING=הודעות נכנסות:
-plugin.mailbox.CONFIRM=אמת
-plugin.mailbox.DEFAULTS=ברירות מחדל
-plugin.mailbox.MAILBOX=תיבת דואר
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=פרוטוקול להתחברות ולשיחה בשירות MSN.
-plugin.msnaccregwizz.USERNAME=דוא״ל:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=מזהה וסיסמה
-
 # plugin manager
 plugin.pluginmanager.INSTALL=התקנה
 plugin.pluginmanager.UNINSTALL=הסרה
-plugin.pluginmanager.UPDATE=עדכון
 plugin.pluginmanager.PLUGINS=תוספות
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=בחר קובץ
@@ -767,7 +691,6 @@ plugin.sipaccregwizz.REGISTRAR=רשם
 plugin.sipaccregwizz.SERVER_PORT=פורט שרת
 plugin.sipaccregwizz.PROXY_PORT=פורט Proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=מוביל מועדף
-plugin.sipaccregwizz.ADVANCED_OPTIONS=אפשרויות מתקדמות
 plugin.sipaccregwizz.PROXY_OPTIONS=אפשרויות Proxy
 plugin.sipaccregwizz.PROXY_AUTO=הגדר Proxy אוטומטית
 plugin.sipaccregwizz.KEEP_ALIVE_METHOD=שיטת Keep alive
@@ -776,7 +699,6 @@ plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=בין 1 לבין 3600 שניות
 plugin.sipaccregwizz.DTMF_METHOD=שיטת טזמ״ת (DTMF)
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=מידע SIP
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=עקוף הגדרות שרת משתמטות
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=אפשר תמיכה להצפנת קריאות
 plugin.sipaccregwizz.AUTH_NAME=שם הרשאה
 plugin.sipaccregwizz.DISPLAY_NAME=שם צג
@@ -792,6 +714,7 @@ plugin.sipaccregwizz.XCAP_SERVER_URI=‏URI/כתובת שרת
 plugin.sipaccregwizz.VOICEMAIL=דואר קולי
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=הסיסמה שלך לא תואמת.
 plugin.sipaccregwizz.SAVP_OPTION=התוויית RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=כבוי (התווה על RTP/AVP בלבד) 
 plugin.sipaccregwizz.SAVP_OPTION_1=מחייב (הצע וקבל רק RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=רשות (הצע RTP/SAVP ראשית, אחרי כן RTP/AVP)
@@ -805,15 +728,6 @@ plugin.skinmanager.DEFAULT_SKIN=סקין משתמט
 plugin.skinmanager.ADD_NEW_SKIN=הוסף סקין חדש...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=הסקין משתמט של היישום.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=פרוטוקול להתחברות אל מכונות מרוחקות על פני SSH.
-plugin.sshaccregwizz.USERNAME=מזהה חשבון:
-plugin.sshaccregwizz.IDENTITY_FILE=קובץ זהות:
-plugin.sshaccregwizz.KNOWN_HOSTS=מארחים מוכרים:
-plugin.sshaccregwizz.OPTIONAL=רשות
-plugin.sshaccregwizz.ACCOUNT_DETAILS=פרטי חשבון
-
 # status update
 plugin.autoaway.ENABLE_CHANGE_STATUS=שנה מצב בזמן נעדרות
 
@@ -841,22 +755,6 @@ plugin.whiteboard.THICKNESS=עובי:
 plugin.whiteboard.DELETE=מחק
 plugin.whiteboard.PROPERTIES=מאפיינים
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=פרוטוקול להתחברות ולשיחה בשירות Yahoo‪!‬.
-plugin.yahooaccregwizz.USERNAME=שם משתמש:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=מזהה וסיסמה
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=פרוטוקול השירות Zeroconf (‫Bonjour)
-plugin.zeroaccregwizz.FIRST_NAME=שם פרטי:
-plugin.zeroaccregwizz.LAST_NAME=שם משפחה:
-plugin.zeroaccregwizz.EMAIL=דוא״ל:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=לזכור אנשי קשר Bonjour?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=מזהה וסיסמה
-plugin.zeroaccregwizz.USERID=מזהה משתמש
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=הפרוטוקול Google Talk
@@ -869,21 +767,16 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=‏iptel.org, פורטל טלקומ�
 plugin.iptelaccregwizz.USERNAME=שם משתמש
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=הרשמה אל iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=‏VoIP ושיחה
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=שם משתמש
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=הקלד מחדש סיסמה
 plugin.sip2sipaccregwizz.EMAIL=כתובת דוא״ל
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=חשבון sip2sip.info קיים
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=צור חשבון sip2sip.info חינמי
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.EXISTING_ACCOUNT=חשבון ippi קיים
 plugin.ippiaccregwizz.CREATE_ACCOUNT=צור חשבון ippi חינמי
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=סגור חלון שיחה
 plugin.keybindings.CHAT_COPY=העתק
 plugin.keybindings.CHAT_CUT=גזור
@@ -904,6 +797,7 @@ plugin.keybindings.globalchooser.SHOW_CONTACTLIST=הצג רשימת קשרים
 plugin.keybindings.globalchooser.SHORTCUT_NAME=שם
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=קיצור דרך עיקרי
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=קיצור דרך שני
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=שיחה
 plugin.keybindings.MAIN=ראשי
 plugin.keybindings.GLOBAL=קיצורי דרך גלובליים
@@ -918,6 +812,7 @@ plugin.notificationconfig.PROGRAM_FILE=קובץ תוכנית:
 plugin.notificationconfig.BROWSE_SOUND=בחר קובץ צליל
 plugin.notificationconfig.BROWSE_PROGRAM=בחר תוכנית
 plugin.notificationconfig.tableheader.DESCRIPTION=תיאור של אירוע
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=קריאה נכנסת
 plugin.notificationconfig.event.SecurityMessage=הודעת אבטחה
 plugin.notificationconfig.event.IncomingFile=קובץ נכנס
@@ -986,6 +881,7 @@ impl.neomedia.configform.AUDIO=שמע
 impl.neomedia.configform.VIDEO=וידאו
 
 impl.neomedia.configform.H264=H.264
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.main=ראשי
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTCP
 
@@ -1006,7 +902,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=סיסמה נוכחית:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=הזן סיסמה חדשה:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=הזן סיסמה שוב:
 plugin.securityconfig.masterpassword.MP_TITLE=סיסמה ראשית
-plugin.securityconfig.masterpassword.MP_NOT_SET=(לא נקבע)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=לא בזנת את הסיסמה הראשית המדויקצ. נא לנסות שוב.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=סיסמה ראשית אינה מדויקת!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=שינוי סיסמה נכשל
@@ -1021,7 +916,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=סיסמה
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(לא ידוע)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(לא ניתן לפענח)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=סיסמאות מאוחסנות
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=הסר
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=הסר הכל
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=האם אתה בטוח כי ברצונך להסיר את כל הסיסמאות?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=הסר את כל הסיסמאות
@@ -1106,7 +1000,6 @@ plugin.provisioning.RESTART_WARNING=שים לב שהשינויים שלך יכנ
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=העתק UUID אל לוח גזירה
 plugin.provisioning.CLIPBOARD_FAILED=כשל בהעתקת UUID אל לוח גזירה
-plugin.provisioning.EXIT_ON_FAIL=צא מהיישום במידה והאספקה נכשלת
 plugin.provisioning.CREDENTIALS=נתוני התחברות של אספקה שאוחסנו לאחרונה
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=האם אתה בטוח כי ברצונך להסיר סיסמת אספקה?
 plugin.provisioning.PROV_FAILED=אספקה נכשלה
@@ -1141,8 +1034,6 @@ net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult
 #plugin spellcheck
 plugin.spellcheck.TITLE=איות ודקדוק
 plugin.spellcheck.MENU=הצג איות ודקדוק
-plugin.spellcheck.LANG=שפה
-plugin.spellcheck.EDIT_PERSONAL_DICT=ערוך
 plugin.spellcheck.ENABLE_SPELL_CHECK=אפשר בדיקת איות
 plugin.spellcheck.dialog.FIND=מצא את הבא
 plugin.spellcheck.dialog.REPLACE=החלף   
diff --git a/resources/languages/resources_hi.properties b/resources/languages/resources_hi.properties
index 37df92d..1089715 100644
--- a/resources/languages/resources_hi.properties
+++ b/resources/languages/resources_hi.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -25,13 +36,27 @@
 # from your system's language, pass the language code to ant:
 # ant -Duser.language=xx run
 
+service.gui.ABOUT=बारे में
+service.gui.ACCEPT=स्वीकारें (&A)
 service.gui.ACCOUNT=खाता
+service.gui.ACCOUNT_ME=मैं
 service.gui.ACCOUNT_REGISTRATION_WIZARD=खाता पंजीकरण
 service.gui.ACCOUNTS=खाता
-service.gui.ADD_ACCOUNT=खाता जोड़ो
+service.gui.ADD=जोड़ें
+service.gui.ADD_CONTACT=संपर्क जोड़ें
+service.gui.ADD_AUTHORIZED_CONTACT=अपनी सम्पर्क सूची में जोड़ें
+service.gui.ADD_CONTACT_TO_CONTACTLIST=इस सम्पर्क को मेरी सम्पर्क सूची में जोड़ें
+service.gui.ADD_CONTACT_ERROR=आईडी के साथ संपर्क जोड़ने में विफल: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=संपर्क जोड़ने में त्रुटि
-service.gui.ADD_GROUP=समूह बनाये
+service.gui.ADD_CONTACT_EXIST_ERROR=संपर्क {0} पहले से ही आपकी संपर्क सूची में मौजूद है।
+service.gui.ADD_GROUP_ERROR=नाम के साथ समूह जोड़ने में विफल: {0}।
+service.gui.ADD_GROUP_EMPTY_NAME=समूह का नाम खाली नहीं होना चाहिए।
+service.gui.ADDRESS=पता
 service.gui.ADMINISTRATOR=प्रशासक
+service.gui.ADVANCED=विस्तृत
+service.gui.ALL_CONTACTS=सभी संपर्कों
+service.gui.ALTERNATE_ADDRESS=वैकल्पिक पता
+service.gui.APPLY=लागू करें 
 service.gui.ARE_NOW=आप अभी
 service.gui.AWAY_STATUS=दूर
 service.gui.BROWSE=ढूंढना
@@ -42,27 +67,30 @@ service.gui.CHANGE_NICK=उपनाम परिवर्तन
 service.gui.CHANGE_NICKNAME=उपनाम परिवर्तन
 service.gui.ROOM_NAME=गपशप के कमरे
 service.gui.CHAT_ROOMS=गपशप के कमरे
+service.gui.CHAT_ROOM=गपशप के कमरे
 service.gui.CONTACTS=संपर्क
 service.gui.CREATE_GROUP=समूह बनाये
-service.gui.DATE=तिथि
 service.gui.DELETE=मिटाएँ
 service.gui.DO_NOT_ASK_AGAIN=फिर ना पूछें
 service.gui.DURATION=अवधि
+service.gui.chat.role.ADMINISTRATOR=प्रशासक
+
 
 
 
+#enum values from IceProcessingState
 
 
 
+#service.gui.CERT_INFO_ are combined from Rdn names
+
+
 # keep the following string short
 
 # service.gui.avatar.imagepicker
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -71,6 +99,10 @@ service.gui.DURATION=अवधि
 
 # LDAP
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -85,9 +117,6 @@ service.gui.DURATION=अवधि
 
 # branding
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -99,20 +128,15 @@ service.gui.DURATION=अवधि
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -122,22 +146,19 @@ service.gui.DURATION=अवधि
 # whiteboard
 plugin.whiteboard.DELETE=मिटाएँ
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=गपशप
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -150,6 +171,7 @@ impl.media.security.zrtp.TITLE=कॉल
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
diff --git a/resources/languages/resources_hr.properties b/resources/languages/resources_hr.properties
index 2ac99d9..5640f9f 100644
--- a/resources/languages/resources_hr.properties
+++ b/resources/languages/resources_hr.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Ja
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Čarobnjak za registraciju kontakta
 service.gui.ACCOUNTS=Računi
 service.gui.ADD=&Dodaj
-service.gui.ADD_ACCOUNT=Dodaj račun
 service.gui.ADD_CONTACT=&Dodaj kontakt
 service.gui.ADD_AUTHORIZED_CONTACT=Dodaj {0} u svoju listu kontakata
 service.gui.ADD_CONTACT_TO=&Dodaj kontakt u
@@ -41,20 +51,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Dodaj kontakt greška
 service.gui.ADD_CONTACT_EXIST_ERROR=Kontakt {0} se već nalazi u listi kontakata
 service.gui.ADD_CONTACT_NETWORK_ERROR=Poslužitelj nije odgovorio na zahtjev za dodavanjem kontakta sa idenfikatorom: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Greška pri dodavanju kontakta sa identifikatorom: {0}. Operacija nije podržana.
-service.gui.ADD_CONTACT_IDENTIFIER=U niže navedeno polje unesite identifikator kontakta kojeg želite dodati.
-service.gui.ADD_CONTACT_WIZARD=Čarobnjak za dodavanje kontakata
 service.gui.ADD_CONTACT_NOT_CONNECTED=Morate biti spojeni da biste mogli dodati kontakt. Molimo prijavite se na odabranog davatelja i pokušajte ponovo.
 service.gui.ADD_GROUP_LOCAL_ERROR=Greška prilikom dodavanja grupe sa imenom: {0}. Problem se javio tijekom lokalne IO operacije.
 service.gui.ADD_GROUP_EXIST_ERROR=Grupa {0} već postoji u vašem popisu kontakata. Molimo odaberite drugo ime.
 service.gui.ADD_GROUP_NET_ERROR=Greška prilikom dodavanja grupa sa imenom: {0}. Problem se javio zbog pada mreže. Provjerite svoje mrežne veze i pokušajte ponovo.
 service.gui.ADD_GROUP_ERROR=Greška prilikom dodavanja grupe sa imenom: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Ime grupe ne smije biti prazno.
-service.gui.ADD_GROUP=Kreiraj grupu
-service.gui.ADD_SUBCONTACT=&Dodaj podkontakt
 service.gui.ADDRESS=Adresa
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=&Napredno
-service.gui.ALL=&Sve
 service.gui.ALL_CONTACTS=&Svi kontakti
 service.gui.ALTERNATE_ADDRESS=Druga adresa
 service.gui.APPLY=&Primijeni
@@ -64,7 +69,6 @@ service.gui.AT=na
 service.gui.AUTHORIZE=&Odobri
 service.gui.AUTHORIZATION_ACCEPTED={0} je prihvatio vaš zahtjev za autorizaciju.
 service.gui.AUTHENTICATION_FAILED=Autentikacija nije uspjela za {0}. Unešena lozinka nije ispravna.
-service.gui.AUTHENTICATION_REQUESTED=Zatražena autentikacija
 service.gui.AUTHENTICATION_REJECTED={0} je odbio zahtjev za autorizaciju.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} provjera autentičnosti
 service.gui.AUTHORIZATION_REQUESTED=Zahtjev za autorizaciju
@@ -96,23 +100,18 @@ service.gui.CHANGE_NICKNAME_LABEL=Možete unijeti nadimak u polje ispod.
 service.gui.CHANGE_NICKNAME_ERROR=Greška pri promjeni nadimka
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nadimak već postoji
 service.gui.CHANGE_VIDEO_QUALITY=Promijeni kvalitet prikaza udaljenog videa.
-service.gui.CHAT_CONFERENCE_LABEL=Konferencije
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0} konferencija
 service.gui.CHAT_ROOM_ALREADY_JOINED=Soba {0} je već uključena.
 service.gui.CHAT_ROOM_CONFIGURATION=Konfiguracija sobe {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Slanje poruka je zabranjeno (glasovno opozvano)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Spremi sobu za buduću uporabu
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Briše označenu sobu iz popisa spremljenih soba
 service.gui.CHAT_ROOM_NAME=Ime sobe
 service.gui.CLEAR_CUSTOM_MESSAGES=Obriši korisnički definirane poruke
 service.gui.ROOM_NAME=Soba za razgovor
-service.gui.AUTOJOIN=Automatsko pridruživanje
 service.gui.CHANGE_PASSWORD=Promijeni lozinku
 service.gui.CHAT_ROOM_NAME_INFO=Unesite ime sobe za razgovor koju želite kreirati u polje ispod.
 service.gui.CHAT_ROOM_NOT_EXIST=Na poslužitelju {1} ne postoji soba {0}. Provjerite jeste li upisali ispravno ime.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Morate biti spojeni da biste se pridružili sobi {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Morate biti spojeni da biste mogli izaći iz sobe.
-service.gui.CHAT_ROOM_NOT_JOINED=Morate biti prijavljeni u sobi da biste radili dodatne operacije u njoj.
 service.gui.CHAT_ROOM_OPTIONS=Opcije sobe za razgovor
 service.gui.CHAT_ROOM=Soba za razgovor
 service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} je promijenio temu u {1}
@@ -124,20 +123,16 @@ service.gui.CITY=Grad
 service.gui.COUNTRY=Zemlja
 service.gui.SHOW_MORE_TOOLTIP=Kliki za prikaz više rezultata
 service.gui.CONNECTION=Veza
-service.gui.CONNECTION_FAILED_MSG=Za sljedeći račun veza nije uspjela: Korisničko ime: {0}, Poslužitelj: {1}. Provjerite mrežne veze ili kontaktirajte mrežnog administratora za više informacija.
 service.gui.CONNECTION_EXPIRED_MSG=Trenutno ste isključeni sa poslužitelja {0}.
 service.gui.CONTACT_NAME=ID ili Broj
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Odabrani kontakt {0} ne podržava telefoniranje.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Odabrani kontakt {0} ne podržava konferenciju.
 service.gui.CONTACT_PAUSED_TYPING={0} je prestao pisati
 service.gui.CONTACT_TYPING={0} piše poruku
 service.gui.CONTACT_TYPING_SEND_FAILED=uh... nismo mogli obavijestiti {0} da ste pisali
 service.gui.CREATE_CHAT_ROOM_WIZARD=Čarobnjak za kreiranje soba za razgovor
 service.gui.CREATE_CONFERENCE_CALL=&Kreiraj konferencijski poziv
-service.gui.CREATE_CONFERENCE_CHAT=&Kreiraj konferenciju
 service.gui.CREATE_GROUP=&Kreiraj grupu...
 service.gui.CREATE_GROUP_NAME=Unesite ime grupe koju želite kreirati u polje ispod
-service.gui.CREATE_FIRST_GROUP_WIZARD=Vaš popis kontakata ne sadrži niti jednu grupu. Prvo kreirajte grupu (Datoteka/Kreiraj grupu).
 service.gui.CREATE_VIDEO_BRIDGE=Kreiraj &video most...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Kreiraj &video most
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Kreiraj / priključi se video konferenciji
@@ -145,7 +140,6 @@ service.gui.DISCONNECTED_STATUS=Isključen
 service.gui.DND_STATUS=Ne smetaj
 service.gui.DO_NOT_ASK_AGAIN=Ne pitaj ponovno
 service.gui.DO_NOT_SHOW_AGAIN=Ne prikazuj više ovu poruku
-service.gui.DOWNLOAD_NOW=&Preuzmi sada
 service.gui.DRAG_FOR_SHARING=Povucite ovdje sve što želite dijeliti...
 service.gui.DURATION=trajanje
 service.gui.DESTROY_CHATROOM=Izbriši sobu za razgovor
@@ -157,7 +151,6 @@ service.gui.ERROR_RECEIVED_FROM=Greška primljena od {0}
 service.gui.ESTIMATED_TIME=Očekivano vrijeme:
 service.gui.EVENTS=Događaji
 service.gui.EXIT=I&zlaz
-service.gui.EXTENDED_CRITERIA=Proširi uvjet
 service.gui.GENERAL=Općenito
 service.gui.FILE_RECEIVE_FAILED=Greška prilikom prebacivanja datoteke od {0}.
 service.gui.FILE_SENDING_TO=Šaljem datoteku prema {0}.
@@ -189,7 +182,6 @@ service.gui.HISTORY=&Povijest
 service.gui.HISTORY_REMOVE_ERROR=Greška prilikom brisanja lokalno spremljenih poruka.
 service.gui.HOME=Početak
 service.gui.HOME_PAGE=Početna stranica
-service.gui.HOUR=Sat
 service.gui.IDENTIFIER=Identifikator
 service.gui.IGNORE=&Zanemari
 service.gui.INSERT_SMILEY=Ubaci smješka
@@ -205,6 +197,11 @@ service.gui.IS_NOW={0} je sada {1}
 
 
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
 # keep the following string short
@@ -213,9 +210,6 @@ service.gui.IS_NOW={0} je sada {1}
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -224,6 +218,10 @@ service.gui.IS_NOW={0} je sada {1}
 
 # LDAP
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -238,9 +236,6 @@ service.gui.IS_NOW={0} je sada {1}
 
 # branding
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -252,20 +247,15 @@ service.gui.IS_NOW={0} je sada {1}
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -274,21 +264,18 @@ service.gui.IS_NOW={0} je sada {1}
 
 # whiteboard
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+#Enum KeybindingSet.Category
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -300,6 +287,7 @@ service.gui.IS_NOW={0} je sada {1}
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
diff --git a/resources/languages/resources_hu.properties b/resources/languages/resources_hu.properties
index 47ac7ba..f7bfa1f 100644
--- a/resources/languages/resources_hu.properties
+++ b/resources/languages/resources_hu.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -25,60 +36,54 @@
 # from your system's language, pass the language code to ant:
 # ant -Duser.language=xx run
 
-service.gui.ABOUT=Névjegy
-service.gui.ACCEPT=Elfogad
+service.gui.ABOUT=&Névjegy
+service.gui.ACCEPT=&Elfogadás
 service.gui.ACCOUNT=Felhasználói fiók
 service.gui.ACCOUNT_ME=Én
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Fiók regisztrációs varázsló
 service.gui.ACCOUNTS=Felhasználói fiókok
-service.gui.ADD=Hozzáad
-service.gui.ADD_ACCOUNT=Fiók hozzáadása
-service.gui.ADD_CONTACT=Partner felvétele
+service.gui.ADD=&Hozzáadás
+service.gui.ADD_CONTACT=&Partner felvétele
 service.gui.ADD_AUTHORIZED_CONTACT={0} felvétele a partnerlistára
 service.gui.ADD_CONTACT_TO_CONTACTLIST=A partner felvétele a partnerlistára
 service.gui.ADD_CONTACT_TO=Partner felvétele ehhez
 service.gui.ADD_CONTACT_ERROR={0} partner felvétele nem sikerült
 service.gui.ADD_CONTACT_ERROR_TITLE=Hiba a partner felvételekor
-service.gui.ADD_CONTACT_EXIST_ERROR={0} már szerepel partnerként a partnerlistában
+service.gui.ADD_CONTACT_EXIST_ERROR={0} már szerepel partnerlistában
 service.gui.ADD_CONTACT_NETWORK_ERROR=A szerver nem válaszolt {0} partnerfelvételi kérelmünkre
 service.gui.ADD_CONTACT_NOT_SUPPORTED={0} partner felvétele nem sikerült. Ez a művelet nem támogatott.
-service.gui.ADD_CONTACT_IDENTIFIER=Ebbe a mezőbe írd be annak a partnernek az azonosítóját, akit fel szeretnél venni.
-service.gui.ADD_CONTACT_WIZARD=Partner felvételi varázsló
 service.gui.ADD_CONTACT_NOT_CONNECTED=Partner felvételéhez kapcsolódva kell lenned. Jelentkezz be a kiválasztott szolgáltatóhoz, és próbáld újra.
 service.gui.ADD_GROUP_LOCAL_ERROR=A {0} csoport létrehozása nem sikerült. A probléma egy helyi IO művelet közben történt.
 service.gui.ADD_GROUP_EXIST_ERROR=A {0} csoport már szerepel a partnerlistában. Válassz egy másik nevet.
 service.gui.ADD_GROUP_NET_ERROR=A {0} csoport létrehozása nem sikerült. A problémát hálózati hiba okozta. Ellenőrizd a hálózati kapcsolatod, és próbáld újra.
 service.gui.ADD_GROUP_ERROR=A {0} csoport létrehozása nem sikerült.
 service.gui.ADD_GROUP_EMPTY_NAME=A csoport neve nem lehet üres.
-service.gui.ADD_GROUP=Csoport létrehozása
-service.gui.ADD_SUBCONTACT=Alpartner felvétele
 service.gui.ADDRESS=Cím
 service.gui.ADMINISTRATOR=rendszergazda
-service.gui.ADVANCED=Speciális
-service.gui.ALL=Mind
-service.gui.ALL_CONTACTS=Minden partner
+service.gui.ADVANCED=&Speciális
+service.gui.ALL_CONTACTS=&Minden partner
 service.gui.ALTERNATE_ADDRESS=Alternatív cím
-service.gui.APPLY=Alkalmaz
+service.gui.APPLY=&Alkalmaz
 service.gui.ARE_CALLING={0} hív...
 service.gui.ARE_NOW=Te most {0} vagy
-service.gui.AUTHORIZE=Engedélyez
+service.gui.AT=itt:
+service.gui.AUTHORIZE=&Engedélyezés
 service.gui.AUTHORIZATION_ACCEPTED={0} elfogadta az engedélyezési kérésed.
 service.gui.AUTHENTICATION_FAILED={0} hitelesítése nem sikerült. A beírt jelszó nem jó.
-service.gui.AUTHENTICATION_REQUESTED=Hitelesítés folyamatban
 service.gui.AUTHENTICATION_REQUESTED_SERVER=A {0} szerver kéri, hogy hitelesítsd magad.
 service.gui.AUTHENTICATION_REJECTED={0} elutasította az engedélyezési kérésed.
-service.gui.AUTHENTICATION_WINDOW_TITLE={0} engedélyezés
+service.gui.AUTHENTICATION_WINDOW_TITLE={0} hitelesítés
 service.gui.AUTHORIZATION_REQUESTED=Engedélyezés folyamatban
-service.gui.AUTHORIZATION_REQUESTED_INFO={0} partner kéri az engedélyezésedet.
+service.gui.AUTHORIZATION_REQUESTED_INFO={0} partner kéri az engedélyezésed.
 service.gui.AUTHORIZATION_RESPONSE=Válasz az engedélyezésre
 service.gui.AWAY_STATUS=Nincs a gépnél
-service.gui.EXTENDED_AWAY_STATUS=Hosszabb ideje nincs a gépnél
-service.gui.BAN=Letilt
-service.gui.BANNED=letiltva
-service.gui.BAN_FAILED=Letiltás nem sikerült
-service.gui.BAN_FAILED_GENERAL_ERROR={0} letiltása nem sikerült. Egy meg nem határozott szerver hiba történt.
-service.gui.BAN_FAILED_NOT_ALLOWED={0} letiltása nem sikerült. A csevegőszoba tulajdonosa és rendszergazdája nem tiltható le.
-service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS={0} letiltása nem sikerült. A letiltáshoz nincs elég jogosultságod.
+service.gui.EXTENDED_AWAY_STATUS=Hosszabb távollét
+service.gui.BAN=&Kitiltás
+service.gui.BANNED=kitiltva
+service.gui.BAN_FAILED=Kitiltás sikertelen
+service.gui.BAN_FAILED_GENERAL_ERROR={0} kitiltása nem sikerült. Egy meg nem határozott szerver hiba történt.
+service.gui.BAN_FAILED_NOT_ALLOWED={0} kitiltása nem sikerült. A csevegőszoba tulajdonosa és rendszergazdája nem tiltható ki.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS={0} kitiltása nem sikerült. Nincs jogosultságod.
 service.gui.BRB_MESSAGE=Most nem vagyok a gépnél, de nemsokára leszek.
 service.gui.BROWSE=Böngészés
 service.gui.BUSY_MESSAGE=Bocsánat, most el vagyok foglalva.
@@ -87,7 +92,7 @@ service.gui.CALL=Hívás
 service.gui.CALL_CONTACT=Partner hívása
 service.gui.CALL_FAILED=Sikertelen hívás
 service.gui.CALL_HISTORY_TOOL_TIP=A korábbi hívások listájáért kattints ide.
-service.gui.CALL_HISTORY_GROUP_NAME=Korábbi hívások
+service.gui.CALL_HISTORY_GROUP_NAME=Hívástörténet
 service.gui.CALL_VIA=Hívás ezen keresztül:
 service.gui.CALL_NAME_OR_NUMBER=Név vagy szám hívása
 service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=Ezzel a hívással csak a {0} hálózatban lévők, és a te {1} fiókod hívható. {2} nem tartalmaz ehhez a hálózathoz, illetve fiókhoz tartozó címet.
@@ -106,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Ebbe a mezőbe írd be az új beceneved.
 service.gui.CHANGE_NICKNAME_ERROR=Hiba a becenév megváltoztatása közben
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Ez a becenév már létezik
 service.gui.CHANGE_VIDEO_QUALITY=A távoli videó minőség megváltoztatása
-service.gui.CHAT_CONFERENCE_LABEL=Konferenciák
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0} konferenciája
 service.gui.CHAT_ROOM_ALREADY_JOINED=A(z) {0} csevegés már csatlakozott.
 service.gui.CHAT_ROOM_CONFIGURATION={0} csevegés beállítása
@@ -120,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=távozott {0}-ból/ből
 service.gui.CHAT_ROOM_USER_KICKED=ki lett rúgva {0}-ból/ből
 service.gui.CHAT_ROOM_USER_QUIT=kilépett {0}-ból/ből
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Tilos üzenet küldeni (hang nem engedélyezett)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Elmenti a csevegést későbbi használatra
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Törli a kiválasztott csevegést az elmentett csevegések listájából.
 service.gui.CHAT_ROOM_NAME=Csevegés neve
 service.gui.CLEAR_CUSTOM_MESSAGES=Testreszabott üzenetek törlése
 service.gui.ROOM_NAME=Csevegés
-service.gui.AUTOJOIN=Automatikus csatlakozás
 service.gui.CHANGE_PASSWORD=Jelszó megváltoztatása
 service.gui.CHAT_ROOM_NAME_INFO=Ebbe a mezőbe írd be a létrehozandó csevegés nevét.
 service.gui.CHAT_ROOM_NOT_EXIST=A(z) {0} csevegés nem található a(z) {1} szerveren. Ellenőrizd, hogy beírt név helyes-e.
 service.gui.CHAT_ROOM_NOT_CONNECTED=A(z) {0} csevegéshez való csatlakozáshoz be kell jelentkezned.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Csak bejelentkezve tudsz kilépni a csevegésből.
-service.gui.CHAT_ROOM_NOT_JOINED=A csevegéshez előbb csatlakoznod kell, hogy abban további műveleteket tudj kezdeményezni.
 service.gui.CHAT_ROOM_OPTIONS=Csevegés beállítások
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=A(z) {0} csevegéshez való csatlakozáshoz regisztráció szükséges.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=A(z) {0} csevegés jelszót igényel.
@@ -139,6 +139,7 @@ service.gui.CHAT_ROOMS=Csevegések
 service.gui.CHAT_ROOM=Csevegés
 service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} megváltoztatta a tárgyat {1}-ra/re
 service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=Folytathatod a beszélgetést a {0} csevegésben.
+service.gui.CHAT_NICKNAME_CHANGE={0} új neve {1}
 service.gui.CHOOSE_CONTACT=Válassz partnert
 service.gui.CHOOSE_NUMBER=Válassz számot
 service.gui.CHOOSE_ACCOUNT=Válassz egyet a alábbi fiókok közül.
@@ -149,54 +150,199 @@ service.gui.CLEAR=Törlés
 service.gui.CLOSE=Bezár
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Az utolsó üzenetet kevesebb mint 2 másodperccel ezelőtt kaptad. Biztos, hogy be akarod zárni ezt a csevegést?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Fájlküldés folyamatban. Biztos, hogy le akarod állítani?
-service.gui.CONFIRM=Mehet
 service.gui.CONNECTED_STATUS=Kapcsolódva
 service.gui.CONNECTING=Kapcsolódás...
 service.gui.CONNECTING_STATUS=Kapcsolódás
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Kapcsolódás*
 service.gui.CONNECTION=Kapcsolat
-service.gui.CONNECTION_FAILED_MSG=Kapcsolat sikertelen a következő fiókkal: Felhasználó: {0}, szerver név: {1}. Ellenőrizd a hálózati kapcsolatod, vagy további információért lépj kapcsolatba a hálózat-karbantartóval.
 service.gui.CONNECTION_EXPIRED_MSG=Jelenleg le vagy kapcsolódva a {0} szerverről.
 service.gui.CONTACT_NAME=Azonosító vagy szám
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=A kiválasztott {0} partner nem képes telefonálni.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=A kiválasztott {0} partner nem képes csevegés konferenciázni. 
 service.gui.CONTACT_PAUSED_TYPING={0} szünetet tart az üzenet írása közben
 service.gui.CONTACT_TYPING={0} üzenetet ír
 service.gui.CONTACT_TYPING_SEND_FAILED=hűha... nem tudtuk megmondani {0}-nak/nek, hogy írtál
 service.gui.CONTACT_INFO=Elérhetőség
-service.gui.CONTACTLIST=Partnerlista
+service.gui.CONTACTS=Partnerek
+service.gui.COPY=Másolás
+service.gui.COPY_LINK=Hivatkozás másolása
+service.gui.CREATE=Létrehoz
+servoce.gui.CREATE_CALL_FAILED=A hívás indítása sikertelen.
+service.gui.CREATE_CHAT_ROOM=Csevegés létrehozása...
 service.gui.CREATE_CHAT_ROOM_ERROR={0} csevegés létrehozása sikertelen.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Csevegés létrehozó varázsló
 service.gui.CREATE_CONFERENCE_CALL=Konferenciahívás létrehozása...
-service.gui.CREATE_CONFERENCE_CHAT=Konferencia csevegés létrehozása...
 service.gui.CREATE_GROUP=Csoport létrehozása...
 service.gui.CREATE_GROUP_NAME=Ebbe a mezőbe írd be a létrehozandó csoport nevét.
-service.gui.CREATE_FIRST_GROUP_WIZARD=A partnerlistád nem tartalmaz egy csoportot sem. Először hozz létre egy csoportot (Fájl -> Csoport létrehozása).
 service.gui.CREATE_VIDEO_BRIDGE=Videó híd létrehozása...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Videó híd létrehozása
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Videó konferencia kezdés / csatlakozás
 service.gui.CREATE_VIDEO_CONFERENCE=Új videó konferencia létrehozása ebben a csevegésben
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Ennek a partnernek nincs webes elérhetősége
 service.gui.CUT=Kivágás
-service.gui.DATE=Dátum
 service.gui.DELETE=Töröl
 service.gui.DENY=Elutasít
 service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyődet?</b> <br> A Rendben-re kattintva a hívás minden résztvevője látni fogja a képernyődet.
-
-
-
-
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Képernyő megosztva
+service.gui.DIALPAD=Számlap
+service.gui.DISPLAY_NAME=Képernyő név
+service.gui.DISCONNECTED_STATUS=Kapcsolat bontva
+service.gui.DND_STATUS=Ne zavarj
+service.gui.DO_NOT_ASK_AGAIN=Többször ne kérdezd
+service.gui.DO_NOT_SHOW_AGAIN=Ez az üzenet többször ne jelenjen meg.
+service.gui.DRAG_FOR_SHARING=Húzd ide bármit, amit meg akarsz osztani...
+service.gui.DURATION=időtartam
+service.gui.DESTROY_CHATROOM=Csevegés megsemmisítése
+service.gui.DESTROY_MESSAGE=Csevegés megsemmisítése
+service.gui.EDIT=Szerkeszt
+service.gui.EDITED_AT={0}-nál/nél szerkesztett
+service.gui.EMAIL=Email
+service.gui.EMAILS=Emailek
+service.gui.EMPTY_HISTORY=Előzmények törlése
+service.gui.ENABLE_DESKTOP_REMOTE_CONTROL=Munkaasztal távvezérlés engedélyezése
+service.gui.ENABLE_TYPING_NOTIFICATIONS=Jelezze másoknál, ha üzenetet írunk nekik (csevegés tevékenység küldése)
+service.gui.END_CONFERENCE=Konferencia befejezése
+service.gui.ENTER_PHONE_NUMBER=Írd be a telefonszámot
+service.gui.ENTER_NAME_OR_NUMBER=Írd be a nevet vagy a számot
+service.gui.ERROR=Hiba
+service.gui.ERROR_WAS=Hiba: {0}
+service.gui.ERROR_RECEIVED_FROM=Hibát kaptunk {0}-tól/től
+service.gui.ESTIMATED_TIME=Becsült időtartam:
+service.gui.EVENTS=Események
+service.gui.EXIT=Kilépés
+service.gui.GENERAL=Általános
+service.gui.GENERAL_ERROR=Általános hiba
+service.gui.GROUP_NAME=Csoport neve
+service.gui.FAILED_STATUS=Sikertelen hívás
+service.gui.FAILED_TO_JOIN_CHAT_ROOM={0} nem tudott csatlakozni a csevegéshez.
+service.gui.FAX=Fax
+service.gui.FFC_STATUS=Elérhető (csevegésre)
+service.gui.FILE=Fájl
+service.gui.FILE_WAITING_TO_ACCEPT=Várakozás {0}-ra/re, hogy elfogadja a fájlodat.
+service.gui.FILE_UNABLE_TO_SEND=Hiba a {0}-nak/nek szánt fájl küldése közben.
+service.gui.FILE_RECEIVE_FAILED=Hiba a {0}-tól/től érkező fájl fogadása közben.
+service.gui.FILE_SENDING_TO=Fájl küldése {0}- nak/nek.
+service.gui.FILE_RECEIVING_FROM=Fájl fogadása {0}-tól/től.
+service.gui.FILE_SEND_COMPLETED=A fájl küldés sikerült {0}-nak/nek.
+service.gui.FILE_RECEIVE_COMPLETED=Fájl fagadva {0}-tól/től.
+service.gui.FILE_TRANSFER_CANCELED=Fájl átvitel törölve.
+service.gui.FILE_SEND_FAILED=Fájl küldés sikertelen: {0}.
+service.gui.FILE_TOO_BIG=A fájlméret meghaladja a protokol által maximálisan engedélyezett méretet: {0}.
+service.gui.FILE_SEND_REFUSED={0} visszautasította ezt a fájlt.
+service.gui.FILE_TRANSFER_REFUSED=A fájl fogadása vissza lett visszautasítva.
+service.gui.FILE_TRANSFER_NOT_SUPPORTED=A kiválasztott partner nem támogatja a fájl átvitelt.
+service.gui.FILE_TRANSFER_PREPARING=Fájl küldés előkészítése {0}-nak/nek. Kis türelmet...
+service.gui.FILE_TRANSFER_REQUEST_RECIEVED={0} szeretne egy fájlt megosztani veled.
+service.gui.FILE_DOES_NOT_EXIST=Az adott fájl nem található. Vagy törölve lett, vagy át lett helyezve.
+service.gui.FILE_OPEN_FAILED=Nem sikerült megnyitni a fájlt. Valószínű törölve lett, vagy át lett helyezve.
+service.gui.FILE_OPEN_NOT_SUPPORTED=A fájl megnyitás funkciót ez a rendszer sajnos nem támogatja.
+service.gui.FILE_OPEN_NO_PERMISSION=Nincs elég jogosultságod ennek a fájlnak a megnyitására. Ellenőrizd az olvasási jogosultságaidat, és próbáld meg újra.
+service.gui.FILE_OPEN_NO_APPLICATION=Ehhez a fájl típushoz nem található alkalmazás.
+service.gui.FINISH=Befejez
+service.gui.FOLDER_DOES_NOT_EXIST=Az ezt a fájlt tartalmazó mappa nem található. Vagy törölve lett, vagy át lett helyezve.
+service.gui.FOLDER_OPEN_FAILED=A mappa megnyitása nem sikerült.
+service.gui.FOLDER_OPEN_NO_PERMISSION=Nincs elég jogosultságod ennek a mappának a megnyitásához. Ellenőrizd az olvasási jogosultságaidat, és próbáld meg újra.
+service.gui.FOLDER_OPEN_NO_APPLICATION=Nem találtunk olyan alkalmazást, ami meg tudná nyitni ezt a mappát.
+service.gui.FONT=Betűtípus
+service.gui.FONT_BOLD=Félkövér
+service.gui.FONT_COLOR=Szín
+service.gui.FONT_FAMILY=Család
+service.gui.FONT_ITALIC=dőlt
+service.gui.FONT_SIZE=Méret
+service.gui.FONT_STYLE=Stílus
+service.gui.FONT_UNDERLINE=Aláhúzott
+service.gui.GRANT_OWNERSHIP=Tulajdonjog megadása...
+service.gui.GRANT_ADMIN=Adminisztrátor jogosultság megadása...
+service.gui.GRANT_MODERATOR=Közvetítő (moderator) jogosultság megadása
+service.gui.GRANT_MEMBERSHIP=Tagság megadása
+service.gui.GRANT_VOICE=Hang megadása
+service.gui.GUEST=látogató
+service.gui.HANG_UP=Vonalbontás
+service.gui.HD_QUALITY=HD videó
+service.gui.HELP=Súgó
+service.gui.HIDE=Elrejt
+service.gui.HIDE_OFFLINE_CONTACTS=Kijelentkezett partnerek elrejtése
+service.gui.HIDE_MAIN_WINDOW=<DIV>Az X ablak gomb megnyomása nem lépteti ki az alkalmazást, hanem<BR>csak elrejti. Ha ki akarsz lépni, akkor azt a Fájl/Kilépés pontra kattintva teheted.</DIV>
+service.gui.HISTORY=Előzmények
+service.gui.HISTORY_CONTACT=Előzmények - {0}
+service.gui.HISTORY_TOGGLE_PER_CONTACT=Az ehhez a partnerhez tartozó előzmények rögzítésének kikapcsolása
+service.gui.HISTORY_TOGGLE_PER_CHATROOM=Előzmények kikapcsolása ebben a csevegésben
+service.gui.HISTORY_TOGGLE_ALL=Előzmények kikapcsolása az összes csevegésben, és az összes partnerrel
+service.gui.HISTORY_ERASE_PER_CONTACT=Az összes előzmény törlése ezzel a partnerrel
+service.gui.HISTORY_ERASE_PER_CHATROOM=Az összes előzmény törlése ebben a csevegésben
+service.gui.HISTORY_ERASE_ALL=Az összes előzmény törlése {0}-ban/ben
+service.gui.HISTORY_REMOVE_PER_CONTACT_WARNING=Biztosan véglegesen törölni akarod az összes ezen a gépen tárolt üzenetet {0}-val/vel?
+service.gui.HISTORY_REMOVE_ALL_WARNING=Biztosan véglegesen törölni akarod az összes ezen a gépen tárolt üzenetet?
+service.gui.HISTORY_REMOVE_ERROR=Az ezen a gépen tárolt üzenetek törlése nem sikerült.
+service.gui.HOME=Kezdőlap
+service.gui.HOME_PAGE=Kezdő oldal
+service.gui.ICE=ICE (?)
+service.gui.IDENTIFIER=Azonosító
+service.gui.IGNORE=Mégse
+service.gui.INSERT_SMILEY=Mosolygó arc beillesztése
+service.gui.INCOMING_CALL=Bejövő hívás {0}-tól/től
+service.gui.INCOMING_SCREEN_SHARE=Képernyőmegosztás kezdeményezés {0}-tól/től
+service.gui.INCOMING_CALL_STATUS=Bejövő hívás
+service.gui.INCOMING_SCREEN_SHARE_STATUS=Bejövő képernyőmegosztás
+service.gui.INSTANT_MESSAGINGS=Üzenetek
+service.gui.IM=Üzenet
+service.gui.INITIATING_CALL_STATUS=Hívás kezdeményezése
+service.gui.INVITATION=Meghívó szövege
+service.gui.INVITATION_RECEIVED=Meghívás érkezett
+service.gui.INVITATION_RECEIVED_MSG={0} meghívott, hogy csatlakozz a(z) {1} csevegéshez. Elfogadhatod, elutasíthatod, vagy figyelmen kívül hagyhatod ezt a meghívást.
+service.gui.INVITATION_REJECTED={0} elutasította meghívásodat a csevegéshez való csatlakozáshoz. Ok: {1}.
+service.gui.INVITE=Meghív
+service.gui.INVITE_CONTACT_MSG=Válaszd ki azoknak a partnereknek a nevét, akiket ehhez a csevegéshez szeretnél hozzáadni, és kattints a Meghív gombra.
+service.gui.INVITE_CONTACT_TO_CHAT=Partnerek meghívása csevegéshez
+service.gui.INVITE_CONTACT_TO_CALL=Partnerek meghívása beszélgetéshez
+service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Partnerek meghívása videó átjátszásra (video bridge)
+service.gui.INVITE_REASON=A meghívás oka
+service.gui.IS_CALLING={0} hív...
+service.gui.IS_NOW={0} mostantól {1}
+service.gui.JOIN=Csatlakozás
+service.gui.JOIN_AS=Csatlakozás másként
+service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Csatlakozás meglévő videókonferenciához
+service.gui.JOIN_VIDEO=Videó csatlakoztatása
+service.gui.JOB_TITLE=Beosztás
+service.gui.JOIN_CHAT_ROOM=Csatlakozás csevegéshez...
+service.gui.JOIN_CHAT_ROOM_TITLE=Csatlakozás csevegéshez
+service.gui.JOIN_CHAT_ROOM_NAME=Írd be a csevegés nevét, amihez csatlakozni szeretnél.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Csevegés csatlakozó varázsló
+service.gui.JOIN_AUTOMATICALLY=Csatlakozás automatikusan
+service.gui.DONT_JOIN_AUTOMATICALLY=Ne csatlakozzon automatikusan
+service.gui.KICK=Kick (?)
+service.gui.KICK_FAILED=Kirúgás sikertelen
+service.gui.KICK_FAILED_GENERAL_ERROR={0} kirúgása nem sikerült. Általános szerver hiba történt.
+service.gui.KICK_FAILED_NOT_ALLOWED={0} kirúgása nem sikerült. A csevegés tulajdonosát és adminisztrátorát nem lehet kirúgni.
+service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS={0} kirúgása nem sikerült. A kirúgáshoz nincs elég jogosultságod.
+service.gui.LAST_NAME=Vezetéknév
+service.gui.LEAVE=Elhagy
+service.gui.LIMIT_REACHED_FOR_IP=Túl sok regisztráció van már a helyi IP címről, és a(z) {0} szerver nem enged már többet nyitni.
+service.gui.LIST=Lista
+service.gui.LOADING_ROOMS=Csevegések betöltése...
+service.gui.LOADING=Betöltés...
+service.gui.LOCALLY_ON_HOLD_STATUS=Helyileg várakoztatva
+service.gui.LOGIN_NETWORK_ERROR=A bejelentkezés hálózati hiba miatt nem sikerült: felhasználó: {0}, szerver név: {1}. Ellenőrizd a hálózati csatlakozásodat. 
+service.gui.LOGIN_GENERAL_ERROR=Hiba bejelentkezés közben: felhasználó: {0}, szerver név: {1}:{2}.
+service.gui.chat.role.ADMINISTRATOR=rendszergazda
+service.gui.SHOW_OFFLINE_CONTACTS=Kijelentkezett partnerek elrejtése
+
+
+
+
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
 # keep the following string short
 
 # service.gui.avatar.imagepicker
+service.gui.avatar.imagepicker.CANCEL=Mégse
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -204,12 +350,28 @@ service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyőd
 # New Account Dialog
 
 # LDAP
+impl.ldap.GENERAL=Általános
+impl.ldap.EDIT=Szerkeszt
+impl.ldap.CANCEL=Mégse
+impl.ldap.MAIL_FIELD_EXAMPLE=Email
+
+# SIP Protocol
+
+#Jabber Protocol
 
 # Address book plugin
 
 # Google Contacts
+impl.googlecontacts.EDIT=Szerkeszt
+impl.googlecontacts.CANCEL=Mégse
 
 # account info
+plugin.accountinfo.DISPLAY_NAME=Képernyő név
+plugin.accountinfo.LAST_NAME=Vezetéknév
+plugin.accountinfo.CITY=Város
+plugin.accountinfo.COUNTRY=Ország
+plugin.accountinfo.EMAIL=Email
+plugin.accountinfo.JOB_TITLE=Beosztás
 
 # connection info
 
@@ -218,10 +380,8 @@ service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyőd
 # aimaccregwizz
 
 # branding
+plugin.branding.ABOUT_MENU_ENTRY=Névjegy
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -230,50 +390,54 @@ service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyőd
 # icqaccregwizz
 
 # irc accregwizz
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} engedélyezés
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+plugin.sipaccregwizz.DISPLAY_NAME=Képernyő név
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
+plugin.updatechecker.BUTTON_CLOSE=Bezár
 
 # usersearch
 
 # whiteboard
-
-# yahoo accregwizz
-
-# zero accregwizz
+plugin.whiteboard.COLOR=Szín
+plugin.whiteboard.DELETE=Töröl
 
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+plugin.keybindings.CHAT_COPY=Másolás
+plugin.keybindings.CHAT_CUT=Kivágás
+#Enum KeybindingSet.Category
+plugin.keybindings.CHAT=Csevegés
 
 # Notification Configuration Form
+#NotificationsTable constants
+plugin.notificationconfig.event.IncomingCall=Bejövő hívás
+plugin.notificationconfig.event.IncomingFile=Bejövő hívás
+plugin.notificationconfig.event.HangUp=Vonalbontás
 
 # ZRTP Securing
 
 # ZRTP Configuration
+impl.media.security.zrtp.TITLE=Hívás
 
 
 
@@ -281,6 +445,7 @@ service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyőd
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
@@ -288,6 +453,10 @@ service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyőd
 # Security configuration form title
 
 # otr plugin
+plugin.otr.authbuddydialog.CANCEL=Mégse
+plugin.otr.authbuddydialog.HELP=Súgó
+plugin.otr.configform.GENERATE=Általános
+plugin.otr.configform.COLUMN_NAME_CONTACT=Partnerek
 
 # global proxy plugin
 #plugin.globalproxy.PROTOCOL_SUPPORT
@@ -297,17 +466,21 @@ service.gui.DESKTOP_SHARING_WARNING=<b>Biztosan meg akarod osztani a képernyőd
 
 #plugin chat config
 
+plugin.chatconfig.TITLE=Csevegés
 
 #provisioning plugin
 
 # packet logging service
 
 # dns config plugin
+net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=Mégse
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=Elutasít
 
 #plugin spellcheck
 
 
 #Certificate configuration plugin
+plugin.certconfig.KEYSTORE=Fájl
 
 # Phone number contact source plugin
 
diff --git a/resources/languages/resources_id.properties b/resources/languages/resources_id.properties
index e142468..9ad1416 100644
--- a/resources/languages/resources_id.properties
+++ b/resources/languages/resources_id.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Saya
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Pemandu Pendaftaran Akun
 service.gui.ACCOUNTS=Akun-akun
 service.gui.ADD=&Tambah
-service.gui.ADD_ACCOUNT=Tambah akun
 service.gui.ADD_CONTACT=&Tambah kontak
 service.gui.ADD_AUTHORIZED_CONTACT=Tambah {0} ke daftar kontak anda
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Tambahkan {0} ke daftar kontak anda
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Kegagalan menambah kontak
 service.gui.ADD_CONTACT_EXIST_ERROR=Kontak {0} sudah ada di daftar kontak anda.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Server tidak merespon permintaan menambahkan kontak dengan id: {0}
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Gagal menambahkan kontak dengan id: {0}. Operasi tidak didukung.
-service.gui.ADD_CONTACT_IDENTIFIER=Pada isian dibawah masukan pengenal dari kontak yang ingin anda tambahkan.
-service.gui.ADD_CONTACT_WIZARD=Pemandu penambahan kontak
 service.gui.ADD_CONTACT_NOT_CONNECTED=Anda harus terhubung agar dapat menambahkan kontak. Silahkan terhubung ke provider terpilih dan coba lagi.
 service.gui.ADD_GROUP_LOCAL_ERROR=Gagal menambah grup dengan nama: {0}. Permasalahan terjadi pada saat operasi Input/Output lokal
 service.gui.ADD_GROUP_EXIST_ERROR=Grup {0} sudah ada di daftar kontak anda. Silahkan gunakan nama yang lain.
 service.gui.ADD_GROUP_NET_ERROR=Gagal menambah grup dengan nama: {0}. Permasalah terjadi karena kesalahan jaringan. Silahkan periksa koneksi jaringan dan coba lagi.
 service.gui.ADD_GROUP_ERROR=Gagal menambah grup dengan nama: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Nama grup tidak boleh kosong.
-service.gui.ADD_GROUP=Buat grup
-service.gui.ADD_SUBCONTACT=&Tambah sub-kontak
 service.gui.ADDRESS=Alamat
 service.gui.ADMINISTRATOR=administratur
 service.gui.ADVANCED=&Mahir
-service.gui.ALL=&Semua
 service.gui.ALL_CONTACTS=&Semua kontak
 service.gui.ALTERNATE_ADDRESS=Alamat alternatif
 service.gui.APPLY=&Terapkan
@@ -65,7 +70,6 @@ service.gui.AT=di
 service.gui.AUTHORIZE=Otorisasikan
 service.gui.AUTHORIZATION_ACCEPTED={0} kontak telah menerima permintaan otorisasi anda.
 service.gui.AUTHENTICATION_FAILED=Autentikasi gagal untuk {0}. Kata sandi yang anda masukkan tidak benar.
-service.gui.AUTHENTICATION_REQUESTED=Autentikasi diminta
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Server {0} telah meminta autentikasi anda.
 service.gui.AUTHENTICATION_REJECTED={0} telah menolak permintaan autorisasi anda.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autentikasi
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Pada isian dibawah, anda dapat menuliskan pang
 service.gui.CHANGE_NICKNAME_ERROR=Gagal merubah nama panggilan
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nama panggilan sudah ada
 service.gui.CHANGE_VIDEO_QUALITY=Ubah kualitas remote video 
-service.gui.CHAT_CONFERENCE_LABEL=Konferensi
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=konferensi milik {0} 
 service.gui.CHAT_ROOM_ALREADY_JOINED=Sudah tergabung dengan ruang bincang {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=konfigurasi ruang bincang {0}
@@ -119,13 +122,11 @@ service.gui.CHAT_ROOM_USER_KICKED=telah diusir dari {0}
 service.gui.CHAT_ROOM_USER_QUIT=telah menghentikan {0}
 service.gui.CHAT_ROOM_NAME=Nama ruang bincang
 service.gui.ROOM_NAME=Ruang Bincang
-service.gui.AUTOJOIN=Gabung Otomatis
 service.gui.CHANGE_PASSWORD=Ubah Kata Sandi
 service.gui.CHAT_ROOM_NAME_INFO=Pada isian dibawah tuliskan nama ruang bincang yaang ingin anda buat.
 service.gui.CHAT_ROOM_NOT_EXIST=Ruang {0} tidak ditemukan pada server {1}. Silahkan periksa apakah nama yang anda ketikkan sudah benar.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Anda perlu login untuk ikut dalam ruang bincang {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Anda perlu login untuk meninggalkan sebuah ruang bincang.
-service.gui.CHAT_ROOM_NOT_JOINED=Anda harus tergabung dalam ruang bincang untuk melakukan hal lebih lanjut.
 service.gui.CHAT_ROOM_OPTIONS=Pilihan ruang bincang
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Ruang bincang {0} membutuhkan pendaftaran untuk dapat bergabung.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Ruang bincang {0} meminta kata sandi.
@@ -139,16 +140,13 @@ service.gui.CONNECTING=Menyambung...
 service.gui.CONNECTING_STATUS=Sambungan
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Menyambung...
 service.gui.CONNECTION=Sambungan
-service.gui.CONNECTION_FAILED_MSG=Koneksi gagal untuk akun berikut: Nama Pengguna: {0}, Nama Server: {1}. Silaahkan periksa koneksi jaringan atau hubungi administratur jaringan anda untuk informasi lebih lanjut.
 service.gui.CONNECTION_EXPIRED_MSG=Anda saat ini terputus dari server {0}.
 service.gui.CONTACT_NAME=ID atau Nomer
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Kontak terpilih {0} tidak mendukung telephony.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Kontak terpilih {0} tidak mendukung konferensi perbincangan.
 service.gui.CONTACT_PAUSED_TYPING={0} berhenti mengetikkan pesan
 service.gui.CONTACT_TYPING={0} sedang mengetik pesan
 service.gui.CONTACT_TYPING_SEND_FAILED=wakwawww.. kami tidak dapat memberitahu {0} anda sedang menulis
 service.gui.CONTACT_INFO=&Informasi kontak
-service.gui.CONTACTLIST=Daftar Kontak
 service.gui.CONTACTS=Kontak
 service.gui.COPY=Salin
 service.gui.COPY_LINK=Salin tautan
@@ -158,15 +156,12 @@ service.gui.CREATE_CHAT_ROOM=&Buat ruang bincang..
 service.gui.CREATE_CHAT_ROOM_ERROR=Gagal membuat ruang bincang {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Pemandu pembuatan ruang bincang
 service.gui.CREATE_CONFERENCE_CALL=&Buat sebuah panggilan konferensi...
-service.gui.CREATE_CONFERENCE_CHAT=&Buat sebuah perbincangan konferensi...
 service.gui.CREATE_GROUP=&Buat grup
 service.gui.CREATE_GROUP_NAME=Pada isian dibawah ketikkan nama grup yang ingin anda buat.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Tidak ada grup dalam daftar kontak anda. Silahkan membuat sebuah grup dahulu.
 service.gui.CREATE_VIDEO_BRIDGE=Membuat jembatan &video...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Membuat jembatan &video
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Kontak ini tidak mendukung informasi web
 service.gui.CUT=Potong
-service.gui.DATE=Tanggal
 service.gui.DELETE=Hapus
 service.gui.DENY=Tolak
 service.gui.DESKTOP_SHARING_WARNING=<b>Anda yakin ingin menmulai berbagi layar?</b> <br> Memilih OK akan mengijinkan orang dalam panggilan ini untuk melihat tampilan layar anda.
@@ -176,7 +171,6 @@ service.gui.DISCONNECTED_STATUS=Terputus
 service.gui.DND_STATUS=Jangan diganggu
 service.gui.DO_NOT_ASK_AGAIN=Jangan tanya lagi
 service.gui.DO_NOT_SHOW_AGAIN=Jangan tampilkan pesan ini lagi
-service.gui.DOWNLOAD_NOW=Unduh sekarang
 service.gui.DRAG_FOR_SHARING=Seret kesini apa saja yang ingin anda bagi...
 service.gui.DURATION=durasi
 service.gui.EDIT=&Edit
@@ -193,7 +187,6 @@ service.gui.ERROR_WAS=Kesalahan yaitu: {0}
 service.gui.ESTIMATED_TIME=Perkiraan waktu:
 service.gui.EVENTS=Kejadian
 service.gui.EXIT=Keluar
-service.gui.EXTENDED_CRITERIA=Kriteria tambahan
 service.gui.GENERAL=Umum
 service.gui.GENERAL_ERROR=Kesalahan umum
 service.gui.GROUP_NAME=Nama grup
@@ -251,12 +244,12 @@ service.gui.HISTORY=Riwayat
 service.gui.HISTORY_CONTACT=Riwayat - {0}
 service.gui.HOME=Beranda
 service.gui.HOME_PAGE=Halaman Depan
-service.gui.HOUR=Jam
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Pengenal
 service.gui.IGNORE=Abaikan
 service.gui.INSERT_SMILEY=Masukkan senyuman
 service.gui.INCOMING_CALL=Panggilan masuk diterima dari: {0}
+service.gui.INCOMING_SCREEN_SHARE=Panggilan masuk diterima dari: {0}
 service.gui.INCOMING_CALL_STATUS=Panggilan masuk
 service.gui.INITIATING_CALL_STATUS=Memulai panggilan
 service.gui.INVITATION=Teks undangan
@@ -269,11 +262,8 @@ service.gui.INVITE_CONTACT_TO_CALL=Undang kontak ke panggilan
 service.gui.INVITE_REASON=ALasan undangan
 service.gui.IS_CALLING=sedang memanggil...
 service.gui.IS_NOW={0} sekarang {1}
-service.gui.JITSI_WARNING=SIP Communicator telah berganti nama menjadi Jitsi.<br/>Jika anda ingin  versi milik anda tetap terkini, silahkan unduh Jitsi.<br/><br/>Kami mohon maaf atass ketidaknyamanan ini<br/><br/> Tim PengembangJitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator menjadi Jitsi
 service.gui.JOIN=Gabung
 service.gui.JOIN_AS=Gabung sebagai
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Tutup
 service.gui.JOB_TITLE=Pekerjaan
 service.gui.JOIN_CHAT_ROOM=Gabung ruang bincang...
 service.gui.JOIN_CHAT_ROOM_TITLE=Gabung ruang bincang
@@ -284,7 +274,6 @@ service.gui.KICK_FAILED=Pengusiran gagal
 service.gui.KICK_FAILED_GENERAL_ERROR=Gagal mengusir {0}. Terjadi kesalahan umum server.
 service.gui.KICK_FAILED_NOT_ALLOWED=Gagal mengusir {0}. Pemilik dan administratur ruang tidak dapat diusir.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Gagal mengusir {0}. Anda tidak punya cukup hak untuk melakukannya.
-service.gui.LAST=Teerakhir
 service.gui.LAST_NAME=Nama Belakang:
 service.gui.LEAVE=Pergi
 service.gui.LIMIT_REACHED_FOR_IP=Anda telah memiliki terlalu banyak pendaftaran dari alamat IP lokal dan server {0} tidak mengijinkan membuka lebih lanjut lagi.
@@ -304,7 +293,6 @@ service.gui.MESSAGE=Pesan:
 service.gui.MISSED_CALLS_TOOL_TIP=Pesan tak terjawab dari:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= dan {0} lagi
 service.gui.MODERATOR=moderator
-service.gui.MORE=Lihat lebih lanjut
 service.gui.MORE_LABEL=Pindah
 service.gui.MOVE=Pindah
 service.gui.MOVE_SUBCONTACT=Pindahkan Kontak
@@ -313,7 +301,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Kontak yang anda pilih sama dengan sumber. Ha
 service.gui.MOVE_SUBCONTACT_QUESTION=Apa anda yakin ingin memindahkan {0} ke {1}?
 service.gui.MOVE_TO_GROUP=&Pindah ke grup
 service.gui.MOVE_CONTACT=Pindah Kontak
-service.gui.MOVE_CONTACT_ERROR=Kontak tidak dapat dipindahkan
 service.gui.MSG_DELIVERY_FAILURE=Pesan diatas tidak dapat terkirim
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Protokol yang anda gunaakan tidak mendukung pesan offline. Anda dapat mencoba menghubungi kontak ini melalui protokol lain atau menunggu sampai dia online.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Sebuah kesalahan internal telah terjadi. Kemungkinan besar ini adalah cacat aplikasi. Harap laporkan ke: http://www.sip-communicator.org/index.php/Development/BugsAndIssues. Server mengembalikan error: {0}
@@ -324,7 +311,6 @@ service.gui.MSG_NOT_POSSIBLE=Pengiriman pesan tidak dimungkinkan untuk kontak in
 service.gui.MSG_RECEIVED={0} menulis
 service.gui.MSG_SEND_CONNECTION_PROBLEM=Anda harus terhubung untuk dapat mengirim pesan.
 service.gui.MULTIPLE_LOGINS=Anda telah masuk lebih dari sekali dengan akun yang sama. Akun berikut: Nama Pengguna: {0}, Nama Server: {1} saat ini terputus.
-service.gui.MUTE=Bisu
 service.gui.NAME=Nama
 service.gui.NETWORK=Jaringan
 service.gui.NETWORK_FAILURE=Kesalahan Jaringan
@@ -334,6 +320,7 @@ service.gui.NEW_MESSAGE=Pesan baru
 service.gui.NEW_NAME=Nama baru
 service.gui.NEW_STATUS_MESSAGE=Status pesan baru
 service.gui.NEW_STATUS_MESSAGE_SAVE=Simpan sebagai pesan unik
+service.gui.NICKNAME=Nama panggilan
 service.gui.NO=Tidak
 service.gui.NONE=Tidak ada
 service.gui.NO_CAMERA_AVAILABLE=Tidak ada kamera
@@ -353,7 +340,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=TidakDiDaftarKontak
 service.gui.SD_QUALITY=Kualitas standard
 service.gui.OFFLINE=Offline
 service.gui.OK=OK
-service.gui.OLDER_CALLS=Panggilan lama
 service.gui.ONLINE=Online
 service.gui.OPEN=Buka
 service.gui.OPEN_FILE_FROM_IMAGE=Klik ganda untuk membuka berkas.
@@ -361,9 +347,12 @@ service.gui.OPEN_FOLDER=Buka folder
 service.gui.OPEN_IN_BROWSER=Buka di browser
 service.gui.OPTIONS=Pilihan
 service.gui.OR=atau
-service.gui.OR_ENTER_PHONE_NUMBER=atau masukkan nomor telepon disini...
 service.gui.ORGANIZATION=Organization:
 service.gui.OTHER=Lainnya
+service.gui.chat.role.ADMINISTRATOR=administratur
+service.gui.chat.role.MODERATOR=moderator
+service.gui.chat.role.MEMBER=anggota
+service.gui.chat.role.SILENT_MEMBER=anggota diam
 service.gui.OWNER=pemilik ruang
 service.gui.PASSWORD=Kata Sandi
 service.gui.PASSWORD_CHANGE_FAILURE=Perubahan kata sandi gagal
@@ -377,7 +366,6 @@ service.gui.PRESENCE=Kehadiran
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' untuk saran
 service.gui.PRESS_FOR_CALL_INFO=Tekan untuk informasi panggilan
 service.gui.PREVIOUS=Sebelumnya
-service.gui.PREVIOUS_TOOLTIP=Jalajahi percakapan lama
 service.gui.PRINT=Cetak
 service.gui.PROACTIVE_NOTIFICATION=sedang mengetik pesan
 service.gui.PROTOCOL=Protokol
@@ -389,7 +377,6 @@ service.gui.REASON=Alasan
 service.gui.RECONNECTION_LIMIT_EXCEEDED=Anda telah terputus dan menyambung kembali ke server terlalu cepat. Akun berikut: Nama Pengguna {0}, Nama Server: {1} sementara dicekal dan harus menunggu sementara sebelum mencoba untuk masuk lagi. 
 service.gui.RE_REQUEST_AUTHORIZATION=Meminta otorisasi
 service.gui.REJECT=Tolak
-service.gui.REMIND_ME_LATER=Ingatkan saya nanti
 service.gui.REMEMBER_PASSWORD=Ingat kata sandi
 service.gui.REMOVE=Hapus
 service.gui.REMOVE_ACCOUNT=Hapus akun
@@ -413,27 +400,18 @@ service.gui.REVOKE_ADMIN=Batalkan administrasi
 service.gui.REVOKE_MODERATOR=Batalkan pengaturan
 service.gui.REVOKE_MEMBERSHIP=Batalkan keanggotaan
 service.gui.REVOKE_VOICE=Batalkan suara
-service.gui.ROOT_GROUP=Grup utama
 service.gui.SAVE=Simpan
-service.gui.SAVE_AS_DEFAULT=Simpan sebagai default
 service.gui.SEARCH=Cari
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Klik tombol dibawah untuk menampilkan semua ruang bincang yang terssedia di server terpilih. Lalu pilih satu yang anda ingin bergabung dan tekan tombol Gabung.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Kontak pencarian
 service.gui.SECURITY=Keamanan
-service.gui.SELECT_ACCOUNT=Pilih akun
 service.gui.SELECT_COLOR=Pilih warna
 service.gui.SELECT_GROUP=Pilih grup
-service.gui.SELECT_GROUP_WIZARD_MSG=daftar dibawah berisi seluruh grup dalam daftar kontak anda. Pilih satu yang anda ingin tambahkan kontak baru.
 service.gui.SELECT_NO_GROUP=Tidak ada grup
-service.gui.SELECT_GROUP_WIZARD=Tentukan grup
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Daftar dibawah berisi seluruh akun yang mendukung fitur percakapan banyak pengguna. Pilih satu yang anda inginkan untuk membuat ruang bincang anda.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Daftar dibawah berisi seluruh akun yang terdaftar. Pilih satu yang anda inginkan untuk berkomunikasi dengan kontak baru.
-service.gui.SELECT_PROVIDERS_WIZARD=Pilih aakun
 service.gui.SEND=Kirim
 service.gui.SEND_FILE=Kirim berkas
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Tidak ada informasi untuk kontak ini.
 service.gui.SEND_MESSAGE=Kirim sebuah pesan
-service.gui.SEND_AS_SMS=Kirim sebagai SMS
 service.gui.SEND_SMS=Kirim SMS
 service.gui.SEND_SMS_DETAILS=Ingat bahwa abda perlu memasukkan angka dalam bentuk internasional, seperti dimulai dengan +62 untuk Indonesia dengan contoh +629998812345
 service.gui.SEND_SMS_NOT_SUPPORTED=Protokol yang anda pilih tidak mendukung pesan SMS.
@@ -468,7 +446,6 @@ service.gui.STREET=Jalan
 service.gui.SUBJECT=Subyek
 service.gui.SUMMARY=Ringkasan
 service.gui.TELEPHONY=Telephony
-service.gui.TODAY=Hari ini
 service.gui.TOOLS=Perkakas
 service.gui.TRANSFER=Pengiriman
 service.gui.TO=Kepada:
@@ -478,7 +455,6 @@ service.gui.TRANSFER_CALL_TO=Kirim Ke:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transsparansi tidak didukung oleh konfigurasi anda saat ini.
 service.gui.TYPE_YOUR_REQUEST=Ketikkan permintaan anda disini
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Kami tidak dapat mengubah kualitas video untuk kontak ini.
-service.gui.UNMUTE=Bersuara
 service.gui.USER_IDENTIFIER=Identitas pengguna:
 service.gui.USER_EXISTS_ERROR=Pengguna ini sudah ada di jaringan terpilih. Silahkan pilih pengguna atau jaringan lainnya.
 service.gui.USERNAME_NULL=Silahkan isi nama pengguna dan kata sandi anda.
@@ -488,7 +464,6 @@ service.gui.UNKNOWN_STATUS=Keadaan tidak diketahui
 service.gui.UNREGISTERED_MESSAGE=Tidak dapat menghubungi akun berikut: Nama Pengguna: {0}, Nama Server: {1}. Anda saat ini offline.
 service.gui.VALUE=Nilai
 service.gui.VIDEO_CALL=Panggilan video
-service.gui.VIA_SMS=Melalui SMS
 service.gui.VIEW=Tampilan
 service.gui.VIEW_HISTORY=Lihat riwayat
 service.gui.VIEW_SMILEYS=Lihat Senyuman
@@ -508,9 +483,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Mengatur volume
 service.gui.WAITING_AUTHORIZATION=Menunggu otorisasi
 service.gui.WARNING=Peringatan
 service.gui.YES=Ya
-service.gui.YESTERDAY=Kemarin
-service.gui.EXISTING_ACCOUNT_ERROR=Akun yang anda ketikkan sudah terinstal.
-service.gui.NEW_MAIL=<b>Anda memiliki satu Surat baru!</b><br/><b>Dari:</b> {0} {1} <br/><b>Subyek:</b> {2} <br/>{3}
 service.gui.NEW_GMAIL_HEADER=Anda telah menerima sebuah surat baru dalam <a href="{1}">inbox</a> {0} anda:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Anda telah menerima {2} surat baru dalam <a href="{1}">inbox</a> {0} anda:<br/>
 service.gui.NEW_GMAIL_FOOTER=satu atau lebih percakapan belum terbaca dalam <a href="{0}">inbox</a> anda.<br/>
@@ -563,7 +535,6 @@ service.gui.callinfo.CALL_INFORMATION=Informasi panggilan
 service.gui.callinfo.CALL_IDENTITY=Pengenal
 service.gui.callinfo.PEER_COUNT=jumlah peserta
 service.gui.callinfo.IS_CONFERENCE_FOCUS=fokus konferensi
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Penyandian aktif
 service.gui.callinfo.CALL_TRANSPORT=transport panggilan dihubungi
 service.gui.callinfo.CALL_DURATION=Durasi panggilan
 service.gui.callinfo.VIEW_CERTIFICATE=Tampilkan Sertifikat
@@ -581,10 +552,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=protokol pertukaran kunci
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=tipe perluasan kandidat ICE
 service.gui.callinfo.ICE_STATE=Tahapan Pemrosesan ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=kumpulkan kandidat
 service.gui.callinfo.ICE_STATE.RUNNING=Memeriksa koneksi
 service.gui.callinfo.ICE_STATE.COMPLETED=Selesai
 service.gui.callinfo.ICE_STATE.FAILED=Gagal
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=IP / Port komputer lokal
 service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=IP / Port komputer remote
 service.gui.callinfo.DECODED_WITH_FEC=paket di-decode dengan FEC
@@ -595,9 +569,10 @@ service.gui.ALWAYS_TRUST=Selalu percaya sertifikat ini
 service.gui.CERT_DIALOG_TITLE=Periksa Sertifikat
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} tidak dapat memeriksa indentitas server ketika menghubungi <br>{1}:{2}.<br><br> Sertifikat tidak terpercaya, yang berarti identitas server tidak dapat diperiksa secara otomatis. Apakah anda ingin meneruskan menyambung?<br><br> Untuk informasi lebih lanjut, klik "Tampilkan Sertifikat".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} tidak dapat memeriksa indentitas server ketika menghubungi <br>{1}:{2}.<br><br> Sertifikat tidak terpercaya, yang berarti identitas server tidak dapat diperiksa secara otomatis. Apakah anda ingin meneruskan menyambung?<br><br> Untuk informasi lebih lanjut, klik "Tampilkan Sertifikat".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} tidak dapat memeriksa indentitas server ketika menghubungi <br>{1}:{2}.<br><br> Sertifikat tidak terpercaya, yang berarti identitas server tidak dapat diperiksa secara otomatis. Apakah anda ingin meneruskan menyambung?<br><br> Untuk informasi lebih lanjut, klik "Tampilkan Sertifikat".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} tidak dapat memeriksa indentitas server ketika menghubungi <br>{1}:{2}.<br><br> Sertifikat tidak terpercaya, yang berarti identitas server tidak dapat diperiksa secara otomatis. Apakah anda ingin meneruskan menyambung?<br><br> Untuk informasi lebih lanjut, klik "Tampilkan Sertifikat".</html>
 service.gui.CONTINUE_ANYWAY=Tetap lanjutkan
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Common Name:
 service.gui.CERT_INFO_O=Organization:
 service.gui.CERT_INFO_C=Country Name:
@@ -611,12 +586,10 @@ service.gui.CERT_INFO_VER=Versi:
 service.gui.CERT_INFO_SIGN_ALG=Algoritma Tanda Tangan:
 service.gui.CERT_INFO_ALG=Algoritma
 service.gui.CERT_INFO_PUB_KEY=Kunci Publik:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Eksponen
 service.gui.CERT_INFO_KEY_SIZE=Panjang Kunci
 service.gui.CERT_INFO_SIGN=Tanda Tangan:
-service.gui.CONTINUE=Lanjutkan
 service.gui.SHOW_CERT=Tampilkan Sertifikat
 service.gui.HIDE_CERT=Sembunyikan Sertifikat
 
@@ -635,11 +608,9 @@ service.gui.security.SECURE_AUDIO=Audio diamankan
 service.gui.security.AUDIO_NOT_SECURED=Audio tidak diamankan
 service.gui.security.SECURE_VIDEO=Video diamankan
 service.gui.security.VIDEO_NOT_SECURED=Video tidak diamankan
-service.gui.security.NO_VIDEO=Tidak ada video
-service.gui.security.CIPHER=Penyandi: {0}
+service.gui.security.CALL_SECURED_TOOLTIP=Panggilan diamankan. Untuk informasi lebih lanjut tekan disini.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Panggilan tidak diamankan.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Tekan disini untuk membandingkan raasia keamanan dengan rekan anda.
-service.gui.security.COMPARE_WITH_PARTNER=Bandingkan dengan rekan dan ketik gembok untuk konfirmasi.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Bandingkan dengan rekan: {0}
 service.gui.security.STRING_COMPARED=String terbandingkan!
@@ -656,19 +627,13 @@ service.gui.avatar.imagepicker.CLICK=Tekan dan Senyum
 service.gui.avatar.imagepicker.IMAGE_FILES=Berkas gambar
 service.gui.avatar.imagepicker.IMAGE_PICKER=Gambar
 service.gui.avatar.imagepicker.IMAGE_SIZE=Ukuran gambar
-service.gui.avatar.imagepicker.INITIALIZING=Memulai
 service.gui.avatar.imagepicker.RESET=Ulang
 service.gui.avatar.imagepicker.SET=Jadikan
 service.gui.avatar.imagepicker.TAKE_PHOTO=Mengambil foto
-service.gui.avatar.imagepicker.WEBCAM_ERROR=kesalahan webcam
 
 service.gui.security.encryption.required=Enkripsi diperlukan
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Kesalahan di penyimpanan daftar kontak SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Resource tidak dapat membaca {0}. Untuk {1}
@@ -691,9 +656,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=pilih jaringan
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=Konfigurasi LDAP
 impl.ldap.GENERAL=Umum
-impl.ldap.NEW=Baru
 impl.ldap.EDIT=&Edit
-impl.ldap.REMOVE=Hapus
 impl.ldap.ENABLED=Hidupkan
 impl.ldap.SERVER_NAME=Nama Server
 impl.ldap.SERVER_NAME_EXAMPLE=Server LDAP saya
@@ -726,6 +689,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=telponRumah
 impl.ldap.PHONE_PREFIX=awalan Telpon
 impl.ldap.PHONE_PREFIX_EXAMPLE=Contoh: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Buku alamat
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Hidupkan pencarian buku alamat MacOSX
@@ -735,9 +702,7 @@ plugin.addrbook.PREFIX_EXAMPLE=Contoh: 00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Kontak Google
-impl.googlecontacts.NEW=Baru
 impl.googlecontacts.EDIT=&Edit
-impl.googlecontacts.REMOVE=Hapus
 impl.googlecontacts.ENABLED=Hidupkan
 impl.googlecontacts.ACCOUNT_NAME=Nama Akun
 impl.googlecontacts.SAVE=Simpan
@@ -764,9 +729,6 @@ plugin.accountinfo.EMAIL=Surel:
 plugin.accountinfo.PHONE=Telepon:
 plugin.accountinfo.MOBILE_PHONE=telponSeluler
 plugin.accountinfo.JOB_TITLE=Pekerjaan
-plugin.accountinfo.USER_PICTURES=Gambar Pengguna
-plugin.accountinfo.CHANGE=Ubah
-plugin.accountinfo.ONLY_MESSAGE=Hanya pesan
 
 # connection info
 
@@ -785,47 +747,12 @@ plugin.aimaccregwizz.USERNAME=Nama layar AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Nama layar dan kata sandi
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Daftarkan akun baru
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Jika anda tidak memiliki akun AIM, klik tombol ini untuk membuat yang baru.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Mengganti pilihan awal server
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Tentang {0}
 plugin.branding.LOGO_MESSAGE=VoIP && Instant Messaging Open Source
-plugin.branding.LOADING=Memuat
 plugin.branding.ABOUT_MENU_ENTRY=Tentang
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} saat ini sedang aktif dikembangkan. Versi anda jalankan saat ini bersifat eksperimental dan MUNGKIN TIDAK bekerja sebagaimana mestinya. Silahkan merujuk ke {2} untuk informasi lebih lanjut.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2009 Hak Cipta <b>sip-communicator.org</b>. Semua hak terpelihara. Kunjungi <a href="http://sip-communicator.org">http://sip-communicator.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>The <b>SIP Communicator</b> didistribusikan dalam lisensi LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Kamus
-plugin.dictaccregwizz.ANY_DICTIONARY=Kamus Apa saja
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Kamus apa saja dari {0}
-plugin.dictaccregwizz.FIRST_MATCH=Temuan Pertama
-plugin.dictaccregwizz.NO_MATCH=Tidak ada yang cocok
-plugin.dictaccregwizz.MATCH_RESULT=Tidak ada definisi ditemukan untuk "{0}", mungkin maksud anda:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Kamus "{0}" sudah tidak ada lagi di server.
-plugin.dictaccregwizz.INVALID_STRATEGY=Strategi ini tidak tersedia di server.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Protokol layanan Dict
-plugin.dictaccregwizz.HOST=Host
-plugin.dictaccregwizz.SERVER_INFO=Informasi Server
-plugin.dictaccregwizz.STRATEGY_SELECTION=Pilihan Strategi
-plugin.dictaccregwizz.STRATEGY_LIST=Daftar Strategi:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Strategi pencarian
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategi digunakan untuk mencari kaa yang mirip jika sebuah terjemahan tidak ditemukan, berkat beragam pendekatan. Sebagai contoh, strategi Prefix akan mencari kata yang diawali mirip dengan kata yang ingin anda terjemahkan.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informasi Akun Dict
-plugin.dictaccregwizz.THREAD_CONNECT=Mencoba menghubungi server
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=hubungan gagal. ini bukan server dict atau server sedang offline
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Mengambil strategi
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Tidak ada strategi di server
-plugin.dictaccregwizz.POPULATE_LIST=Mengumpulkan daftar
-plugin.dictaccregwizz.CLOSING_CONNECTION=Menutup koneksi
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Protokol Obrolan Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nama Pengguna
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nama layar dan kata sandi
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Menjalankan {0} otomatis saat komputer dinyalakan
@@ -836,9 +763,6 @@ plugin.generalconfig.SHOW_HISTORY=Tampilkan
 plugin.generalconfig.HISTORY_SIZE=pesan terkini di obrolan baru
 plugin.generalconfig.SEND_MESSAGES_WITH=Kirim pesan dengan:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Bawa jendela obrolan ke depan
-plugin.generalconfig.ERROR_PERMISSION=Jika anda tidak punya cukup hak untuk menghilangkan autostart
-plugin.generalconfig.TRANSPARENCY=Tembus pandang
-plugin.generalconfig.ENABLE_TRANSPARENCY=Hidupkan tembus pandang
 plugin.generalconfig.DEFAULT_LANGUAGE=Bahasa antar muka
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Perubahan anda akan berdampak setelah dinyalakan ulang berikutnya.
 plugin.generalconfig.SIP_CLIENT_PORT=PORT klien SIP
@@ -880,18 +804,19 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Daftarkan akun baru
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=Protokol IRC
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN dan kata sandi
+plugin.ircaccregwizz.USERNAME=Nama panggilan
 plugin.ircaccregwizz.INFO_PASSWORD=Kebanyakan server IRC tidak membutuhkan password.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=Otomatis mengganti panggilan jika sudah terpakai
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Gunakan port awal
 plugin.ircaccregwizz.HOST=Hostname
 plugin.ircaccregwizz.IRC_SERVER=Server
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} autentikasi
+plugin.ircaccregwizz.SASL_USERNAME=Nama Pengguna
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Protokol XMPP
 plugin.jabberaccregwizz.USERNAME=nama pengguna XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=konfirmasi kata sandi
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID dan kata sandi
 plugin.jabberaccregwizz.CSERVER=Server
 plugin.jabberaccregwizz.SERVER=Hubungi Server
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Hidupkan keep alive
@@ -907,13 +832,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Komentar
 plugin.jabberaccregwizz.RESOURCE=Resource
 plugin.jabberaccregwizz.AUTORESOURCE=Membuat resource otomatis
 plugin.jabberaccregwizz.PRIORITY=Prioritas
-plugin.jabberaccregwizz.XMPP_ERROR=Kesalahan XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Kesalahan XMPP tidak diketahui. Periksa nama server telah benar.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Kata sandi tidak sama.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Mengganti pilihan awal server
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Pilihan lanjutan
 plugin.jabberaccregwizz.USE_ICE=Gunakan ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Gunakan Google Jingle/ICE (eksperimental)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Menemukan server STUN/TURN otomatis
 plugin.jabberaccregwizz.SUPPORT_TURN=Dukung TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Nama pengguna TURN
@@ -937,16 +858,9 @@ plugin.jabberaccregwizz.EXISTING_ACCOUNT=Akun XMPP telah ada
 plugin.jabberaccregwizz.DOMAIN_BYPASS_CAPS=Domain yang akan menggunakan panggilan GTalk
 plugin.jabberaccregwizz.TELEPHONY_DOMAIN=DOmain Telephony 
 plugin.jabberaccregwizz.ALLOW_NON_SECURE=Izinkan koneksi tidak aman
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=konfirmasi kata sandi
 plugin.jabberaccregwizz.VIDEO=Video
 plugin.jabberaccregwizz.RESET=Ulang
 
-# mailbox
-
-# msn accregwizz
-plugin.msnaccregwizz.USERNAME=Surel:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID dan kata sandi
-
 # plugin manager
 plugin.pluginmanager.NEW=Baru
 
@@ -957,20 +871,15 @@ plugin.simpleaccregwizz.LOGIN_USERNAME=Nama Pengguna
 plugin.sipaccregwizz.PROTOCOL_NAME=SIP
 plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=Protokol XMPP
 plugin.sipaccregwizz.USERNAME_AND_PASSWORD=Nama layar dan kata sandi
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Pilihan lanjutan
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Mengganti pilihan awal server
 plugin.sipaccregwizz.DISPLAY_NAME=Nama tampilan
 plugin.sipaccregwizz.EXISTING_ACCOUNT=Akun XMPP telah ada
 plugin.sipaccregwizz.CREATE_ACCOUNT=Membuat akun baru XMPP
 plugin.sipaccregwizz.XCAP_PASSWORD=Kata Sandi
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Kata sandi tidak sama.
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-plugin.sshaccregwizz.USERNAME=Info Akun
-plugin.sshaccregwizz.OPTIONAL=Pilihan
-
 # status update
 
 # updatechecker
@@ -983,41 +892,31 @@ plugin.whiteboard.OPEN=Buka
 plugin.whiteboard.COLOR=Warna
 plugin.whiteboard.DELETE=Hapus
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.USERNAME=Nama Pengguna
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID dan kata sandi
-
-# zero accregwizz
-plugin.zeroaccregwizz.FIRST_NAME=Nama Depan:
-plugin.zeroaccregwizz.LAST_NAME=Nama Belakang:
-plugin.zeroaccregwizz.EMAIL=Surel:
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID dan kata sandi
-plugin.zeroaccregwizz.USERID=ID Pengguna:
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Jika anda tidak memiliki akun AIM, klik tombol ini untuk membuat yang baru.
 
 # iptel accregwizz
 plugin.iptelaccregwizz.USERNAME=Nama Pengguna
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.USERNAME=Nama Pengguna
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Membuat akun baru XMPP
-
 # ippi accregwizz
+plugin.sip2sipaccregwizz.USERNAME=Nama Pengguna
 plugin.ippiaccregwizz.EXISTING_ACCOUNT=Akun XMPP telah ada
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Membuat akun baru XMPP
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=Salin
 plugin.keybindings.CHAT_CUT=Potong
 plugin.keybindings.CHAT_PASTE=Rekat
 plugin.keybindings.MAIN_RENAME=Ganti nama kontak
 plugin.keybindings.globalchooser.SHORTCUT_NAME=Nama
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Bincang
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=Hidupkan
 plugin.notificationconfig.RESTORE=Kembalikan awal
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Panggilan masuk
 plugin.notificationconfig.event.IncomingFile=Panggilan masuk
 plugin.notificationconfig.event.HangUp=Gantung
@@ -1037,6 +936,7 @@ impl.media.configform.VIDEO_RESET=Kembalikan awal
 
 impl.neomedia.configform.VIDEO=Video
 
+#in JNIEncoder
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTP
 
 # The callrecordingconfig plugin was never really committed into trunk and its
@@ -1051,7 +951,6 @@ plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS_MSG=Kata sandi berhasil d
 plugin.securityconfig.masterpassword.MP_REMOVE_SUCCESS_MSG=Kata sandi berhasil diubah
 plugin.securityconfig.masterpassword.COL_NAME=Nama
 plugin.securityconfig.masterpassword.COL_PASSWORD=Kata Sandi
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Hapus
 
 # otr plugin
 plugin.otr.menu.CB_RESET=Ulang
@@ -1072,6 +971,7 @@ plugin.reconnectplugin.CONNECTION_FAILED_MSG=Koneksi gagal untuk akun berikut: N
 #plugin chat config
 
 plugin.chatconfig.TITLE=Bincang
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Hidupkan
 
 #provisioning plugin
 
@@ -1085,7 +985,6 @@ net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=Abaikan
 net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=Tolak
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=&Edit
 
 
 #Certificate configuration plugin
diff --git a/resources/languages/resources_it.properties b/resources/languages/resources_it.properties
index b70e7c0..b8ac264 100644
--- a/resources/languages/resources_it.properties
+++ b/resources/languages/resources_it.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Me
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Creazione guidata account
 service.gui.ACCOUNTS=Account
 service.gui.ADD=&Aggiungi
-service.gui.ADD_ACCOUNT=Aggiungi account
 service.gui.ADD_CONTACT=&Aggiungi contatto
 service.gui.ADD_AUTHORIZED_CONTACT=Aggiungi {0} ai tuoi contatti
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Aggiungi alla lista contatti
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Errore durante la creazione del contatto
 service.gui.ADD_CONTACT_EXIST_ERROR=Il contatto {0} esiste già nella tua rubrica.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Il server non ha risposto alla richiesta di aggiunta del contatto con id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Errore durante la creazione del contatto con id: {0}. Operazione non supportata.
-service.gui.ADD_CONTACT_IDENTIFIER=Inserisci l'identificativo del contatto che vuoi aggiungere nel campo sottostante.
-service.gui.ADD_CONTACT_WIZARD=Creazione guidata contatto
 service.gui.ADD_CONTACT_NOT_CONNECTED=È necessario essere connessi per aggiungere un contatto. Effettua il login al provider selezionato e tenta di nuovo.
 service.gui.ADD_GROUP_LOCAL_ERROR=Errore durante la creazione del gruppo {0}. Il problema si è verificato durante un'operazione I/O locale.
 service.gui.ADD_GROUP_EXIST_ERROR=Il gruppo {0} esiste già nella tua rubrica. Scegli un altro nome.
 service.gui.ADD_GROUP_NET_ERROR=Errore durante la creazione del gruppo {0}. Il problema si è verificato a causa di un errore di rete. Verifica la connessione e riprova.
 service.gui.ADD_GROUP_ERROR=Errore durante la creazione del gruppo {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Il nome del gruppo non può essere vuoto.
-service.gui.ADD_GROUP=Crea gruppo
-service.gui.ADD_SUBCONTACT=&Aggiungi sottocontatto
 service.gui.ADDRESS=Indirizzo
 service.gui.ADMINISTRATOR=amministratore
 service.gui.ADVANCED=&Avanzate
-service.gui.ALL=&Tutti
 service.gui.ALL_CONTACTS=&Tutti i contatti
 service.gui.ALTERNATE_ADDRESS=Indirizzo alternativo
 service.gui.APPLY=&Applica
@@ -65,7 +70,6 @@ service.gui.AT=alle
 service.gui.AUTHORIZE=&Autorizza
 service.gui.AUTHORIZATION_ACCEPTED={0} ha accettato la tua richiesta di autorizzazione.
 service.gui.AUTHENTICATION_FAILED=Autenticazione fallita per {0}. La password inserita non è valida.
-service.gui.AUTHENTICATION_REQUESTED=Richiesta autenticazione
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Il server {0} ha richiesto la tua autenticazione.
 service.gui.AUTHENTICATION_REJECTED={0} ha rifiutato la tua richiesta di autorizzazione.
 service.gui.AUTHENTICATION_WINDOW_TITLE=autenticazione di {0}
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Inserisci il tuo nuovo nickname nel campo sott
 service.gui.CHANGE_NICKNAME_ERROR=Si è verificato un errore nel cambio del nickname
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Il nickname è già esistente
 service.gui.CHANGE_VIDEO_QUALITY=Cambia la qualità del video ricevuto
-service.gui.CHAT_CONFERENCE_LABEL=Conferenze
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Conferenza di {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Sei già entrato nella chatroom {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=Configurazione della chatroom {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=è uscito dalla chatroom {0}
 service.gui.CHAT_ROOM_USER_KICKED=è stato espulso dalla chatroom {0}
 service.gui.CHAT_ROOM_USER_QUIT=è uscito dalla chatroom {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Invio di messaggi non possibile (voce bloccata)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Salva la chatroom per usi futuri
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Rimuovi la chatroom selezionata dalla lista delle chatroom salvate
 service.gui.CHAT_ROOM_NAME=Nome della chatroom
 service.gui.CLEAR_CUSTOM_MESSAGES=Cancella i messaggi personalizzati
 service.gui.ROOM_NAME=Chatroom
-service.gui.AUTOJOIN=Entra automaticamente
 service.gui.CHANGE_PASSWORD=Cambia password
 service.gui.CHAT_ROOM_NAME_INFO=Inserisci il nome della nuova chatroom nel campo sottostante.
 service.gui.CHAT_ROOM_NOT_EXIST=Impossibile trovare la chatroom {0} sul server {1}. Verificare che il nome sia corretto.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Devi essere connesso per poter entrare nella chatroom {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Devi essere connesso per poter uscire da una chatroom.
-service.gui.CHAT_ROOM_NOT_JOINED=Devi essere nella chatroom per poter effettuare ulteriori operazioni con essa.
 service.gui.CHAT_ROOM_OPTIONS=Opzioni della chatroom
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Per accedere alla chatroom {0} devi essere registrato.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Per accedere alla chatroom {0} devi conoscerne la password.
@@ -151,22 +150,18 @@ service.gui.CLEAR=Cancella
 service.gui.CLOSE=C&hiudi
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Hai ricevuto un nuovo messaggio meno di 2 secondi fa. Sei sicuro di volere chiudere?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Hai trasferimenti di file in corso. Sei sicuro di volerli annullare?
-service.gui.CONFIRM=Conferma
 service.gui.CONNECTED_STATUS=Connesso
 service.gui.CONNECTING=Connessione in corso...
 service.gui.CONNECTING_STATUS=Connessione in corso
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Connessione in corso...
 service.gui.CONNECTION=Connessione
-service.gui.CONNECTION_FAILED_MSG=Errore durante la connessione con il seguente account: Nome utente: {0}, Server: {1}. Controlla la tua connessione di rete o contatta il tuo amministratore di rete per maggiori informazioni.
 service.gui.CONNECTION_EXPIRED_MSG=Sei attualmente disconnesso dal server {0}.
 service.gui.CONTACT_NAME=ID o Numero
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Il contatto selezionato {0} non supporta le chiamate vocali.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Il contatto {0} non supporta le chat multiutente.
 service.gui.CONTACT_PAUSED_TYPING={0} ha interrotto la digitazione
 service.gui.CONTACT_TYPING={0} sta digitando
 service.gui.CONTACT_TYPING_SEND_FAILED=ops... non abbiamo potuto dire a {0} che stavi scrivendo
 service.gui.CONTACT_INFO=&Informazioni sul contatto
-service.gui.CONTACTLIST=Rubrica
 service.gui.CONTACTS=Contatti
 service.gui.COPY=&Copia
 service.gui.COPY_LINK=Copia il &link
@@ -176,17 +171,14 @@ service.gui.CREATE_CHAT_ROOM=&Crea chatroom
 service.gui.CREATE_CHAT_ROOM_ERROR=Errore durante la creazione della chatroom {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Creazione guidata chatroom
 service.gui.CREATE_CONFERENCE_CALL=&Crea chiamata vocale multiutente
-service.gui.CREATE_CONFERENCE_CHAT=&Crea chat multiutente
 service.gui.CREATE_GROUP=&Crea gruppo
 service.gui.CREATE_GROUP_NAME=Inserisci il nome del nuovo gruppo nel campo sottostante.
-service.gui.CREATE_FIRST_GROUP_WIZARD=La tua rubrica non contiene alcun gruppo. Creare prima un gruppo (File/Crea gruppo).
 service.gui.CREATE_VIDEO_BRIDGE=Crea &videoconferenza...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Crea &videoconferenza
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Crea o unisciti a una videoconferenza
 service.gui.CREATE_VIDEO_CONFERENCE=Crea una nuova videoconferenza per questa chatroom
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Questo contatto non supporta la trasmissione delle sue informazioni
 service.gui.CUT=Taglia
-service.gui.DATE=Data
 service.gui.DELETE=Rimuovi
 service.gui.DENY=&Nega
 service.gui.DESKTOP_SHARING_WARNING=<b>Sei sicuro di voler iniziare la condivisione dello schermo?</b> <br> Premendo OK i contatti presenti in questa chiamata vedranno il tuo schermo.
@@ -197,7 +189,6 @@ service.gui.DISCONNECTED_STATUS=Disconnesso
 service.gui.DND_STATUS=Non disturbare
 service.gui.DO_NOT_ASK_AGAIN=Non chiedere in futuro
 service.gui.DO_NOT_SHOW_AGAIN=Non mostrare questo messaggio in futuro
-service.gui.DOWNLOAD_NOW=&Scarica ora
 service.gui.DRAG_FOR_SHARING=Trascina qui ciò che vuoi condividere...
 service.gui.DURATION=Durata
 service.gui.DESTROY_CHATROOM=Elimina la chatroom
@@ -218,7 +209,6 @@ service.gui.ERROR_RECEIVED_FROM=Errore ricevuto da {0}
 service.gui.ESTIMATED_TIME=Tempo stimato:
 service.gui.EVENTS=Eventi
 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
@@ -260,7 +250,6 @@ service.gui.FONT_ITALIC=Corsivo
 service.gui.FONT_SIZE=Dimensione
 service.gui.FONT_STYLE=Stile
 service.gui.FONT_UNDERLINE=Sottolineato
-service.gui.FROM={0} da {1}
 service.gui.GRANT_OWNERSHIP=Concedi stato di proprietario
 service.gui.GRANT_ADMIN=Concedi stato di amministratore
 service.gui.GRANT_MODERATOR=Concedi stato di moderatore
@@ -286,7 +275,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Sei sicuro di voler rimuovere permanentem
 service.gui.HISTORY_REMOVE_ERROR=Errore nella rimozione dei messaggi salvati.
 service.gui.HOME=Casa
 service.gui.HOME_PAGE=Home page
-service.gui.HOUR=Ora
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identificativo
 service.gui.IGNORE=&Ignora
@@ -294,6 +282,7 @@ service.gui.INSERT_SMILEY=Inserisci smiley
 service.gui.INCOMING_CALL=Ricevuta chiamata in entrata da: {0}
 service.gui.INCOMING_SCREEN_SHARE=Ricevuto un invito per la condivisione dello schermo da: {0}
 service.gui.INCOMING_CALL_STATUS=Chiamata in arrivo
+service.gui.INCOMING_SCREEN_SHARE_STATUS=Condivisione schermo in arrivo
 service.gui.INSTANT_MESSAGINGS=IM
 service.gui.IM=IM
 service.gui.INITIATING_CALL_STATUS=Inizializzazione della chiamata
@@ -309,13 +298,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Invita contatti per una videoconferen
 service.gui.INVITE_REASON=Motivo dell'invito
 service.gui.IS_CALLING={0} sta chiamando...
 service.gui.IS_NOW={0} è ora {1}
-service.gui.JITSI_WARNING=SIP Communicator è stato recentemente rinominato in Jitsi.<br/>Se vuoi che la tua versione rimanga aggiornata, scarica Jitsi ora.<br/><br/>Ci scusiamo per ogni inconveniente che questo possa causarti.<br/><br/>Il team di sviluppatori di Jitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator è diventato Jitsi
 service.gui.JOIN=&Entra
 service.gui.JOIN_AS=E&ntra come
-service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Unisciti ad una sessione di videoconferenza esistente
+service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Unisciti ad una videoconferenza in corso
 service.gui.JOIN_VIDEO=Unisciti con il video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=C&hiudi
 service.gui.JOB_TITLE=Titolo professionale
 service.gui.JOIN_CHAT_ROOM=&Entra in una chatroom
 service.gui.JOIN_CHAT_ROOM_TITLE=Entra in una chatroom
@@ -328,7 +314,6 @@ service.gui.KICK_FAILED=Espulsione fallita
 service.gui.KICK_FAILED_GENERAL_ERROR=Impossibile espellere {0}. Si è verificato un errore generico sul server.
 service.gui.KICK_FAILED_NOT_ALLOWED=Impossibile espellere {0}. Il proprietario e l''amministratore della chatroom non possono essere espulsi.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Impossibile espellere {0}. Non hai privilegi sufficienti per farlo.
-service.gui.LAST=Ultimo
 service.gui.LAST_NAME=Cognome
 service.gui.LEAVE=&Esci
 service.gui.LIMIT_REACHED_FOR_IP=Limite registrazioni per il tuo indirizzo IP raggiunto sul server {0}.
@@ -348,7 +333,6 @@ service.gui.MESSAGE=Messaggio
 service.gui.MISSED_CALLS_TOOL_TIP=Chiamate perse da:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= e altri {0}
 service.gui.MODERATOR=moderatore
-service.gui.MORE=Vedi altro
 service.gui.MORE_LABEL=Ancora
 service.gui.MOVE=Sposta
 service.gui.MOVE_SUBCONTACT=Sp&osta contatto
@@ -357,7 +341,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Il contatto selezionato coincide con quello \
 service.gui.MOVE_SUBCONTACT_QUESTION=Sei sicuro di voler spostare {0} in {1}?
 service.gui.MOVE_TO_GROUP=&Sposta nel gruppo
 service.gui.MOVE_CONTACT=Sposta contatto
-service.gui.MOVE_CONTACT_ERROR=Il contatto non può essere spostato
 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 provare a raggiungere {0} attraverso un altro account o aspettare che torni online.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Errore interno. Questo è quasi sicuramente un bug. Riportalo qui: https://jitsi.org/Development/BugsAndIssues.
@@ -371,7 +354,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Devi essere connesso per poter inviare m
 service.gui.MULTIPLE_LOGINS=Impossibile effettuare login multipli per il seguente account: Nome utente: {0}, Server: {1}. Esso è attualmente disconnesso.
 service.gui.MY_CHAT_ROOMS=Aggiungi chat room
 service.gui.MY_CHAT_ROOMS_TITLE=Aggiungi chat room
-service.gui.MUTE=Silenzioso
 service.gui.MUTUALLY_ON_HOLD_STATUS=Chiamata messa in attesa reciprocamente
 service.gui.NAME=Nome
 service.gui.NETWORK=Rete
@@ -403,7 +385,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Non nella lista contatti
 service.gui.SD_QUALITY=Qualità normale
 service.gui.OFFLINE=Disconnesso
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Chiamate precedenti
 service.gui.ONLINE=Connesso
 service.gui.OPEN=Apri
 service.gui.OPEN_FILE_FROM_IMAGE=Doppio click per aprire il file.
@@ -415,7 +396,6 @@ service.gui.OPEN_ON_ACTIVITY=Apri in caso di attività
 service.gui.OPEN_ON_MESSAGE=Apri in caso di nuovi messaggi
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Apri solo in caso di messaggi importanti
 service.gui.OR=o
-service.gui.OR_ENTER_PHONE_NUMBER=Oppure inserisci qui il numero di telefono
 service.gui.ORGANIZATION=Organizzazione
 service.gui.OTHER=Altro
 service.gui.chat.role.OWNER=Proprietario
@@ -424,6 +404,7 @@ service.gui.chat.role.MODERATOR=Moderatore
 service.gui.chat.role.MEMBER=Membro
 service.gui.chat.role.GUEST=Ospite
 service.gui.chat.role.SILENT_MEMBER=Membro silenzioso
+service.gui.chat.role.OUTCAST=Bandito dalla partecipazione
 service.gui.OWNER=proprietario della chatroom
 service.gui.ON_MOBILE_TOOLTIP=(su dispositivo mobile)
 service.gui.PASSWORD=Password
@@ -440,7 +421,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Invio' per suggerimenti
 service.gui.PRESS_FOR_CALL_INFO=Premere per informazioni sulla chiamata
 service.gui.PRESS_TO_OPEN_CRM=Premi per aprire l'applicazione CRM
 service.gui.PREVIOUS=Precedente
-service.gui.PREVIOUS_TOOLTIP=Sfoglia conversazioni più vecchie
 service.gui.PRINT=&Stampa
 service.gui.PROACTIVE_NOTIFICATION=sta scrivendo un messaggio
 service.gui.PROBLEMS_ENCOUNTERED=Sono stati incontrati dei problemi
@@ -456,7 +436,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Ti sei disconnesso e riconnesso al serve
 service.gui.RE_REQUEST_AUTHORIZATION=Richiedi nuovamente l'autorizzazione
 service.gui.REFERRED_STATUS=Inoltrata
 service.gui.REJECT=&Rifiuta
-service.gui.REMIND_ME_LATER=Ricorda in seguito
 service.gui.REMEMBER_PASSWORD=Ricorda password
 service.gui.REMOVE=&Rimuovi
 service.gui.REMOVE_ACCOUNT=&Rimuovi account
@@ -482,29 +461,20 @@ service.gui.REVOKE_ADMIN=Revoca status di amministratore
 service.gui.REVOKE_MODERATOR=Revoca status di moderatore
 service.gui.REVOKE_MEMBERSHIP=Revoca stato di membro
 service.gui.REVOKE_VOICE=Revoca voce
-service.gui.ROOT_GROUP=Gruppo radice
 service.gui.SAVE=&Salva
-service.gui.SAVE_AS_DEFAULT=Salva come predefiniti
 service.gui.SEARCH=&Cerca
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Clicca il bottone sottostante per mostrare tutte le chatroom disponibili nel server selezionato. Seleziona la chatroom in cui intendi entrare e premi il bottone entra.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Contatti cercati
 service.gui.SECURITY=Sicurezza
-service.gui.SELECT_ACCOUNT=Seleziona account
 service.gui.SELECT_COLOR=Seleziona colore
 service.gui.SELECT_GROUP=Seleziona 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_NO_GROUP=Nessun gruppo
-service.gui.SELECT_GROUP_WIZARD=Specifica 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 chatroom.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=La lista sottostante contiene tutti gli account registrati. Seleziona quello che vuoi utilizzare per comunicare con il nuovo contatto.
-service.gui.SELECT_PROVIDERS_WIZARD=Seleziona account
 service.gui.SELECT_VIDEO_CONFERENCE=Seleziona la videoconferenza
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Seleziona una chat room dall'elenco e premi OK per aggiungerla
 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_AS_SMS=Invia come SMS
 service.gui.SEND_PRIVATE_MESSAGE=Invia messaggio privato
 service.gui.SEND_SMS=Invia &SMS
 service.gui.SEND_SMS_DETAILS=Ricorda che devi inserire il numero in formato internazionale, anteponendo, ad esempio, il prefisso +44 nel caso dell'UK (es. +447777000000)
@@ -543,7 +513,6 @@ service.gui.STREET=Via
 service.gui.SUBJECT=Oggetto
 service.gui.SUMMARY=Sommario
 service.gui.TELEPHONY=Telefonia
-service.gui.TODAY=Oggi
 service.gui.TOOLS=&Strumenti
 service.gui.TRANSFER=Tras&ferisci
 service.gui.TO=&A:
@@ -553,7 +522,6 @@ service.gui.TRANSFER_CALL_TO=Trasferisci a:
 service.gui.TRANSPARENCY_NOT_ENABLED=La trasparenza non è supportata dalla configurazione attuale.
 service.gui.TYPE_YOUR_REQUEST=Inserisci la richiesta qui
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Non è stato possibile cambiare la qualità del video per questa chiamata.
-service.gui.UNMUTE=Disabilita silenzioso
 service.gui.USER_IDENTIFIER=Identificativo utente:
 service.gui.USER_EXISTS_ERROR=Questo utente esiste già nella rete selezionata. Scegliere un altro utente o un'altra rete.
 service.gui.USERNAME_NULL=Devi riempire i campi relativi a Nome utente e password.
@@ -566,7 +534,6 @@ service.gui.USE_PROVISIONING=Usa il provisioning di rete
 service.gui.VALUE=Valore
 service.gui.VIDEO_CALL=Chiamata &video
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&Visualizza
 service.gui.VIEW_HISTORY=Visualizza &cronologia
 service.gui.VIEW_SMILEYS=Visualizza &smiley
@@ -586,9 +553,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Imposta volume
 service.gui.WAITING_AUTHORIZATION=In attesa di autorizzazione
 service.gui.WARNING=Avviso
 service.gui.YES=Sì
-service.gui.YESTERDAY=Ieri
-service.gui.EXISTING_ACCOUNT_ERROR=L'account inserito è già installato.
-service.gui.NEW_MAIL=<b>Hai una nuova Mail!</b><br/><b>Da:</b> {0} {1} <br/><b>Oggetto:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Hai ricevuto un nuovo messaggio di posta nella tua <a href="{1}">casella</a> {0}:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Hai ricevuto {2} nuovi messaggi di posta nella tua <a href="{1}">casella</a> {0}:<br/>
 service.gui.NEW_GMAIL_FOOTER=un''altra conversazione non letta nella tua <a href="{0}">casella</a>.<br/>
@@ -600,7 +564,10 @@ service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Entra nella modalità a tutto schermo
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Esci dalla modalità a tutto schermo
 service.gui.HOLD_BUTTON_TOOL_TIP=Commuta stato di attesa
 service.gui.MUTE_BUTTON_TOOL_TIP=Attiva/disattiva audio o mantieni premuto per cambiare il volume del microfono
-service.gui.RECORD_BUTTON_TOOL_TIP=Attiva/disattiva registrazione chiamata
+service.gui.PARK=Parcheggia
+service.gui.PARKING_SLOT=Numero del parcheggio:
+service.gui.PARK_BUTTON_TOOL_TIP=Inoltra chiamata
+service.gui.RECORD_BUTTON_TOOL_TIP=Parcheggia la chiamata
 service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=Video on/off
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Mostra/nascondi video locale
 service.gui.SHOW_HIDE_PEERS_TOOL_TIP=Mostra/nascondi la lista dei partecipanti
@@ -612,7 +579,6 @@ service.gui.SECURITY_ERROR=Errore di sicurezza
 service.gui.SPEED=Velocità:
 service.gui.SILENT_MEMBER=membro silenzioso
 service.gui.NON_SECURE_CONNECTION=Non è stato possibile instaurare una connessione sicura per l''account {0}. Se vuoi connetterti ad un server non sicuro abilita "Permetti connessioni insicure" nelle impostazioni dell'account
-service.gui.UPDATE=Aggiorna
 service.gui.MOBILE_PHONE=Cellulare
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Lavoro
@@ -647,7 +613,6 @@ service.gui.callinfo.CALL_INFORMATION=Informazioni sulla chiamata
 service.gui.callinfo.CALL_IDENTITY=Identità
 service.gui.callinfo.PEER_COUNT=Numero di partecipanti
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Controllore della conferenza
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Cifratura attivata
 service.gui.callinfo.CALL_TRANSPORT=Trasporto segnali di chiamata
 service.gui.callinfo.CALL_DURATION=Durata
 service.gui.callinfo.TLS_PROTOCOL=Protocollo TLS
@@ -661,7 +626,6 @@ service.gui.callinfo.AUDIO_INFO=Informazioni sull'audio
 service.gui.callinfo.VIDEO_INFO=Informazioni sul video
 service.gui.callinfo.LOCAL_IP=IP / Porta locali
 service.gui.callinfo.REMOTE_IP=IP / Porta remoti
-service.gui.callinfo.BANDWITH=Larghezza di banda
 service.gui.callinfo.LOSS_RATE=Tasso di perdita
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -671,10 +635,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Protocollo di scambio della chiave
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Tipo esteso del candidato ICE
 service.gui.callinfo.ICE_STATE=Stato del processamento ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Raccolta dei canditati
 service.gui.callinfo.ICE_STATE.RUNNING=Controlli di connettività
 service.gui.callinfo.ICE_STATE.COMPLETED=Completato
 service.gui.callinfo.ICE_STATE.FAILED=Fallito
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=IP / Porta locali
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Indirizzo (IP / Porta) reflexive dell'host locale
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Indirizzo (IP / Porta) relayed dell'host locale
@@ -695,15 +662,18 @@ service.gui.ALWAYS_TRUST=Accetta sempre questo certificato
 service.gui.CERT_DIALOG_TITLE=Verifica certificato
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} non può verificare l''identità del server durante la connessione a<br><b>{1}</b>.<br><br> Il certificato non è affidabile, questo significa che l''identità del server non può essere verificata automaticamente.<br><br> Desideri continuare?<br> Per maggiori informazioni, clicca su "Mostra certificato".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} non può verificare l''identità del certificato del server.<br><br> Il certificato non è affidabile, questo significa che l''identità del server non può<br> essere verificata automaticamente. Desideri continuare?<br><br> Per maggiori informazioni, clicca su "Mostra certificato".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} non può verificare l''identità del client che si sta collegando.<br><br> Il certificato non è affidabile, questo significa che l''identità del client non può<br> essere verificata automaticamente. Desideri accettare la connessione?<br><br> Per maggiori informazioni, clicca su "Mostra certificato".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} non può verificare l''identità del nodo {1}.<br><br> Il certificato non è affidabile, questo significa che l''identità del nodo non può<br> essere verificata automaticamente. Desideri continuare la connessione?<br><br> Per maggiori informazioni, clicca su "Mostra certificato".</html>
 service.gui.CONTINUE_ANYWAY=Continua comunque
 service.gui.CERT_INFO_CHAIN=Catena dei certificati:
+service.gui.CERT_INFO_ISSUED_TO=Emesso a
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nome comune:
 service.gui.CERT_INFO_O=Organizzazione:
 service.gui.CERT_INFO_C=Nazione:
 service.gui.CERT_INFO_ST=Stato o provincia:
 service.gui.CERT_INFO_L=Località:
+service.gui.CERT_INFO_ISSUED_BY=Emesso da
 service.gui.CERT_INFO_OU=Unità organizzativa:
 service.gui.CERT_INFO_VALIDITY=Validità
 service.gui.CERT_INFO_ISSUED_ON=Rilasciato il:
@@ -716,12 +686,10 @@ service.gui.CERT_INFO_SIGN_ALG=Algoritmo firma:
 service.gui.CERT_INFO_PUB_KEY_INFO=Informazioni sulla chiave pubblica
 service.gui.CERT_INFO_ALG=Algoritmo:
 service.gui.CERT_INFO_PUB_KEY=Chiave pubblica:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Esponente:
 service.gui.CERT_INFO_KEY_SIZE=Dimensione chiave:
 service.gui.CERT_INFO_SIGN=Firma certificato:
-service.gui.CONTINUE=Continua
 service.gui.SHOW_CERT=Mostra certificato
 service.gui.HIDE_CERT=Nascondi certificato
 
@@ -744,12 +712,9 @@ service.gui.security.SECURE_AUDIO=Audio protetto
 service.gui.security.AUDIO_NOT_SECURED=Audio non protetto
 service.gui.security.SECURE_VIDEO=Video protetto
 service.gui.security.VIDEO_NOT_SECURED=Video non protetto
-service.gui.security.NO_VIDEO=Video assente
-service.gui.security.CIPHER=Cifrario: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Chiamata protetta. Per maggiori informazioni clicca qui.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Chiamata non sicura.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Premi qui per confrontare le chiavi di codifica con il tuo partner. 
-service.gui.security.COMPARE_WITH_PARTNER=Confronta il codice con il tuo interlocutore e clicca sul lucchetto per confermare.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Confronta con l'interlocutore:
 service.gui.security.STRING_COMPARED=Stringa confrontata!
@@ -767,20 +732,14 @@ service.gui.avatar.imagepicker.CLICK=Clicca e Sorridi
 service.gui.avatar.imagepicker.IMAGE_FILES=File di immagine
 service.gui.avatar.imagepicker.IMAGE_PICKER=Foto
 service.gui.avatar.imagepicker.IMAGE_SIZE=Dimensione immagine
-service.gui.avatar.imagepicker.INITIALIZING=Inizializzazione
 service.gui.avatar.imagepicker.RESET=Ripristina
 service.gui.avatar.imagepicker.SET=Imposta
 service.gui.avatar.imagepicker.TAKE_PHOTO=Scatta una foto
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Errore della webcam
 
 service.gui.security.encryption.required=Cifratura necessaria!
 
 service.protocol.ICE_FAILED=Impossibile stabilire una connessione (ICE fallito e nessun Relay trovato)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Errore nell'archiviazione della lista contatti SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=La risorsa non può essere letta {0}. Per {1}
@@ -810,9 +769,7 @@ impl.ldap.QUERY_CUSTOM=Query personalizzata
 impl.ldap.QUERY_CUSTOM_HINT=Usa {0} come segnaposto per il termine di ricerca
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Aggiungi automaticamente i caratteri jolly ai termini della query
 impl.ldap.QUERY_PHOTO_INLINE=Recupera la foto assieme agli altri attributi
-impl.ldap.NEW=Nuovo
 impl.ldap.EDIT=modifica
-impl.ldap.REMOVE=Rimuovi
 impl.ldap.ENABLED=Abilitato
 impl.ldap.SERVER_NAME=Nome del server
 impl.ldap.SERVER_NAME_EXAMPLE=Il mio server LDAP
@@ -845,6 +802,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=telefonoCasa
 impl.ldap.PHONE_PREFIX=Prefisso telefonico
 impl.ldap.PHONE_PREFIX_EXAMPLE=Es.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Rubrica
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Abilita la ricerca nella Rubrica di MacOSX
@@ -854,14 +815,12 @@ plugin.addrbook.DEFAULT_IM_APP=Imposta Jitsi come programma di messaggistica pre
 plugin.addrbook.PREFIX=Specifica un prefisso per i numeri telefonici 
 plugin.addrbook.PREFIX_EXAMPLE=Es.: 00
 plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE=Errore nell'accesso ai contatti di Microsoft Outlook.
-plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT={0} non può accedere ai contatti di Microsoft Outlook perchè Outlook non è impostato come applicazione di posta predefinita.
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT={0} non può accedere ai contatti di Microsoft Outlook perché Outlook non è impostato come applicazione di posta predefinita.
 plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Imposta Outlook come applicazione di posta predefinita
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Contatti Google
-impl.googlecontacts.NEW=Nuovo
 impl.googlecontacts.EDIT=modifica
-impl.googlecontacts.REMOVE=Rimuovi
 impl.googlecontacts.ENABLED=Abilitato
 impl.googlecontacts.ACCOUNT_NAME=Nome account
 impl.googlecontacts.SAVE=Salva
@@ -900,11 +859,8 @@ plugin.accountinfo.ORGANIZATION=Nome organizzazione:
 plugin.accountinfo.JOB_TITLE=Qualifica:
 plugin.accountinfo.ABOUT_ME=Informazioni su di me:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Foto dell'utente
 plugin.accountinfo.GLOBAL_ICON=Usa icona globale
 plugin.accountinfo.LOCAL_ICON=Usa questa icona
-plugin.accountinfo.CHANGE=Cambia
-plugin.accountinfo.ONLY_MESSAGE=Solo messaggi
 
 # connection info
 plugin.connectioninfo.TITLE=Informazioni sulla connessione
@@ -924,49 +880,13 @@ plugin.aimaccregwizz.USERNAME=Nome utente AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Nome utente e password
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Registra nuovo account
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Se non hai un account AIM, premi questo bottone per crearne uno nuovo.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Sovrascrivi le opzioni predefinite del server
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Informazioni su {0}
 plugin.branding.LOGO_MESSAGE=VoIP && Messaggistica Istantanea Open Source
-plugin.branding.LOADING=Caricamento in corso
 plugin.branding.ABOUT_MENU_ENTRY=&Informazioni su...
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} è sotto attivo sviluppo. La versione che stai utilizzando è sperimentale e POTREBBE NON funzionare come previsto. Consulta {2} per maggiori informazioni.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Tutti i diritti riservati. Visita <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> è distribuito sotto i termini della LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Dizionari
-plugin.dictaccregwizz.ANY_DICTIONARY=Qualunque dizionario
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Qualunque dizionario da {0}
-plugin.dictaccregwizz.FIRST_MATCH=Prima corrispondenza
-plugin.dictaccregwizz.NO_MATCH=Nessuna corrispondenza
-plugin.dictaccregwizz.MATCH_RESULT=Nessuna definizione trovata per "{0}", forse intendevi:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Il dizionario attuale "{0}" non esiste più sul server.
-plugin.dictaccregwizz.INVALID_STRATEGY=La strategia attuale non è disponibile sul server.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Il protocollo Dict
-plugin.dictaccregwizz.HOST=Server
-plugin.dictaccregwizz.SERVER_INFO=Informazioni server
-plugin.dictaccregwizz.STRATEGY_SELECTION=Seleziona strategia
-plugin.dictaccregwizz.STRATEGY_LIST=Lista strategie:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Cerca strategie
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Una strategia è utilizzata per cercare parole simili, se una traduzione non è stata trovata, grazie a differenti approcci. Ad esempio le strategie Prefix cercano parole che iniziano come la parola che vuoi tradurre.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informazione account Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Questa procedura guidata creerà il tuo primo account Dict per te su dict.org.\n\nPuoi aggiungere nuovi dizionari entrando nella Procedura guidata di registrazione account. Riempi il campo host con il dizionario che vuoi aggiungere.
-plugin.dictaccregwizz.THREAD_CONNECT=Sto tentando di connettermi al server
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Connessione fallita: questo non è un server dict oppure il server è offline
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Scaricamento strategie in corso
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Nessuna strategia trovata sul server
-plugin.dictaccregwizz.POPULATE_LIST=Sto popolando la lista
-plugin.dictaccregwizz.CLOSING_CONNECTION=Chiusura connessione in corso
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Per poter utilizzare la chat di Facebook devi creare un nome utente <br>dalla pagina "Impostazioni account" su Facebook.</a><br><br>Nota: Quando hai creato un nome utente devi effetturare il logout dalla pagina web <br>e potrebbe passare del tempo prima che tu possa effettuare il login con il nuovo nome utente!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Il protocollo Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nome utente:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nome utente e Password
+
+plugin.busylampfield.PICKUP=Raccogli chiamata
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Esegui automaticamente {0} quando il computer viene avviato
@@ -977,9 +897,6 @@ plugin.generalconfig.SHOW_HISTORY=Mostra
 plugin.generalconfig.HISTORY_SIZE=messaggi recenti nelle nuove chat
 plugin.generalconfig.SEND_MESSAGES_WITH=Invia messaggi con:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Poni la finestra di chat in primo piano
-plugin.generalconfig.ERROR_PERMISSION=Non hai permessi sufficienti per rimuovere l'avvio automatico
-plugin.generalconfig.TRANSPARENCY=Trasparenza
-plugin.generalconfig.ENABLE_TRANSPARENCY=Abilita trasparenza
 plugin.generalconfig.DEFAULT_LANGUAGE=Lingua interfaccia
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=I cambiamenti effettuati saranno effettivi al prossimo avvio del programma.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% tradotto
@@ -1036,13 +953,19 @@ plugin.ircaccregwizz.HOST=Server:
 plugin.ircaccregwizz.IRC_SERVER=Server
 plugin.ircaccregwizz.EXAMPLE_SERVER=Es: chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Usa connessione sicura
+plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=Rileva presenza contatti
+plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=Rileva presenze nella chat room
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=Autenticazione SASL
+plugin.ircaccregwizz.ENABLE_SASL_AUTHENTICATION=Abilita autenticazione SASL
+plugin.ircaccregwizz.SASL_USERNAME=Nome utente
+plugin.ircaccregwizz.SASL_AUTHZ_ROLE=Ruolo
+plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED=La password IRC sopra è usata per l'autenticazione SASL
+plugin.ircaccregwizz.RESOLVE_DNS_THROUGH_PROXY=Risolvi sempre i nomi DNS attraverso il proxy
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Il protocollo XMPP
 plugin.jabberaccregwizz.USERNAME=Nome utente XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Conferma password
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=Nome utente e password
 plugin.jabberaccregwizz.CSERVER=Server
 plugin.jabberaccregwizz.SERVER=Connetti server
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Abilita keep alive
@@ -1058,13 +981,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Commento
 plugin.jabberaccregwizz.RESOURCE=Risorsa
 plugin.jabberaccregwizz.AUTORESOURCE=Genera la risorsa automaticamente
 plugin.jabberaccregwizz.PRIORITY=Priorità
-plugin.jabberaccregwizz.XMPP_ERROR=Errore XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Errore XMPP sconosciuto ({0}). Controlla che il nome del server sia corretto.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Le password non corrispondono.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Sovrascrivi le opzioni di default del server
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Opzioni avanzate
 plugin.jabberaccregwizz.USE_ICE=Usa ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Usa Jingle/ICE di Google (sperimentale)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Scopri automaticamente i server STUN/TURN
 plugin.jabberaccregwizz.SUPPORT_TURN=Abilita TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Nome utente TURN
@@ -1088,14 +1007,12 @@ plugin.jabberaccregwizz.EXISTING_ACCOUNT=Account XMPP esistente
 plugin.jabberaccregwizz.DOMAIN_BYPASS_CAPS=Dominio per le chiamate GTalk
 plugin.jabberaccregwizz.TELEPHONY_DOMAIN=Dominio telefonico 
 plugin.jabberaccregwizz.ALLOW_NON_SECURE=Permetti connessioni insicure
+plugin.jabberaccregwizz.DISABLE_CARBON=Disabilita le copie carbone dei messaggi
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Scegli automaticamente tra RTP e Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Opzioni del server
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Cambia la password dell'account
-plugin.jabberaccregwizz.NEW_PASSWORD=Nuova password
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Conferma nuova password
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Inserisci una porta del server valida per continuare
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Devi essere loggato all'account prima di poter cambiare la password.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Il campo della password è vuoto.
 plugin.jabberaccregwizz.TLS_REQUIRED=La connessione non usa TLS, quindi non sarà effettuato il cambio della password.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=La password è stata cambiata correttamente
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Questo server XMPP non supporta il cambio della password.
@@ -1109,25 +1026,9 @@ plugin.jabberaccregwizz.RESET=Ripristina
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Ripristina alle impostazioni globali
 plugin.jabberaccregwizz.DISABLE_JINGLE=Disabilita Jingle (chiamate vocali e videochiamate tramite XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Messaggio in uscita:
-plugin.mailbox.INCOMING=Messaggi in arrivo:
-plugin.mailbox.WAIT_TIME=Attesa prima che la chiamata venga trasferita alla casella vocale
-plugin.mailbox.MAX_MESSAGE_TIME=Durata massima dei messaggi in arrivo
-plugin.mailbox.CONFIRM=Conferma
-plugin.mailbox.DEFAULTS=Default
-plugin.mailbox.MAILBOX=Casella di posta elettronica
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Un protocollo per connettersi e chattare su MSN.
-plugin.msnaccregwizz.USERNAME=Email:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID e password
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Installa
 plugin.pluginmanager.UNINSTALL=Disinstalla
-plugin.pluginmanager.UPDATE=Aggiorna
 plugin.pluginmanager.PLUGINS=Plug-in
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=Seleziona file
@@ -1152,7 +1053,6 @@ plugin.sipaccregwizz.SERVER_PORT=Porta server
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Porta del proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Trasporto preferenziale
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Opzioni avanzate
 plugin.sipaccregwizz.PROXY_OPTIONS=Opzioni del proxy
 plugin.sipaccregwizz.PROXY_AUTO=Configura il proxy server automaticamente
 plugin.sipaccregwizz.ENABLE_PRESENCE=Attiva presenza (SIMPLE)
@@ -1172,8 +1072,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Scegli automaticamente tra RTP e Inband (no
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Sovrascrivi le opzioni di default del server
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Abilita supporto per chiamate criptate
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Annuncia il supporto di ZRTP nel protocollo di segnalazione
 plugin.sipaccregwizz.AUTH_NAME=Authorization name
@@ -1194,10 +1092,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=URI per il controllo della casella voca
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Le password non corrispondono.
 plugin.sipaccregwizz.NO_CERTIFICATE=<nessuno> (usa l'autenticazione tradizionale)
 plugin.sipaccregwizz.SAVP_OPTION=Indicazione RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Off (annuncia solo il supporto per RTP/AVP)
 plugin.sipaccregwizz.SAVP_OPTION_1=Obbligatorio (offri e accetta solo RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Opzionale (preferisci RTP/SAVP a RTP/AVP, ma accetta entrambi)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Abilita il "Descrittore S" (conosciuto anche come SDES o SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Scegli i protocolli di cifratura da abilitare e la loro priorità (il più importante sopra):
 plugin.sipaccregwizz.CIPHER_SUITES=Suite di cifratura abilitate:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} cercherà automaticamente di cifrare tutte le chiamate mediante ZRTP e ci sarà una notifica sonora e visiva una volta che la connessione sicura sarà stabilità. Dovresti cambiare le impostazioni avanzate solo se sei consapevole di quello che stai facendo.</div></html>
@@ -1211,15 +1109,6 @@ plugin.skinmanager.DEFAULT_SKIN=Skin predefinita
 plugin.skinmanager.ADD_NEW_SKIN=Aggiungi una nuova skin...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=La skin predefinita dell'applicazione.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Un protocollo per collegarsi a macchine remote tramite SSH.
-plugin.sshaccregwizz.USERNAME=Account ID:
-plugin.sshaccregwizz.IDENTITY_FILE=File di identità:
-plugin.sshaccregwizz.KNOWN_HOSTS=Host conosciuti:
-plugin.sshaccregwizz.OPTIONAL=Opzionale
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Dettagli account
-
 # status update
 plugin.autoaway.AUTO_STATUS=Stato di "assente" automatico
 plugin.autoaway.ENABLE_CHANGE_STATUS=Cambia stato mentre sei assente
@@ -1239,6 +1128,7 @@ plugin.updatechecker.DIALOG_NOUPDATE_TITLE=Nessuna nuova versione
 plugin.updatechecker.DIALOG_MISSING_UPDATE=L'installatore degli aggiornamenti è mancante.
 
 # usersearch
+plugin.usersearch.USER_SEARCH=Cerca utente
 
 # whiteboard
 plugin.whiteboard.TITLE=Lavagna [Beta]
@@ -1266,22 +1156,6 @@ plugin.whiteboard.DESELECT=Deseleziona
 plugin.whiteboard.DELETE=Cancella
 plugin.whiteboard.PROPERTIES=Proprietà
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Collegati e chatta usando Yahoo!
-plugin.yahooaccregwizz.USERNAME=Nome utente:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Nome utente e password
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Il protocollo Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Nome:
-plugin.zeroaccregwizz.LAST_NAME=Cognome:
-plugin.zeroaccregwizz.EMAIL=Email:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Ricorda contatti Bonjour?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=User ID e password
-plugin.zeroaccregwizz.USERID=User ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Il protocollo Google Talk
@@ -1295,19 +1169,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, the IP Telecommunications
 plugin.iptelaccregwizz.USERNAME=Nome utente
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Iscriviti a iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP e chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Nome utente
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Reinserisci la password
 plugin.sip2sipaccregwizz.EMAIL=Indirizzo e-mail
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Per aiuto riguardo questo servizio visita<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>L'indirizzo e-mail è usato per spedire messaggi vocali, <br>notifiche di chiamate perse e per recuperare la password smarrita</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Per aiuto riguardo questo servizio visita <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Account sip2sip.info esistente
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Crea un account sip2sip.info gratuito
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Messaggistica Istantanea
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Per aiuto riguardo questo servizio visita<br>http://ippi.fr
@@ -1316,6 +1182,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Account ippi esistente
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Crea un account ippi gratuito
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Chiudi finestra chat
 plugin.keybindings.CHAT_COPY=Copia
 plugin.keybindings.CHAT_CUT=Taglia
@@ -1338,10 +1205,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Nome
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Scorciatoia primaria
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Scorciatoia secondaria
 plugin.keybindings.globalchooser.PRESS_BTN=Premi per impostare la scorciatoia
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=In attesa
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Push to talk
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Abilita il rilevamento dei tasti speciali
 plugin.keybindings.PLUGIN_NAME=Scorciatoie
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Principale
 plugin.keybindings.GLOBAL=Scorciatoie globali
@@ -1369,6 +1236,7 @@ plugin.notificationconfig.tableheader.SOUND=Riproduci un suono attraverso il dis
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Riproduci un suono attraverso il dispositivo audio usato per la voce
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Riproduci un suono attraverso gli altoparlanti del PC
 plugin.notificationconfig.tableheader.DESCRIPTION=Descrizione dell'evento
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Chiamata in arrivo
 plugin.notificationconfig.event.SecurityMessage=Messaggio di sicurezza
 plugin.notificationconfig.event.IncomingFile=File in arrivo
@@ -1470,6 +1338,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Intra Refresh periodico
 impl.neomedia.configform.H264.defaultProfile=Profilo predefinito per la codifica:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Baseline
 impl.neomedia.configform.H264.defaultProfile.high=High
 impl.neomedia.configform.H264.defaultProfile.main=Main
@@ -1500,7 +1369,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Password attuale:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Inserisci una nuova password:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Reinserisci la nuova password:
 plugin.securityconfig.masterpassword.MP_TITLE=Password principale
-plugin.securityconfig.masterpassword.MP_NOT_SET=(non impostata)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=La password principale inserita non è corretta. Riprova.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=La password principale non è corretta!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Cambio password fallito
@@ -1516,7 +1384,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Password
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(sconosciuto)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(non posso decifrare)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Password salvate
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Rimuovi
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Rimuovi tutte
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Sei sicuro di voler rimuovere tutte le password?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Rimuovi tutte le password
@@ -1601,7 +1468,7 @@ plugin.otr.activator.unreadablemsgreceived={0} ti ha inviato un messaggio cifrat
 plugin.otr.activator.requireencryption=Il tuo messaggio [{0}] non è stato inviato. È richiesta la messaggistica privata.
 plugin.otr.activator.unreadablemsgreply=Hai inviato a {0} un messaggio criptato illeggibile. Per favore termina la conversazione privata con {1} o aggiornala.
 plugin.otr.activator.fallbackmessage=<span style="font-weight: bold;">{0} vuole iniziare una <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">conversazione con cifratura Off-The-Record</a> con te. Il tuo software, però, non supporta la cifratura Off-The-Record. Per maggiori informazioni visita <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">http://en.wikipedia.org/wiki/Off-the-Record_Messaging</a> (pagina in inglese)</span>
-plugin.otr.activator.multipleinstancesdetected={0} è collegato su più di un dispositivo e OTR ha aperto diverse sessioni. Puoi selezionare a quale sessione inviare il messaggio dal menù qui in basso. 
+plugin.otr.activator.multipleinstancesdetected=Il tuo amico {0} è collegato su più di un dispositivo e OTR ha aperto diverse sessioni. Puoi selezionare a quale sessione inviare il messaggio dal menù qui sotto.
 plugin.otr.activator.msgfromanotherinstance={0} ti ha inviato un messaggio destinato ad un'altra sessione. Se sei collegato da più di un dispositivo, hai ricevuto il messaggio su uno di questi.
 
 # global proxy plugin
@@ -1612,7 +1479,6 @@ plugin.globalproxy.PROXY_PORT=Porta
 plugin.globalproxy.PROXY_USERNAME=Nome utente
 plugin.globalproxy.PROXY_PASSWORD=Password
 plugin.globalproxy.DESCRIPTION={0} userà le impostazioni proxy specificate per tutte le reti cui ti connetterai d''ora in poi. \nIl supporto per i server proxy è sperimentale e funziona solo con alcuni protocolli. Controlla la tabella sottostante per maggiori dettagli:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOCKS4/5 </td><td> SOCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Usa il proxy anche per le richieste DNS
 plugin.globalproxy.FWD_DNS_NOTE=Utile con Tor. Aiuta ad evitare fughe di informazioni tramite il DNS inoltrando tutto il traffico DNS al proxy Tor. Richiede il riavvio.
@@ -1629,9 +1495,11 @@ plugin.reconnectplugin.NETWORK_DOWN=Connessione di rete persa!
 plugin.chatconfig.TITLE=Chat
 plugin.chatconfig.replacement.TITLE=Immagini/Video:
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Attiva la sostituzione automatica degli smiley
-plugin.chatconfig.replacement.REPLACEMENT_TITLE=Attiva l'anteprima automatica di immagini e video
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=Sostituisci immagini/video
 plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Abilita
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_PROPOSAL=Disabilita (mostra anteprima del collegamento)
 plugin.chatconfig.replacement.DISABLE_REPLACEMENT=Disabilita
+plugin.chatconfig.replacement.CONFIGURE_REPLACEMENT=Cambia impostazioni per la sostituzione di Immagini o Video
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Origini:
 plugin.chatconfig.spellcheck.TITLE=Controllo ortografico
 
@@ -1648,7 +1516,6 @@ plugin.provisioning.RESTART_WARNING=Nota che i cambiamenti avranno effetto solo
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Copia l'UUID negli appunti
 plugin.provisioning.CLIPBOARD_FAILED=Si è verificato un errore nel copiare l'UUID negli appunti
-plugin.provisioning.EXIT_ON_FAIL=Esci dall'applicazione se il provisioning fallisce
 plugin.provisioning.CREDENTIALS=Ultime credenziali salvate per il provisioning
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Sei sicuro di voler rimuovere la password per il provisioning?
 plugin.provisioning.PROV_FAILED=Il provisioning è fallito
@@ -1715,8 +1582,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} ha provato a connettersi al s
 #plugin spellcheck
 plugin.spellcheck.TITLE=Ortografia e Grammatica
 plugin.spellcheck.MENU=Mostra controllo ortografico
-plugin.spellcheck.LANG=Lingua
-plugin.spellcheck.EDIT_PERSONAL_DICT=Modifica
 plugin.spellcheck.ENABLE_SPELL_CHECK=Attiva controllo ortografico
 plugin.spellcheck.dialog.FIND=Trova successivo
 plugin.spellcheck.dialog.REPLACE=Sostituisci
diff --git a/resources/languages/resources_ja.properties b/resources/languages/resources_ja.properties
index 2d45a75..fe2adb9 100644
--- a/resources/languages/resources_ja.properties
+++ b/resources/languages/resources_ja.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -31,43 +42,36 @@ service.gui.ACCOUNT=アカウント
 service.gui.ACCOUNT_ME=私
 service.gui.ACCOUNT_REGISTRATION_WIZARD=アカウント登録ウィザード
 service.gui.ACCOUNTS=アカウント
-service.gui.ADD=追加 (&A)
-service.gui.ADD_ACCOUNT=アカウントを追加
+service.gui.ADD=追加（&A）
 service.gui.ADD_CONTACT=コンタクトを追加 (&A)
 service.gui.ADD_AUTHORIZED_CONTACT={0} をコンタクトリストに追加します
 service.gui.ADD_CONTACT_TO_CONTACTLIST=このコンタクトをコンタクトリストに追加
-service.gui.ADD_CONTACT_TO=コンタクトを追加 (&A)
+service.gui.ADD_CONTACT_TO=コンタクトを追加する (&A)
 service.gui.ADD_CONTACT_ERROR={0} というコンタクトを追加できませんでした。
 service.gui.ADD_CONTACT_ERROR_TITLE=コンタクト追加エラー
 service.gui.ADD_CONTACT_EXIST_ERROR=ID: {0} はすでにコンタクトリストに存在します。
-service.gui.ADD_CONTACT_NETWORK_ERROR=コンタクトIDを追加要求に対し、サーバーが応答しませんでした。：{0}
-service.gui.ADD_CONTACT_NOT_SUPPORTED=コンタクトID：{0} を追加できませんでした。操作がサポート外です。
-service.gui.ADD_CONTACT_IDENTIFIER=下のフィールドに追加したいコンタクトのIDを入力して下さい。
-service.gui.ADD_CONTACT_WIZARD=コンタクト追加ウィザード
+service.gui.ADD_CONTACT_NETWORK_ERROR=コンタクト ID: {0} の追加リクエストに対し、サーバーが応答しませんでした。
+service.gui.ADD_CONTACT_NOT_SUPPORTED=コンタクトID：{0} を追加できませんでした。この操作に対応していません。
 service.gui.ADD_CONTACT_NOT_CONNECTED=コンタクト追加するには、サーバー接続が必要です。指定のサービスプロバイダーへ再度ログインしてください。
 service.gui.ADD_GROUP_LOCAL_ERROR={0} というグループを追加できませんでした。ローカルI/Oを操作中に問題が起こりました。
 service.gui.ADD_GROUP_EXIST_ERROR={0} というグループはすでにコンタクトリストに存在します。ほかの名前を選択してください。
 service.gui.ADD_GROUP_NET_ERROR={0}というグループを追加できませんでした。ネットワーク障害のために問題が起こりました。ネットワーク接続を確認のうえ、再度お試しください。
 service.gui.ADD_GROUP_ERROR={0} というグループを追加できませんでした。
 service.gui.ADD_GROUP_EMPTY_NAME=グループ名を空にする事はできません。
-service.gui.ADD_GROUP=グループを追加
-service.gui.ADD_SUBCONTACT=サブコンタクトを追加 (&A)
 service.gui.ADDRESS=アドレス
 service.gui.ADMINISTRATOR=管理者
 service.gui.ADVANCED=アドバンスド (&A)
-service.gui.ALL=すべて (&A)
 service.gui.ALL_CONTACTS=すべてのコンタクト (&A)
 service.gui.ALTERNATE_ADDRESS=代用アドレス
 service.gui.APPLY=適用 (&A)
-service.gui.ARE_CALLING=がコールしています...
+service.gui.ARE_CALLING={0}がコールしています...
 service.gui.ARE_NOW=現在 {0} です
 service.gui.AT=で
 service.gui.AUTHORIZE=承認 (&A)
-service.gui.AUTHORIZATION_ACCEPTED=コンタクトはあなたの承認申請を受け入れました。
+service.gui.AUTHORIZATION_ACCEPTED={0}はあなたの承認申請を受け入れました。
 service.gui.AUTHENTICATION_FAILED={0}の認証に失敗しました。入力されたパスワードが間違っています。
-service.gui.AUTHENTICATION_REQUESTED=認証が求められています
 service.gui.AUTHENTICATION_REQUESTED_SERVER=サーバ: {0} は認証を要求しました。
-service.gui.AUTHENTICATION_REJECTED=コンタクトはあなたの承認申請を拒否しました。
+service.gui.AUTHENTICATION_REJECTED={0}はあなたの承認申請を拒否しました。
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} 認証
 service.gui.AUTHORIZATION_REQUESTED=承認が求められています
 service.gui.AUTHORIZATION_REQUESTED_INFO=コンタクト {0} があなたの承認を求めています。
@@ -75,10 +79,10 @@ service.gui.AUTHORIZATION_RESPONSE=承認の応答
 service.gui.AWAY_STATUS=不在
 service.gui.EXTENDED_AWAY_STATUS=長期不在
 service.gui.BAN=禁止 (&B)
-service.gui.BANNED=退出させられました
-service.gui.BAN_FAILED=禁止に失敗
-service.gui.BAN_FAILED_GENERAL_ERROR=コンタクト: {0} を禁止できませんでした。一般サーバエラーが発生しました。
-service.gui.BAN_FAILED_NOT_ALLOWED=コンタクト: {0} を禁止できませんでした。ルームのオーナーと管理者は禁止できません。
+service.gui.BANNED=強制退出完了
+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.BROWSE=ブラウズ
@@ -87,7 +91,7 @@ service.gui.BUSY_STATUS=取り込み中
 service.gui.CALL=コール
 service.gui.CALL_CONTACT=コンタクトにコールする
 service.gui.CALL_FAILED=コールに失敗しました
-service.gui.CALL_HISTORY_TOOL_TIP=コール履歴を表示するにはここをクリックしてください
+service.gui.CALL_HISTORY_TOOL_TIP=通話履歴を表示するにはここをクリックしてください
 service.gui.CALL_HISTORY_GROUP_NAME=着信履歴
 service.gui.CALL_VIA=次のアカウントでコール:
 service.gui.CALL_NAME_OR_NUMBER=名前か番号で呼び出し
@@ -106,11 +110,11 @@ service.gui.CHANGE_NICKNAME_LABEL=新しいニックネームを下のフィー�
 service.gui.CHANGE_NICKNAME_ERROR=ニックネーム変更エラー
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=ニックネームは既に存在します
 service.gui.CHANGE_VIDEO_QUALITY=相手側の映像品質を変更
-service.gui.CHAT_CONFERENCE_LABEL=会議
-service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}''の会議
+service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}の会議
 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_CONFIGURATION_MEMBERS_EDIT_TITLE=メンバーリストを編集
 service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_DESCRIPTION=右のリストは、このチャットルームにいるメンバー権限がある人を含んでいます。チャットルームが"メンバーのみ"の場合、このユーザーのみが参加できます。
@@ -119,18 +123,14 @@ 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_SEND_MSG_FORBIDDEN=メッセージ送信が禁止されています(音声は削除されました)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=今後の為にチャットルームを保存
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=保存済チャットルームのリストから選択したルームを削除
 service.gui.CHAT_ROOM_NAME=チャットルーム名
 service.gui.CLEAR_CUSTOM_MESSAGES=カスタムメッセージをクリア
 service.gui.ROOM_NAME=チャットルーム
-service.gui.AUTOJOIN=自動参加
 service.gui.CHANGE_PASSWORD=パスワードを変更
 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_LEAVE_NOT_CONNECTED=チャットルームに去るためにはログインしている必要があります。
-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} はパスワードを要求しました。
@@ -144,27 +144,24 @@ service.gui.CHOOSE_NUMBER=番号を選択
 service.gui.CHOOSE_ACCOUNT=アカウント一覧から選択してください。
 service.gui.CITY=市(区町村)
 service.gui.COUNTRY=国
-service.gui.SHOW_MORE_TOOLTIP=より詳細はクリック
+service.gui.SHOW_MORE_TOOLTIP=更に詳細を表示するにはクリック
 service.gui.CLEAR=テキストを消去
 service.gui.CLOSE=閉じる (&o)
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=2秒以内に新しいメッセージを受け取っています。本当にこのチャットを閉じますか？
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=転送中のファイルがあります。これらをキャンセルしてもいいですか？
-service.gui.CONFIRM=確認
 service.gui.CONNECTED_STATUS=接続済み
 service.gui.CONNECTING=接続...
 service.gui.CONNECTING_STATUS=接続...
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=接続...
 service.gui.CONNECTION=接続...
-service.gui.CONNECTION_FAILED_MSG=次のアカウントで接続に失敗しました: ユーザ名: {0}, サーバ名: {1}. ネットワーク接続をご確認、もしくは、ネットワーク管理者に問い合わせてください。
 service.gui.CONNECTION_EXPIRED_MSG=現在サーバ {0} とは接続していません。
 service.gui.CONTACT_NAME=ID または番号
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=選択した問い合わせ先 {0} は電話を受け付けていません。
+service.gui.CONTACT_NAME_PROMPT=jane.doe@example.com
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=選択した問い合わせ先 {0} は電話を受け付けていません。
 service.gui.CONTACT_PAUSED_TYPING={0} はメッセージ入力を休止しています
 service.gui.CONTACT_TYPING={0} はメッセージを入力しています
 service.gui.CONTACT_TYPING_SEND_FAILED=おっと、今入力中なので {0} に通話できませんでした。
 service.gui.CONTACT_INFO=問い合わせ情報 (&C)
-service.gui.CONTACTLIST=コンタクトリスト
 service.gui.CONTACTS=問い合わせ
 service.gui.COPY=コピーする (&C)
 service.gui.COPY_LINK=リンクをコピーする (&l)
@@ -176,43 +173,47 @@ service.gui.CREATE_CHAT_ROOM_WIZARD=チャットルーム作成ウィザード
 service.gui.CREATE_CONFERENCE_CALL=会議通話を開始...(&C)
 service.gui.CREATE_GROUP=グループを作成する (&C)
 service.gui.CREATE_GROUP_NAME=下のフィールドに作成したいグルームの名前を入力してください。
-service.gui.CREATE_FIRST_GROUP_WIZARD=あなたのコンタクトリストはひとつもグループを含んでいません。初めにグループを作成してください。(ファイル/グループ作成)
 service.gui.CREATE_VIDEO_BRIDGE=新規のビデオブリッジを作成(&v)
 service.gui.CREATE_VIDEO_BRIDGE_MENU=新規のビデオブリッジを作成(&v)
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=ビデオ会議を作成/参加
 service.gui.CREATE_VIDEO_CONFERENCE=このチャットルームに新しくビデオ会議を作成
-service.gui.CONTACT_INFO_NOT_SUPPORTED=この問い合わせ先はウェブ問い合わせを受け付けていません。
+service.gui.CONTACT_INFO_NOT_SUPPORTED=この連絡先はウェブ問い合わせを受け付けていません。
 service.gui.CUT=カット (&u)
-service.gui.DATE=日付
 service.gui.DELETE=削除する
 service.gui.DENY=拒否(&D)
 service.gui.DESKTOP_SHARING_WARNING=<b>画面共有を開始してもよろしいですか？</b> <br> OKをクリックすると、この会議に参加中の全ての人に画面が表示されます。
-service.gui.DIALPAD=ダイアルパッド
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=画面を共有します。
+service.gui.DIALPAD=あなたの画面を共有中
 service.gui.DISPLAY_NAME=表示名
+service.gui.DISPLAY_NAME_PROMPT=ジェーン ドゥ
 service.gui.DISCONNECTED_STATUS=未接続
 service.gui.DND_STATUS=着信拒否
 service.gui.DO_NOT_ASK_AGAIN=次回は聞かない
-service.gui.DO_NOT_SHOW_AGAIN=次回はこのメッセージを表示しない
-service.gui.DOWNLOAD_NOW=すぐにダウンロード(&D)
+service.gui.DO_NOT_SHOW_AGAIN=次回よりこのメッセージを表示しない
 service.gui.DRAG_FOR_SHARING=なんでも共有したいものをここにドラッグ...
 service.gui.DURATION=期間
+service.gui.DESTROY_CHATROOM=チャットルームを削除する
+service.gui.DESTROY_MESSAGE=他の参加者に通知するには、その理由と参加する代替チャットルームアドレスを入力してください。
 service.gui.EDIT=編集する (&E)
-service.gui.EMAIL=電子メール:
-service.gui.EMAILS=電子メール:
-service.gui.EMPTY_HISTORY=ヒストリを消去する (&E)
+service.gui.EDITED_AT={0}で編集
+service.gui.EMAIL=Email
+service.gui.EMAILS=Email
+service.gui.EMPTY_HISTORY=履歴がありません
+service.gui.ENABLE_DESKTOP_REMOTE_CONTROL=リモートデスクトップアプリを有効にする
+service.gui.ENABLE_TYPING_NOTIFICATIONS=チャット入力中の状態を外部の人に知らせる（チャットアクティビティを送信）
+service.gui.END_CONFERENCE=会議を終了する
 service.gui.ENTER_PHONE_NUMBER=電話番号を入力してください
-service.gui.ENTER_NAME_OR_NUMBER=名前か番号で呼び出し
+service.gui.ENTER_NAME_OR_NUMBER=名前もしくは番号を入力
 service.gui.ERROR=エラー
 service.gui.ERROR_WAS=エラーです：{0}
 service.gui.ERROR_RECEIVED_FROM={0} からエラーを受け取りました
 service.gui.ESTIMATED_TIME=残り時間:
 service.gui.EVENTS=イベント
 service.gui.EXIT=終了 (&x)
-service.gui.EXTENDED_CRITERIA=拡張条件
 service.gui.GENERAL=一般
 service.gui.GENERAL_ERROR=一般エラー
 service.gui.GROUP_NAME=グループ名
-service.gui.FAILED_STATUS=コールに失敗しました
+service.gui.FAILED_STATUS=コール失敗
 service.gui.FAILED_TO_JOIN_CHAT_ROOM={0} というチャットルームに参加できませんでした。
 service.gui.FAX=Fax
 service.gui.FFC_STATUS=自由にチャットできます
@@ -229,17 +230,19 @@ service.gui.FILE_SEND_FAILED=ファイル送信に失敗しました: {0}
 service.gui.FILE_TOO_BIG=このプロトコルで送信できるファイル最大サイズを越えています: {0}
 service.gui.FILE_SEND_REFUSED={0} からこのファイルが拒否されました。
 service.gui.FILE_TRANSFER_REFUSED=ファイル転送が拒否されました。
-service.gui.FILE_TRANSFER_NOT_SUPPORTED=選択した連絡先は、ファイル転送をサポートしていません。
+service.gui.FILE_TRANSFER_NOT_SUPPORTED=選択された連絡先は、ファイル転送に対応していません。
+service.gui.FILE_TRANSFER_PREPARING={0}にファイル送信準備中。しばらくお待ちください･･･
 service.gui.FILE_TRANSFER_REQUEST_RECIEVED={0}があなたとファイルを共有中
 service.gui.FILE_DOES_NOT_EXIST=指定のファイルは見つかりませんでした。削除されたか、移動されました。
 service.gui.FILE_OPEN_FAILED=ファイルを開けませんでした。削除されたか、移動されました。
-service.gui.FILE_OPEN_NOT_SUPPORTED=申し訳ございませんが、このプラットフォームでは、ファイルを開く操作はサポートされていません。
+service.gui.FILE_OPEN_NOT_SUPPORTED=申し訳ございません。このプラットフォームでは、ファイルを開く操作に対応していません。
 service.gui.FILE_OPEN_NO_PERMISSION=このファイルを開く権限がありません。権限を確認の上、再度試してください。
 service.gui.FILE_OPEN_NO_APPLICATION=このファイルタイプに関連づけられたアプリケーションが見つかりませんでした。
-service.gui.FINISH=仕上げる (&F)
+service.gui.FINISH=終了する
 service.gui.FOLDER_DOES_NOT_EXIST=このファイルを入れたフォルダが見つかりませんでした。削除されたか、移動されています。
 service.gui.FOLDER_OPEN_FAILED=フォルダーを開けませんでした
 service.gui.FOLDER_OPEN_NO_PERMISSION=このフォルダを開く権限がありませんでした。権限を確認の上、再度試してください。
+service.gui.FOLDER_OPEN_NO_APPLICATION=このフォルダを開くアプリケーションが見つかりませんでした。
 service.gui.FONT=フォント
 service.gui.FONT_BOLD=ボールド
 service.gui.FONT_COLOR=色
@@ -247,7 +250,12 @@ service.gui.FONT_FAMILY=ファミリー
 service.gui.FONT_ITALIC=斜体
 service.gui.FONT_SIZE=サイズ
 service.gui.FONT_STYLE=スタイル
-service.gui.FONT_UNDERLINE=アンダーライン
+service.gui.FONT_UNDERLINE=下線
+service.gui.GRANT_OWNERSHIP=所有権保有中…
+service.gui.GRANT_ADMIN=管理権保有中…
+service.gui.GRANT_MODERATOR=議長権保有中…
+service.gui.GRANT_MEMBERSHIP=メンバー権保有中…
+service.gui.GRANT_VOICE=音声を許可
 service.gui.GUEST=ゲスト
 service.gui.HANG_UP=切断
 service.gui.HD_QUALITY=HDビデオ
@@ -268,7 +276,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=ローカルに保存されているメ�
 service.gui.HISTORY_REMOVE_ERROR=ローカルに保存されているメッセージの削除に失敗しました。
 service.gui.HOME=ホーム
 service.gui.HOME_PAGE=ホームページ
-service.gui.HOUR=時間
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=識別子
 service.gui.IGNORE=無視する (&I)
@@ -276,53 +283,58 @@ service.gui.INSERT_SMILEY=スマイリーを挿入
 service.gui.INCOMING_CALL=次のところから着信: {0}
 service.gui.INCOMING_SCREEN_SHARE=次のところから画面共有が着信: {0}
 service.gui.INCOMING_CALL_STATUS=着信中です
+service.gui.INCOMING_SCREEN_SHARE_STATUS=画面共有が着信中
+service.gui.INSTANT_MESSAGINGS=インスタントメッセンジャー
+service.gui.IM=インスタントメッセージ
+service.gui.INITIATING_CALL_STATUS=コール開始
 service.gui.INVITATION=招待文
 service.gui.INVITATION_RECEIVED=招待を受けました
 service.gui.INVITATION_RECEIVED_MSG={0} はチャットルーム: {1} にあなたを招待しました。この招待を受け入れるか、拒否するか、無視することができます。
+service.gui.INVITATION_REJECTED={0}はあなたの招待を拒否しました。理由：{1}.
 service.gui.INVITE=招待 (&I)
 service.gui.INVITE_CONTACT_MSG=この会話に追加したいコンタクトを選択して、招待のボタンをクリックしてください。
 service.gui.INVITE_CONTACT_TO_CHAT=コンタクトをチャットに招待
-service.gui.INVITE_CONTACT_TO_CALL=コンタクトをチャットに招待
+service.gui.INVITE_CONTACT_TO_CALL=連絡先を招待
 service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=連絡先をビデオブリッジに招待
 service.gui.INVITE_REASON=招待理由
-service.gui.IS_CALLING=コール中...
+service.gui.IS_CALLING={0}がコール中...
 service.gui.IS_NOW={0} は現在 {1} です。
-service.gui.JITSI_WARNING=SIPコミュニケーターは、Jitsiに名称変更されました。<br/> 今後、最新バージョンに更新する場合は、Jitsiをダウンロードするようにしてください。<br/><br/>ご迷惑をお掛けして申し訳ございません。<br/><br/>Jitsi開発チーム
-service.gui.JITSI_WARNING_TITLE=SIPコミュニケーターは、Jitsiになりました。
 service.gui.JOIN=参加する (&J)
 service.gui.JOIN_AS=として参加 (&o)
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=会議中のビデオ会議に参加
 service.gui.JOIN_VIDEO=ビデオに参加
-service.gui.CLOSE_CHAT_ROOM_DIALOG=閉じる (&o)
 service.gui.JOB_TITLE=肩書き
 service.gui.JOIN_CHAT_ROOM=チャットに参加する... (&J)
 service.gui.JOIN_CHAT_ROOM_TITLE=チャットに参加
 service.gui.JOIN_CHAT_ROOM_NAME=参加したいチャットルームを入力してください。
 service.gui.JOIN_CHAT_ROOM_WIZARD=チャットルーム参加ウィザード
 service.gui.JOIN_AUTOMATICALLY=自動的に参加
+service.gui.DONT_JOIN_AUTOMATICALLY=自動的に参加しない
 service.gui.KICK=キック (&K)
 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.LAST_NAME=姓:
+service.gui.LAST_NAME=姓
 service.gui.LEAVE=去る (&L)
 service.gui.LIMIT_REACHED_FOR_IP=ローカルのIPアドレスから登録が多すぎるのです。サーバー: {0} は登録をオープンすることができません。
-service.gui.LIST=最終
+service.gui.LIST=リスト
+service.gui.LOADING_ROOMS=部屋を読込中…
+service.gui.LOADING=読込中…
+service.gui.LOCALLY_ON_HOLD_STATUS=保留中
 service.gui.LOGIN_NETWORK_ERROR=<DIV>ネットワークに障害があったため、アカウント:<BR>ユーザ名: {0}<BR>サーバ名: {1}<BR>でログインできませんでした。ネットワーク接続性を確認してください。</DIV>
 service.gui.LOGIN_GENERAL_ERROR=ユーザ名: {0}, サーバ名: {1} でログインしようとしたところエラーが発生しました。
 service.gui.LOGIN_INTERNAL_ERROR=アプリケーション内部エラーのため、ユーザ名: {0}, サーバ名: {1} でログインに失敗しました。お手数ですが、問題を dev@sip-communicator.dev.java.net までご報告ください。
 service.gui.LOGIN_INVALID_PROPERTIES_ERROR=アカウント設定に問題があるため、ユーザ名: {0}, サーバ名: {1} でログインできませんでした。アカウント設定をご確認ください。
 service.gui.LOGOFF_NOT_SUCCEEDED=ユーザ名: {0}, サーバ名: {1} でログオフ中にエラーが発生しました。
+service.gui.LOW_QUALITY=低品質
 service.gui.MEMBER=メンバー
 service.gui.MERGE_TO_CALL=全ての通話を統合
 service.gui.MESSAGE=メッセージ
 service.gui.MISSED_CALLS_TOOL_TIP=次のところから不在着信:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= {0} からも
 service.gui.MODERATOR=司会者
-service.gui.MORE=もっと見る
-service.gui.MORE_LABEL=移動
+service.gui.MORE_LABEL=もっと
 service.gui.MOVE=移動
 service.gui.MOVE_SUBCONTACT=コンタクトを移動 (&o)
 service.gui.MOVE_SUBCONTACT_MSG=選択した連絡先を移動したい、連絡先かグループを選択してください。
@@ -330,16 +342,21 @@ service.gui.MOVE_SUBCONTACT_FAILED=選択したコンタクトは移動元のコ
 service.gui.MOVE_SUBCONTACT_QUESTION=<DIV><B> {0} </B> を <B> {1} </B> に移動しますか？</DIV>
 service.gui.MOVE_TO_GROUP=グループに移動する (&M)
 service.gui.MOVE_CONTACT=コンタクトを移動
-service.gui.MOVE_CONTACT_ERROR=このコンタクトは移動出来ません (&C)
 service.gui.MSG_DELIVERY_FAILURE=上記のメッセージは配送できませんでした
-service.gui.MSG_DELIVERY_NOT_SUPPORTED=あなたが使っているプロトコルはオフラインメッセージをサポートしていません。他のプロトコルを使ってコンタクトするか、オンラインになるまでお待ちください。
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=あなたが使っているプロトコルはオフラインメッセージに対応していません。他のプロトコルを使ってコンタクトするか、オンラインになるまでお待ちください。
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=内部エラーが発生しました：{0}。次のサイトにて問題を報告してください: http://www.sip-communicator.org/index.php/Development/BugsAndIssues
 service.gui.MSG_DELIVERY_ERROR=メッセージ送信に失敗しました。
 service.gui.MSG_DELIVERY_UNKNOWN_ERROR=メッセージ送信中に不明なエラーが発生しました。
-service.gui.MSG_NOT_POSSIBLE=そのコンタクトとメッセージングができません（プロトコルによってサポートされていません）
+service.gui.MSG_DELIVERY_UNSUPPORTED_OPERATION=サポートされていない操作です
+service.gui.MSG_NOT_DELIVERED=ネットワーク問題が発生しました。ネットワーク状況を確認し再度行ってください。
+service.gui.MSG_NOT_POSSIBLE=この連絡先とはメッセージできません（プロトコルに対応していません）
 service.gui.MSG_RECEIVED={0} はあなたにメッセージを送りました
 service.gui.MSG_SEND_CONNECTION_PROBLEM=メッセージを送るためにはオンラインである必要があります。
 service.gui.MULTIPLE_LOGINS=同じアカウントで複数回ログインしました。アカウント ユーザ名: {0}, サーバ名: {1} は現在未接続です。
+service.gui.MY_CHAT_ROOMS=チャットルームに参加
+service.gui.MY_CHAT_ROOMS_TITLE=チャットルームに参加
+service.gui.MUTUALLY_ON_HOLD_STATUS=相互保留中
+service.gui.NAME=名前
 service.gui.NETWORK=ネットワーク
 service.gui.NETWORK_FAILURE=ネットワーク障害
 service.gui.NEXT=次 (&N)
@@ -352,34 +369,73 @@ service.gui.NICKNAME=ニックネーム
 service.gui.NO=いいえ
 service.gui.NONE=使用しない
 service.gui.NO_CAMERA_AVAILABLE=利用可能なカメラがありません。
-service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=このプロトコルでは、デスクトップ共有がサポートされていません。
+service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=このプロトコルでは、デスクトップ共有に対応していません。
 service.gui.NO_VIDEO_ENCODINGS=設定でビデオエンコードが選択されていません。
-service.gui.NO_VIDEO_FOR_PROTOCOL=このプロトコルでは、ビデオはサポートされていません。
+service.gui.NO_VIDEO_FOR_PROTOCOL=このプロトコルは、映像に対応していません。
 service.gui.NO_AVAILABLE_ROOMS=このサーバのルームリストは現在利用出来ません。
 service.gui.NO_CONTACTS_FOUND=連絡先の検索結果はありません。{0} を呼びだすには、Ctrl+Enterを押すか、下のボタンを使用してください。
 service.gui.NO_CONTACTS_FOUND_SHORT=連絡先の検索結果はありません。
 service.gui.NO_MESSAGE=メッセージがありません
 service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=複数ユーザチャットが利用可能なアカウントがありません。複数ユーザチャットに対応したプロトコルについては、sip-communicator.org をご確認ください。
+service.gui.NO_ONLINE_CONFERENCING_ACCOUNT=会議通話に利用できるアカウントがありません。会議通話に使用できるプロトコルの詳細な情報を https://jitsi.org で確認してください。
+service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=音声通話するためには、少なくとも1つはオンラインの通話アカウントが必要です。通話用のアカウントにログインして、再試行してください。
+service.gui.NOT_AUTHORIZED=許可されません
 service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=未送信のメッセージがあるチャットを閉じようとしています。本当にこのチャットを閉じますか？
 service.gui.NON_EXISTING_USER_ID=サーバ {0} には指定されたユーザIDが存在しません。
+service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=コンタクトリストにありません
+service.gui.SD_QUALITY=品質：通常
 service.gui.OFFLINE=オフライン
 service.gui.OK=OK (&O)
-service.gui.OLDER_CALLS=以前のコール
 service.gui.ONLINE=オンライン
+service.gui.OPEN=開く
+service.gui.OPEN_FILE_FROM_IMAGE=ダブルクリック：ファイルを開く
+service.gui.OPEN_FOLDER=フォルダを開く
 service.gui.OPEN_IN_BROWSER=ブラウザを開く (&b)
 service.gui.OPTIONS=オプション
+service.gui.OPEN_AUTOMATICALLY=メッセージのみ開く
+service.gui.OPEN_ON_ACTIVITY=アクティビティを開く
+service.gui.OPEN_ON_MESSAGE=メッセージのみ開く
+service.gui.OPEN_ON_IMPORTANT_MESSAGE=重要なメッセージのみ開く
+service.gui.OR=または
+service.gui.ORGANIZATION=組織
+service.gui.OTHER=その他
+service.gui.chat.role.OWNER=所有者
 service.gui.chat.role.ADMINISTRATOR=管理者
+service.gui.chat.role.MODERATOR=司会者
+service.gui.chat.role.MEMBER=メンバー
+service.gui.chat.role.GUEST=ゲスト
+service.gui.chat.role.SILENT_MEMBER=サイレントメンバー
+service.gui.chat.role.OUTCAST=参加禁止
+service.gui.OWNER=部屋の所有者
+service.gui.ON_MOBILE_TOOLTIP=モバイル
 service.gui.PASSWORD=パスワード
+service.gui.PASSWORD_CHANGE_FAILURE=パスワード変更に失敗しました
+service.gui.PASSWORD_CHANGE_SUCCESS=パスワードが変更されました
 service.gui.PASTE=貼付け (&P)
+service.gui.PERSONAL=個人的な
+service.gui.PORT=ポート
+service.gui.POSTAL_CODE=郵便番号
+service.gui.PREFERENCES=環境設定
+service.gui.PREFIX=プレフィックス
+service.gui.PRESENCE=出席
+service.gui.PRESS_ENTER_FOR_SUGGESTIONS=提案
+service.gui.PRESS_FOR_CALL_INFO=通話情報
+service.gui.PRESS_TO_OPEN_CRM=CRMアプリを開く
 service.gui.PREVIOUS=前
-service.gui.PREVIOUS_TOOLTIP=過去の会話を表示する
 service.gui.PRINT=印刷 (&P)
 service.gui.PROACTIVE_NOTIFICATION=がメッセージを入力しています
+service.gui.PROBLEMS_ENCOUNTERED=問題が発生しました
 service.gui.PROTOCOL=プロトコル
+service.gui.PUT_OFF_HOLD=保留解除
+service.gui.PUT_ON_HOLD=保留
 service.gui.QUIT=終了 (&Q)
+service.gui.READY=準備
+service.gui.RECENT_MESSAGES=最近の会話
 service.gui.REASON=理由
+service.gui.RECEIVED={0}が受け取りました
 service.gui.RECONNECTION_LIMIT_EXCEEDED=サーバへの再接続が切断から短すぎました。アカウント ユーザ名: {0}, サーバ名: {1} は一時的に拒否されました。しばらく間を置いて再接続してください。
 service.gui.RE_REQUEST_AUTHORIZATION=承認を要求　(&R)
+service.gui.REFERRED_STATUS=照会
 service.gui.REJECT=拒否 (&R)
 service.gui.REMEMBER_PASSWORD=パスワードを記録する
 service.gui.REMOVE=取り除く (&R)
@@ -387,77 +443,158 @@ service.gui.REMOVE_ACCOUNT=アカウントを取り除く (&R)
 service.gui.REMOVE_ACCOUNT_MESSAGE=本当にこのアカウントを取り除きますか?
 service.gui.REMOVE_CONTACT=サブコンタクトを取り除く (&R)
 service.gui.REMOVE_CONTACT_TEXT=<DIV>本当に <B> {0} </B> をコンタクトリストから <BR> 取り除きますか?</DIV>
+service.gui.REMOVE_CONTACT_NOT_CONNECTED=このコンタクトを取り除くにはログインが必要です。ログインしてやり直してください。
 service.gui.REMOVE_GROUP=グループを取り除く (&R)
+service.gui.REMOTELY_ON_HOLD_STATUS=リモートが保留中
 service.gui.RENAME=名前を変更 (&R)
 service.gui.RENAME_CONTACT=コンタクトの名前を変更 (&n)
 service.gui.RENAME_CONTACT_WIZARD=指定したコンタクトに対して利用する名前を下のフィールドに入力してください。
 service.gui.RENAME_GROUP=グループの名前を変更 (&n)
 service.gui.RENAME_GROUP_INFO=指定したグループに対して利用する名前を下のフィールドに入力してください。
+service.gui.RENAME_CLEAR_USER_DEFINED=復元
+service.gui.RINGING_STATUS=呼び出し中
 service.gui.REQUEST=要求 (&R)
 service.gui.REQUEST_AUTHORIZATION=承認を要求　(&R)
 service.gui.REQUEST_AUTHORIZATION_MSG=承認が必要なため、{0} をコンタクトリストに追加できませんでした。次に承認要請を入力してください。
 service.gui.RETRY=再試行
-service.gui.ROOT_GROUP=ルートグループ
+service.gui.REVOKE_OWNERSHIP=所有権を取り消す
+service.gui.REVOKE_ADMIN=管理者を取り消す
+service.gui.REVOKE_MODERATOR=司会者を取り消す
+service.gui.REVOKE_MEMBERSHIP=メンバーを取り消す
+service.gui.REVOKE_VOICE=音声を取り消す
 service.gui.SAVE=保存 (&S)
 service.gui.SEARCH=検索 (&S)
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=選択したサーバに存在するチャットルームを表示するには下のボタンをクリックしてください。そして、参加したいチャットルームを選択し「参加」ボタンをクリックしてください。
-service.gui.SELECT_ACCOUNT=アカウントを選択
+service.gui.SEARCH_STRING_CONTACT_SOURCE=コンタクトをさがす
+service.gui.SECURITY=セキュリティ
 service.gui.SELECT_COLOR=色を選択する
 service.gui.SELECT_GROUP=グループ選択
-service.gui.SELECT_GROUP_WIZARD_MSG=次のリストはあなたのコンタクトリストに含まれるグループのリストです。新しいコンタクトを追加したいグループを選択してください。
-service.gui.SELECT_GROUP_WIZARD=グループ指定
+service.gui.SELECT_NO_GROUP=グループがありません
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=次のリストは複数ユーザチャット機能をサポートするアカウントのリストです。チャットルームを作成に使用したいアカウントを選択してください。
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=次のリストは登録しているすべてのアカウントのリストです。新しいコンタクトと通信するのに利用したいアカウントを選択してください。
-service.gui.SELECT_PROVIDERS_WIZARD=アカウント選択
+service.gui.SELECT_VIDEO_CONFERENCE=ビデオ会議を選択する
+service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=リストからチャットルームを選択し、OKで追加する
 service.gui.SEND=送る (&S)
 service.gui.SEND_FILE=ファイルを送る (&f)
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=このコンタクトに関する情報がありません。
 service.gui.SEND_MESSAGE=メッセージを送る (&S)
-service.gui.SEND_AS_SMS=SMSとして送る
+service.gui.SEND_PRIVATE_MESSAGE=プライベートメッセージを送信
 service.gui.SEND_SMS=SMSを送る (&e)
 service.gui.SEND_SMS_DETAILS=国際通話の形式で番号を入力する必要があります 例えば、イギリスの場合 +44 で始まり、+447777000000 となります。
-service.gui.SEND_SMS_NOT_SUPPORTED=選択したプロトコルはSMSメッセージをサポートしていません。
+service.gui.SEND_SMS_NOT_SUPPORTED=選択したプロトコルはSMSメッセージに対応していません。
+service.gui.SMS=SMS
+service.gui.SEND_VIA=経由して送る
+service.gui.SENT=送信
+service.gui.SERVER_CHAT_ROOMS=チャットルームサーバー
+service.gui.SET_GLOBAL_STATUS=グローバルステータスの設定
 service.gui.SET_STATUS_MESSAGE=状態メッセージを設定
+service.gui.SET_SUBJECT=件名を設定
 service.gui.SETTINGS=設定 (&S)
+service.gui.SHARE_DESKTOP=画面共有
+service.gui.SHARE_DESKTOP_WITH_CONTACT=コンタクト先とデスクトップ共有
+service.gui.SHARE_FULL_SCREEN=フルスクリーン
+service.gui.SHARE_REGION=領域共有
+service.gui.SHOW=表示
+service.gui.SHOW_CONTACT_LIST_TOOL_TIP=表示を履歴からコンタクトリストへ切り替えるにはこちらをクリック
+service.gui.SHOW_MORE=更に見せる
 service.gui.SHOW_OFFLINE_CONTACTS=オフラインのコンタクトを表示
+service.gui.SIGN_IN=サインイン
 service.gui.SMS_SUCCESSFULLY_SENT=SMSメッセージが送信できました!
 service.gui.SMS_SEND_CONNECTION_PROBLEM=SMSメッセージを送信するにはSMSプロバイダアカウントに接続している必要があります。
 service.gui.SPECIFY_REASON=下のフィールドにこの操作の理由を指定できます。
+service.gui.SPECIFY_SERVER=アカウントのサーバー部分を指定してしてください。
+service.gui.SOUND_OFF=音をオフにする
+service.gui.SOUND_ON=音をオンにする
+service.gui.START_SHARING=シェア開始
+service.gui.STATUS=ステータス
 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.STOP_SHARING=シェア停止
+service.gui.STREET=ストリート
 service.gui.SUBJECT=件名
 service.gui.SUMMARY=概要
-service.gui.TODAY=今日
+service.gui.TELEPHONY=通話方式
 service.gui.TOOLS=ツール (&T)
 service.gui.TRANSFER=転送 (&f)
-service.gui.TO=へ: (&T)
+service.gui.TO=転送したい連絡先の名前を選択、転送します。
+service.gui.TRANSFER_CALL_MSG=転送したい連絡先の名前を選択し、転送をクリックします。
 service.gui.TRANSFER_CALL_TITLE=コールを転送
+service.gui.TRANSFER_CALL_TO=へ転送
 service.gui.TRANSPARENCY_NOT_ENABLED=透明性を現在の構成でサポートされません。
 service.gui.TYPE_YOUR_REQUEST=あなたの要求をここに入力してください
+service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=この通話ではビデオの品質を変更できませんでした。
 service.gui.USER_IDENTIFIER=ユーザID:
 service.gui.USER_EXISTS_ERROR=このユーザーは既に選択されたネットワークに存在する。ほかのユーザーまたはネットワークを選択してください。
+service.gui.USERNAME_NULL=ユーザーネームとパスワードを入力してください
+service.gui.WEBPAGE=ウェブサイトを開く
 service.gui.ACCOUNT_CREATION_FAILED=アカウントを作成出来ませんでした: {0}
 service.gui.UNKNOWN=不明なユーザ
+service.gui.UNKNOWN_STATUS=不明な状態
 service.gui.UNREGISTERED_MESSAGE=次のアカウントに接続できませんでした: ユーザ名: {0}, サーバ名: {1}。あなたは現在オフラインです。
+service.gui.USE_PROVISIONING=オンライン設定を利用
+service.gui.VALUE=値
+service.gui.VIDEO_CALL=＆ビデオ通話
+service.gui.VIA=経由
 service.gui.VIEW=表示する (&V)
 service.gui.VIEW_HISTORY=履歴を表示 (&h)
+service.gui.VIEW_SMILEYS=ビュー＆スマイリー
 service.gui.VIEW_TOOLBAR=ツールバーを見る (&t)
+service.gui.VIEW_SIMPLE_CHAT_THEME=シンプルチャットテーマビュー
+service.gui.VOICEMAIL_NEW_URGENT_OLD_RECEIVED=新しい {0} (急ぎ {1}) と 古いメッセージ {2}
+service.gui.VOICEMAIL_NEW_URGENT_RECEIVED=新しい {0} (急ぎ {1}) と メッセージ {2}
+service.gui.VOICEMAIL_NEW_OLD_RECEIVED=新しい {0} と 古いメッセージ {1}
+service.gui.VOICEMAIL_NEW_RECEIVED={0}新しいメッセージ
+service.gui.VOICEMAIL_OLD_RECEIVED={0}前のメッセージ
 service.gui.VOICEMAIL_NO_MESSAGES=メッセージがありません
+service.gui.VOICEMAIL_TITLE=音声メッセージ
+service.gui.VOICEMAIL_TOOLTIP=から音声メッセージ
+service.gui.VOICEMAIL_TIP=メッセージを聞くにはコールボタンを押してください
+service.gui.VOICEMAIL_TIP_NO_ACCOUNT=アカウントウィザード中に ボイスメールをチェックする URI を設定してください
+service.gui.VOLUME_CONTROL_TOOL_TIP=音量を調節する
+service.gui.WAITING_AUTHORIZATION=承認待機中
 service.gui.WARNING=警告
 service.gui.YES=はい
-service.gui.YESTERDAY=昨日
-service.gui.EXISTING_ACCOUNT_ERROR=入力したアカウントが既にインストールされている。
+service.gui.NEW_GMAIL_HEADER=あなたの {0} <a href="{1}">受信箱</a>:<br/> に新しいメッセージが届いています:<br/>
+service.gui.NEW_GMAIL_MANY_HEADER=あなたの {0} <a href="{1}">受信箱</a> に {2} 通のメッセージが届いています:<br/>
+service.gui.NEW_GMAIL_FOOTER=<a href="{0}">受信箱</a> に未読の会話があります。<br/>
+service.gui.NEW_GMAIL_MANY_FOOTER=<a href="{0}">受信箱</a> に {1}つの未読の会話があります。<br/>
+service.gui.ACTIVATE=承認
+service.gui.DEACTIVATE=無効化
+service.gui.NEW=新
 service.gui.ENTER_FULL_SCREEN_TOOL_TIP=フルスクリーン
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=フルスクリーン
+service.gui.HOLD_BUTTON_TOOL_TIP=保留切り替え
+service.gui.MUTE_BUTTON_TOOL_TIP=保留を切り替えるか、マイク音量調整ボタンを押す
+service.gui.PARK=パーク保留
+service.gui.PARKING_SLOT=パーク保留枠:
+service.gui.PARK_BUTTON_TOOL_TIP=呼び出しをパーク保留
+service.gui.RECORD_BUTTON_TOOL_TIP=記録を調整する
+service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=映像を調節する
+service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=映像の表示/非表示
+service.gui.SHOW_HIDE_PEERS_TOOL_TIP=参加者リストの表示/非表示
 service.gui.TRANSFER_BUTTON_TOOL_TIP=転送電話
+service.gui.TRANSFER_TO=へ移す
 service.gui.SECURITY_INFO=セキュリティ情報
 service.gui.SECURITY_WARNING=セキュリティ警告
 service.gui.SECURITY_ERROR=セキュリティエラー
-service.gui.PHONE=電話番語:
-service.gui.PHONES=電話番語:
-
+service.gui.SPEED=スピード:
+service.gui.SILENT_MEMBER=無音の参加者
+service.gui.NON_SECURE_CONNECTION=アカウント {0} では安全を確保して接続できません。暗号化されていない接続でもよい場合は、アカウント設定で "暗号化されていない接続を許可" にチェックしてください。
+service.gui.MOBILE_PHONE=モバイル
+service.gui.VIDEO_PHONE=映像
+service.gui.WORK_PHONE=会社
+service.gui.PHONE=電話番語
+service.gui.PHONES=電話番号
+service.gui.EDIT_NOT_SUPPORTED=アカウント編集に対応していません。
+service.gui.SHOW_PREVIEW=（プレビュー表示）
+service.gui.SHOW_PREVIEW_WARNING_DESCRIPTION=このイメージを表示し続けますか？このイメージではあなたを特定することができないため、特定可能なイメージ/映像を検討してください。
+service.gui.SHOW_PREVIEW_DIALOG_TITLE=イメージ表示/映像プレビュー
+
+service.gui.ZID_NAME_SET=ZRTP識別子:
+service.gui.ZID_NAME_NOT_SET=ZRTP識別子が設定されていません。
+service.gui.ZID_NAME_BUTTON=クリックしてZRTP識別名を設定する。
+service.gui.ZID_NAME_DIALOG=ZRTP識別子を編集
+service.gui.ZID_NAME_UNEXPECTED=ZRTP識別子が見つかりません。<br>
 
 service.gui.JANUARY=1月
 service.gui.FEBRUARY=2月
@@ -472,23 +609,129 @@ service.gui.OCTOBER=10月
 service.gui.NOVEMBER=11月
 service.gui.DECEMBER=12月
 
-
-
-
+service.gui.callinfo.TECHNICAL_CALL_INFO=技術的な通話の情報
+service.gui.callinfo.CALL_INFORMATION=通話情報
+service.gui.callinfo.CALL_IDENTITY=アイデンティティ
+service.gui.callinfo.PEER_COUNT=参加者数
+service.gui.callinfo.IS_CONFERENCE_FOCUS=会議の焦点
+service.gui.callinfo.CALL_DURATION=通話時間
+service.gui.callinfo.TLS_PROTOCOL=TLS プロトコル
+service.gui.callinfo.TLS_CIPHER_SUITE=TLS 暗号化方式
+service.gui.callinfo.TLS_CERTIFICATE_CONTENT=TLSサーバー証明書の内容は下記に表示しています。
+service.gui.callinfo.VIEW_CERTIFICATE=証明書を表示
+service.gui.callinfo.CODEC=コーデック / サンプリングレート
+service.gui.callinfo.NA=該当なし
+service.gui.callinfo.VIDEO_SIZE=映像サイズ
+service.gui.callinfo.AUDIO_INFO=音声情報
+service.gui.callinfo.VIDEO_INFO=映像情報
+service.gui.callinfo.LOCAL_IP=ローカルIP / ポート
+service.gui.callinfo.REMOTE_IP=リモートIP / ポート
+service.gui.callinfo.BANDWITH=帯域
+service.gui.callinfo.LOSS_RATE=速度低下
+service.gui.callinfo.RTT=RTT
+service.gui.callinfo.JITTER=Jitter
+service.gui.callinfo.MEDIA_STREAM_TRANSPORT_PROTOCOL=メディアストリームトランスポートプロトコル
+service.gui.callinfo.MEDIA_STREAM_RTP=RTP
+service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
+service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Key exchangeプロトコル
+service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE candidate拡張型
+service.gui.callinfo.ICE_STATE=ICE 処理状態
+
+#enum values from IceProcessingState
+service.gui.callinfo.ICE_STATE.WAITING=candidatesをまとめる
+service.gui.callinfo.ICE_STATE.RUNNING=接続性確認
+service.gui.callinfo.ICE_STATE.COMPLETED=成功
+service.gui.callinfo.ICE_STATE.FAILED=失敗
+
+service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=ローカルホストIP / ポート
+service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=ローカルループバック IP/ポート
+service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=ローカル中継 IP/ポート
+service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=リモートホスト IP / ポート
+service.gui.callinfo.ICE_REMOTE_REFLEXIVE_ADDRESS=リモートループバック IP / ポート 
+service.gui.callinfo.ICE_REMOTE_RELAYED_ADDRESS=リモート中継 IP / ポート
+service.gui.callinfo.TOTAL_HARVESTING_TIME=合計集計時間
+service.gui.callinfo.HARVESTING_TIME=集計時間
+service.gui.callinfo.DISCARDED_PERCENT=パケットは現在廃棄されています。
+service.gui.callinfo.JITTER_BUFFER_DELAY=Jitterバッファー
+
+service.gui.ALWAYS_TRUST=常にこの証明書を使用する
+service.gui.CERT_DIALOG_TITLE=証明書を検証
+service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html><b>{1}</b>への接続時に {0} でサーバー証明書を<br>検証できませんでした。<br><br> 証明書が信頼されていないため、自動的にサーバー証明書を検証できません。<br><br>接続を続けますか。<br><br>"証明書を表示" をクリックして詳細を確認してください。</html>
+service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html> {0} でサーバー証明書を検証できませんでした。<br><br> 証明書が信頼されていないため、自動的にサーバー証明書を検証できません。<br><br>接続を続けますか。<br><br>"証明書を表示" をクリックして詳細を確認してください。</html>
+service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html> {0} で相手側 {1} の証明書を検証できませんでした。<br><br> 証明書が信頼されていないため、自動的にサーバー証明書を検証できません。<br><br>接続を続けますか。<br><br>"証明書を表示" をクリックして詳細を確認してください。</html>
+service.gui.CONTINUE_ANYWAY=とにかく続行する
+service.gui.CERT_INFO_CHAIN=証明書チェーン:
+service.gui.CERT_INFO_ISSUED_TO=発行先
+
+#service.gui.CERT_INFO_ are combined from Rdn names
+service.gui.CERT_INFO_CN=一般名:
+service.gui.CERT_INFO_O=団体:
+service.gui.CERT_INFO_C=国名:
+service.gui.CERT_INFO_ST=県名:
+service.gui.CERT_INFO_L=地域名:
+service.gui.CERT_INFO_ISSUED_BY=発行
+service.gui.CERT_INFO_OU=部署:
+service.gui.CERT_INFO_VALIDITY=有効性
+service.gui.CERT_INFO_ISSUED_ON=より開始
+service.gui.CERT_INFO_EXPIRES_ON=に終了
+service.gui.CERT_INFO_FINGERPRINTS=指紋
+service.gui.CERT_INFO_CERT_DETAILS=証明書情報
+service.gui.CERT_INFO_SER_NUM=シリアルNo.
+service.gui.CERT_INFO_VER=バージョン
+service.gui.CERT_INFO_SIGN_ALG=署名アルゴリズム:
+service.gui.CERT_INFO_PUB_KEY_INFO=公開鍵情報
+service.gui.CERT_INFO_ALG=アルゴリズム:
+service.gui.CERT_INFO_PUB_KEY=公開鍵
+service.gui.CERT_INFO_KEY_BITS_PRINT={0} ビット
+service.gui.CERT_INFO_EXP=エクスポーネント
+service.gui.CERT_INFO_KEY_SIZE=鍵サイズ
+service.gui.CERT_INFO_SIGN=署名
+service.gui.SHOW_CERT=証明書を表示
+service.gui.HIDE_CERT=証明書を非表示
+
+service.gui.AUTO_ANSWER=自動応答、呼び出し転送
+service.gui.AUTO_ANSWER_LABEL=自動応答
+service.gui.AUTO_ANSWER_ALL_CALLS=全ての呼び出し
+service.gui.AUTO_ANSWER_ALERT_INFO_FIELDS=必要な呼び出しのみ。("自動応答” に "Alert-Info" が含まれている場合) 
+service.gui.AUTO_ANSWER_CUSTOM_FIELDS=次の項目と値の場合の呼び出し
+service.gui.AUTO_ANSWER_FIELD=項目/ヘッダー:
+service.gui.AUTO_ANSWER_VALUE=値:
+service.gui.AUTO_ANSWER_DESCR_VLUE=全て空欄のまま
+service.gui.AUTO_ANSWER_FWD_CALLS=着信転送
+service.gui.AUTO_ANSWER_VIDEO=映像
+
+service.gui.security.SECURE_AUDIO=安全な映像
+service.gui.security.AUDIO_NOT_SECURED=音声は安全ではありません
+service.gui.security.SECURE_VIDEO=安全な映像
+service.gui.security.VIDEO_NOT_SECURED=安全でない映像です。
+service.gui.security.CALL_SECURED_TOOLTIP=通話は安全です。詳細確認はこちらをクリック。
+service.gui.security.CALL_NOT_SECURED_TOOLTIP=安全でない通話です。
 # keep the following string short
 
+service.gui.avatar.REMOVE_ICON=現在の画像を削除する
 # service.gui.avatar.imagepicker
 service.gui.avatar.imagepicker.CANCEL=キャンセル (&C)
+service.gui.avatar.imagepicker.CHOOSE_FILE=選択
+service.gui.avatar.imagepicker.CLICK=クリックとスマイル
+service.gui.avatar.imagepicker.IMAGE_FILES=イメージファイル
+service.gui.avatar.imagepicker.IMAGE_PICKER=画像
+service.gui.avatar.imagepicker.IMAGE_SIZE=画像サイズ
+service.gui.avatar.imagepicker.RESET=リセット
+service.gui.avatar.imagepicker.SET=設定
+service.gui.avatar.imagepicker.TAKE_PHOTO=写真を撮る
 
+service.gui.security.encryption.required=暗号化してください！
 
+service.protocol.ICE_FAILED=接続を確立できませんでした。(ICE失敗・リレーが見つかりません）
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
+impl.protocol.sip.XCAP_ERROR_UNAUTHORIZED=xcapで使用するユーザー名もしくはパスワードが間違っています。理由： {0}
 
 # systray
+impl.systray.SET_STATUS=ステータスを設定する
+impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=コンタクト追加ダイアログを開けません。
+impl.swingnotification.POPUP_MESSAGE_HANDLER= {0}ポップアップ
+impl.growlnotification.POPUP_MESSAGE_HANDLER=Growl notification
 
 # New Account Dialog
 impl.gui.main.account.DEFAULT_PAGE_TITLE=ネットワークを選択する
@@ -498,151 +741,401 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=ネットワークを選択す�
 # LDAP
 impl.ldap.GENERAL=一般
 impl.ldap.EDIT=編集する (&E)
-impl.ldap.REMOVE=取り除く (&R)
+impl.ldap.ENABLED=有効
+impl.ldap.SERVER_NAME=サーバー名
+impl.ldap.SERVER_NAME_EXAMPLE=LDAPサーバー
+impl.ldap.SERVER_HOSTNAME=ホスト名
+impl.ldap.USE_SSL=SSLを使用する
+impl.ldap.AUTH_NONE=使用しない
+impl.ldap.SCOPE_ONE=ひとつ
 impl.ldap.SAVE=保存 (&S)
 impl.ldap.CANCEL=キャンセル (&C)
+impl.ldap.SERVER_PORT=ポート
 impl.ldap.PASSWORD=パスワード
+impl.ldap.MAIL_FIELD_NAME=メール入力箇所
+impl.ldap.WORKPHONE_FIELD_NAME=会社の電話番号入力箇所
+impl.ldap.MOBILEPHONE_FIELD_NAME=携帯電話番号入力箇所
+impl.ldap.HOMEPHONE_FIELD_NAME=電話番号入力箇所
 impl.ldap.MAIL_FIELD_EXAMPLE=電子メール:
+impl.ldap.WORKPHONE_FIELD_EXAMPLE=会社の電話番号
+impl.ldap.MOBILEPHONE_FIELD_EXAMPLE=携帯電話番号
+impl.ldap.HOMEPHONE_FIELD_EXAMPLE=電話番号
+
+# SIP Protocol
+
+#Jabber Protocol
 
 # Address book plugin
+plugin.addrbook.ADDRESS_BOOKS=アドレス帳
 
 # Google Contacts
 impl.googlecontacts.EDIT=編集する (&E)
-impl.googlecontacts.REMOVE=取り除く (&R)
+impl.googlecontacts.ENABLED=有効
 impl.googlecontacts.SAVE=保存 (&S)
 impl.googlecontacts.CANCEL=キャンセル (&C)
 impl.googlecontacts.PASSWORD=パスワード
 
 # account info
+plugin.accountinfo.TITLE=アカウント情報
 plugin.accountinfo.DISPLAY_NAME=表示名
 plugin.accountinfo.FIRST_NAME=名前:
 plugin.accountinfo.MIDDLE_NAME=ミドルネーム:
 plugin.accountinfo.LAST_NAME=姓:
+plugin.accountinfo.NICKNAME=ニックネーム
 plugin.accountinfo.AGE=年齢:
 plugin.accountinfo.BDAY=誕生日:
 plugin.accountinfo.GENDER=性:
 plugin.accountinfo.CITY=市(区町村)
+plugin.accountinfo.POST=郵便番号
 plugin.accountinfo.COUNTRY=国
 plugin.accountinfo.EMAIL=電子メール:
+plugin.accountinfo.WORK_EMAIL=メールアドレス（会社）:
 plugin.accountinfo.PHONE=電話番語:
+plugin.accountinfo.WORK_PHONE=電話番号（会社）:
+plugin.accountinfo.MOBILE_PHONE=電話番号（携帯）:
 plugin.accountinfo.JOB_TITLE=肩書き
+plugin.accountinfo.ABOUT_ME=わたしについて:
 
 # connection info
+plugin.connectioninfo.TITLE=接続情報
 
 # contact info
+plugin.contactinfo.TITLE=コンタクト詳細
+plugin.contactinfo.USER_PICTURES=ユーザーの写真
+plugin.contactinfo.USER_STATUS_MESSAGE=メッセージステータス
 
 # aimaccregwizz
+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=ユーザー名とパスワード
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE={0}について
 plugin.branding.ABOUT_MENU_ENTRY=バージョン情報 (&A)
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
+plugin.generalconfig.AUTO_START=コンピュータ起動時に {0} を起動
+plugin.generalconfig.GROUP_CHAT_MESSAGES=グループチャットメッセージを1つの画面で表示
+plugin.generalconfig.LOG_HISTORY=チャット履歴のログ
+plugin.generalconfig.SHOW_HISTORY=表示
+plugin.generalconfig.HISTORY_SIZE=新しいチャットの現在のメッセージ
+plugin.generalconfig.SEND_MESSAGES_WITH=メッセージを送付する先:
+plugin.generalconfig.BRING_WINDOW_TO_FRONT=チャットウインドウを手前に持ってくる
+plugin.generalconfig.DEFAULT_LANGUAGE=言語設定
+plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=変更は次回の起動時に有効になります
+plugin.generalconfig.ERROR_PORT_NUMBER=誤ったポートNo.
+plugin.generalconfig.CHECK_FOR_UPDATES=起動時に更新を確認
+plugin.generalconfig.LEAVE_CHATROOM_ON_WINDOW_CLOSE=ウインドウを閉じたときにチャットルームを抜ける
+plugin.generalconfig.SHOW_RECENT_MESSAGES=最近の会話を表示する（チャット履歴による）
+plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=電話番号を呼び出す前に、特殊記号を削除
+plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=電話番号の文字を変換
+plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=サンプリングレート
 
 # gibberish accregwizz
+plugin.gibberishaccregwizz.USERNAME=ユーザーID
 
 # icqaccregwizz
 
 # irc accregwizz
+plugin.ircaccregwizz.PROTOCOL_NAME=IRC
+plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRCプロトコル
+plugin.ircaccregwizz.USERNAME_AND_PASSWORD=IDとパスワード
+plugin.ircaccregwizz.USERNAME=ニックネーム
+plugin.ircaccregwizz.HOST=ホスト名
+plugin.ircaccregwizz.IRC_SERVER=サーバー
+plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=連絡先のプレゼンスを有効にします
+plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=チャットルームでのプレゼンスを有効にします
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} 認証
+plugin.ircaccregwizz.ENABLE_SASL_AUTHENTICATION=SASL認証を有効にします
+plugin.ircaccregwizz.SASL_USERNAME=ユーザー名
 
 # jabber accregwizz
-
-# mailbox
-plugin.mailbox.CONFIRM=確認
-
-# msn accregwizz
-plugin.msnaccregwizz.USERNAME=電子メール:
+plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
+plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=XMPPプロトコル
+plugin.jabberaccregwizz.USERNAME=XMPP名
+plugin.jabberaccregwizz.PASSWORD_CONFIRM=パスワードを確認
+plugin.jabberaccregwizz.CSERVER=サーバー
+plugin.jabberaccregwizz.SERVER=サーバーへ接続する
+plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=キープアライブ可能
+plugin.jabberaccregwizz.ENABLE_GMAIL_NOTIFICATIONS=Gmailの新しいメッセージの通知を有効
+plugin.jabberaccregwizz.ENABLE_GOOGLE_CONTACTS_SOURCE=Googleの連絡先の検索を有効にします
+plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=フリーSIPアカウントを作成する
+plugin.jabberaccregwizz.SERVER_COLUMN=サーバー
+plugin.jabberaccregwizz.COMMENT_COLUMN=コメント
+plugin.jabberaccregwizz.RESOURCE=リソース
+plugin.jabberaccregwizz.PRIORITY=優先度
+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=未確認のXMPPエラー({0}).サーバー名が正しいか確認してください。
+plugin.jabberaccregwizz.NOT_SAME_PASSWORD=パスワードが一致しません。
+plugin.jabberaccregwizz.USE_ICE=ICEを使用する
+plugin.jabberaccregwizz.SUPPORT_TURN=TURN対応
+plugin.jabberaccregwizz.TURN_USERNAME=TURNのサーバー名
+plugin.jabberaccregwizz.IP_ADDRESS=IPアドレス
+plugin.jabberaccregwizz.ADD_STUN_SERVER=STUNサーバーを追加する
+plugin.jabberaccregwizz.EDIT_STUN_SERVER=STUNサーバーを編集する
+plugin.jabberaccregwizz.ADDITIONAL_STUN_SERVERS=別のSTUNサーバー
+plugin.jabberaccregwizz.NO_STUN_ADDRESS=続けるには有効なSTUNサーバーアドレスを埋めてください。
+plugin.jabberaccregwizz.NO_STUN_USERNAME=続けるには有効なSTUNサーバーのユーザー名を埋めてください。
+plugin.jabberaccregwizz.STUN_ALREADY_EXIST=指定されたSTUNサーバーは既に存在します。
+plugin.jabberaccregwizz.JID_ADDRESS=IPアドレス
+plugin.jabberaccregwizz.SERVER_OPTIONS=サーバーオプション
+plugin.jabberaccregwizz.PORT_FIELD_INVALID=続けるには有効なポートNo.を埋めてください。
+plugin.jabberaccregwizz.TLS_REQUIRED=この接続はパスワードを変更しないTLSを使用しません。
+plugin.jabberaccregwizz.PASSWORD_CHANGED=パスワードは正常に変更されました。
+plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=そのXMPPサーバーはパスワード変更に対応していません。
+plugin.jabberaccregwizz.ENTER_NEW_PASSWORD=全てに新しいパスワードを入力してください:
+plugin.jabberaccregwizz.ENCODINGS=エンコーディング
+plugin.jabberaccregwizz.AUDIO=音声
+plugin.jabberaccregwizz.VIDEO=映像
+plugin.jabberaccregwizz.RESET=リセット
 
 # plugin manager
+plugin.pluginmanager.INSTALL=インストール
+plugin.pluginmanager.PLUGINS=プラグイン
+plugin.pluginmanager.URL=URL
+plugin.pluginmanager.CHOOSE_FILE=選択したファイル
+plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=プラグインを表示
+plugin.pluginmanager.SYSTEM=システム
+plugin.pluginmanager.NEW=新
 
 # simple accregwizz
+plugin.simpleaccregwizz.LOGIN_USERNAME=ユーザー名
+plugin.simpleaccregwizz.SIGNUP=登録はお済みですか？
+plugin.simpleaccregwizz.SPECIAL_SIGNUP=登録はお済みですか？登録はこちらをクリック
 
 # sipaccregwizz
+plugin.sipaccregwizz.PROTOCOL_NAME=SIP
+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=SIPプロトコル
+plugin.sipaccregwizz.USERNAME=SIP id
+plugin.sipaccregwizz.USERNAME_AND_PASSWORD=ユーザー名とパスワード
+plugin.sipaccregwizz.CLIENT_CERTIFICATE=クライアントTLS証明書
+plugin.sipaccregwizz.REGISTRAR=登録
+plugin.sipaccregwizz.SERVER_PORT=サーバーポート
+plugin.sipaccregwizz.PROXY=プロキシ
+plugin.sipaccregwizz.PROXY_PORT=プロキシポート
+plugin.sipaccregwizz.PROXY_OPTIONS=プロキシオプション
+plugin.sipaccregwizz.ENABLE_PRESENCE=プレゼンスを有効にします(SIMPLE)
+plugin.sipaccregwizz.KEEP_ALIVE=キープアライブ機能
+plugin.sipaccregwizz.KEEP_ALIVE_METHOD=キープアライブメソッド
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=キープアライブの間隔
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=1〜3600秒の間
+plugin.sipaccregwizz.DTMF=DTMF
+plugin.sipaccregwizz.DTMF_METHOD=DTMFメソッド
+plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
+plugin.sipaccregwizz.DTMF_SIP_INFO=SIP情報
+plugin.sipaccregwizz.DTMF_INBAND=インバンド通信
+plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=通話を暗号化するためのサポートを有効にします
+plugin.sipaccregwizz.AUTH_NAME=承認名
 plugin.sipaccregwizz.DISPLAY_NAME=表示名
+plugin.sipaccregwizz.CREATE_ACCOUNT=フリーSIPアカウントを作成する
+plugin.sipaccregwizz.CREATE_ACCOUNT_TITLE=アカウントを作成する
+plugin.sipaccregwizz.XCAP_OPTIONS=コンタクトリストのオプション
+plugin.sipaccregwizz.XCAP_USER=ユーザー
 plugin.sipaccregwizz.XCAP_PASSWORD=パスワード
+plugin.sipaccregwizz.VOICEMAIL=ボイスメール
+plugin.sipaccregwizz.NOT_SAME_PASSWORD=パスワードが一致しません
+#used from SecurityPanel
+plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=有効な暗号化プロトコルとその優先度（上のプロトコルが優先）を選択：
+plugin.sipaccregwizz.CIPHER_SUITES=有効な暗号セット：
+plugin.sipaccregwizz.ZRTP_OPTION=ZRTPオプション
 
 # skin manager
 
-# ssh accregwizz
-plugin.sshaccregwizz.OPTIONAL=オプション
-
 # status update
+plugin.autoaway.ENABLE_CHANGE_STATUS=離席した時に状態を変更
+plugin.autoaway.AWAY_MINUTES=離席中と表示されるまでの時間(分):
 
 # updatechecker
+plugin.updatechecker.DIALOG_TITLE=アップデートする
+plugin.updatechecker.BUTTON_DOWNLOAD=ダウンロード
 plugin.updatechecker.BUTTON_CLOSE=閉じる (&o)
+plugin.updatechecker.BUTTON_INSTALL=インストール
+plugin.updatechecker.UPDATE_MENU_ENTRY=アップデートを確認
+plugin.updatechecker.DIALOG_NOUPDATE_TITLE=新しいバージョンはありません。
 
 # usersearch
+plugin.usersearch.USER_SEARCH=ユーザー検索
 
 # whiteboard
+plugin.whiteboard.TITLE=ホワイトボード[β版]
+plugin.whiteboard.MENU_ITEM=ホワイトボード
+plugin.whiteboard.NOT_SUPPORTED=ホワイトボードに対応していません。
+plugin.whiteboard.OPEN=開く
+plugin.whiteboard.SELECT=選択
+plugin.whiteboard.IMAGE=画像
+plugin.whiteboard.POLYGON=ポリゴン
+plugin.whiteboard.FILLEDPOLYGON=ポリゴン失敗
 plugin.whiteboard.COLOR=色
 plugin.whiteboard.MODIFICATION=通知
+plugin.whiteboard.GRID=グリッド
 plugin.whiteboard.DELETE=削除する
 
-# yahoo accregwizz
-
-# zero accregwizz
-plugin.zeroaccregwizz.FIRST_NAME=名前:
-plugin.zeroaccregwizz.LAST_NAME=姓:
-plugin.zeroaccregwizz.EMAIL=電子メール:
-
 # gtalk accregwizz
 
 # iptel accregwizz
-
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=このサービスについては、<br>http://wiki.sip2sip.info を見てください。
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>このサービスについては、<a href=''>http://wiki.sip2sip.info</a>を見てください</html>
+plugin.iptelaccregwizz.USERNAME=ユーザー名
 
 # ippi accregwizz
+plugin.sip2sipaccregwizz.USERNAME=ユーザー名
+plugin.sip2sipaccregwizz.RETYPE_PASSWORD=パスワードを再度入力してください
+plugin.sip2sipaccregwizz.EMAIL=メールアドレス
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=このサービスについては、<br>http://ippi.fr を見てください。
 plugin.ippiaccregwizz.INFO_NOTE=<html>このサービスについては、 <a href=''>http://ippi.fr</a>を見てください</html>
+plugin.ippiaccregwizz.CREATE_ACCOUNT=フリーSIPアカウントを作成する
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+plugin.keybindings.CHAT_CLOSE=チャットウインドウを閉じる
 plugin.keybindings.CHAT_COPY=コピーする (&C)
 plugin.keybindings.CHAT_CUT=カット (&u)
+plugin.keybindings.CHAT_OPEN_HISTORY=履歴を開く
+plugin.keybindings.CHAT_OPEN_SMILIES=スマイリーを開く
 plugin.keybindings.CHAT_PASTE=貼付け (&P)
 plugin.keybindings.MAIN_RENAME=コンタクトの名前を変更 (&n)
+plugin.keybindings.OPEN_HISTORY=履歴表示
+plugin.keybindings.OPEN_SMILIES=スマイリー表示
+plugin.keybindings.globalchooser.ANSWER_CALL=応答する
+plugin.keybindings.globalchooser.HANGUP_CALL=通話終了
+plugin.keybindings.globalchooser.ANSWER_HANGUP_CALL=応答/終了
+plugin.keybindings.globalchooser.SHOW_CONTACTLIST=コンタクトリスト表示
+plugin.keybindings.globalchooser.MUTE_CALLS=消音
+plugin.keybindings.globalchooser.SHORTCUT_NAME=名前
+plugin.keybindings.globalchooser.ENABLE_SPECIAL=特殊キーの検出を有効にします
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=チャット
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=有効
+plugin.notificationconfig.TURN_ON_ALL=全て有効にする
+plugin.notificationconfig.TURN_OFF_ALL=全て無効にする
+plugin.notificationconfig.POPUP_NOTIF_HANDLER=ポップアップ通知の種類
+plugin.notificationconfig.SOUND_FILE=次のファイル:
+plugin.notificationconfig.PROGRAM_FILE=プログラムファイル:
+plugin.notificationconfig.tableheader.ENABLE=この機能を有効・無効にする
+plugin.notificationconfig.tableheader.POPUP=メッセージボックスを表示する
+#NotificationsTable constants
+plugin.notificationconfig.event.IncomingCall=着信中です
+plugin.notificationconfig.event.IncomingFile=着信中です
+plugin.notificationconfig.event.Dialing=ダイヤル中
+plugin.notificationconfig.event.BusyCall=話し中
 plugin.notificationconfig.event.HangUp=切断
+plugin.notificationconfig.event.DTMFTone.A=DTMFトーンA
+plugin.notificationconfig.event.DTMFTone.B=DTMFトーンB
+plugin.notificationconfig.event.DTMFTone.C=DTMFトーンC
+plugin.notificationconfig.event.DTMFTone.D=DTMFトーンD
+plugin.notificationconfig.event.DTMFTone.0=DTMFトーン0
+plugin.notificationconfig.event.DTMFTone.1=DTMFトーン1
+plugin.notificationconfig.event.DTMFTone.2=DTMFトーン2
+plugin.notificationconfig.event.DTMFTone.3=DTMFトーン3
+plugin.notificationconfig.event.DTMFTone.4=DTMFトーン4
+plugin.notificationconfig.event.DTMFTone.5=DTMFトーン5
+plugin.notificationconfig.event.DTMFTone.6=DTMFトーン6
+plugin.notificationconfig.event.DTMFTone.7=DTMFトーン7
+plugin.notificationconfig.event.DTMFTone.8=DTMFトーン8
+plugin.notificationconfig.event.DTMFTone.9=DTMFトーン9
+plugin.notificationconfig.event.DTMFTone.*=DTMFトーン*
+plugin.notificationconfig.event.DTMFTone.#=DTMFトーン＃
+plugin.notificationconfig.event.NewSelectedDevice=新たに選択された機器
 
 # ZRTP Securing
 
 # ZRTP Configuration
 impl.media.security.zrtp.TITLE=コール
+impl.media.security.zrtp.PUB_KEYS=公開鍵
+impl.media.security.zrtp.HASHES=ハッシュ
+impl.media.security.zrtp.SAS_TYPES=SASタイプ
+impl.media.security.zrtp.STANDARD=標準
+impl.media.security.zrtp.ZRTP_NINJA=ZRTP Ninja
 
 
 
 # Profiler4J
 
+impl.media.configform.AUDIO=オーディオ機器(&A):
+impl.media.configform.AUDIO_IN=マイク入力(&I):
 impl.media.configform.AUDIO_NOTIFY=通知
-
-
+impl.media.configform.AUDIO_OUT=スピーカー出力(&O):
+impl.media.configform.AUTOMATICGAINCONTROL=自動マイク調整
+impl.media.configform.DENOISE=ノイズ抑制を有効にする
+impl.media.configform.DEVICES=端末
+impl.media.configform.ECHOCANCEL=エコーキャンセレーションを有効にする
+impl.media.configform.ENCODINGS=エンコーディング
+impl.media.configform.NO_AVAILABLE_AUDIO_DEVICE=音声用機器がありません。何か接続してください。
+impl.media.configform.NO_PREVIEW=プレビュー
+impl.media.configform.VIDEO_MORE_SETTINGS=セッティング詳細
+impl.media.configform.VIDEO_RESOLUTION=映像の解像度
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_IN=マイク用に新しい機器が選択されました:
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_OUT=スピーカー用の新しい機器が選択されました:
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_NOTIFICATIONS=通知用の新しい機器が選択されました:
+impl.media.configform.VIDEO_DEVICE_SELECTED=ビデオ用の新しい機器が選択されました:
+
+impl.neomedia.configform.AUDIO=オーディオ
+impl.neomedia.configform.VIDEO=映像
+
+#in JNIEncoder
+impl.neomedia.configform.H264.defaultProfile.high=高い
+impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTCP
+impl.neomedia.configform.H264.preferredKeyFrameRequester.signaling=シグナリング
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
+plugin.callrecordingconfig.CALL_RECORDING_CONFIG=通話を記録する
+plugin.callrecordingconfig.CALL_SAVED=通話の保存に成功
 
 # Security configuration form title
+plugin.securityconfig.TITLE=セキュリティ
 plugin.securityconfig.masterpassword.TITLE=パスワード
+plugin.securityconfig.masterpassword.SAVED_PASSWORDS=パスワードを保存しました
+plugin.securityconfig.masterpassword.CURRENT_PASSWORD=現在のパスワード
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=パスワードを記録する
+plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=パスワードが一致しません。やり直してください。
+plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=パスワード変更に失敗しました
+plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS_MSG=マスターパスワードを正常に削除しました。
+plugin.securityconfig.masterpassword.MP_REMOVE_SUCCESS_MSG=マスターパスワードを正常に削除しました。
+plugin.securityconfig.masterpassword.COL_NAME=名前
 plugin.securityconfig.masterpassword.COL_PASSWORD=パスワード
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=取り除く (&R)
+plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=保存されたパスワード
+plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=全削除
+plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=本当に全てのパスワードを削除して宜しいですか？
+plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=全パスワードを削除
+plugin.securityconfig.masterpassword.SHOW_PASSWORDS_BUTTON=パスワードを表示する
+plugin.securityconfig.masterpassword.HIDE_PASSWORDS_BUTTON=パスワードを隠す
 
 # otr plugin
+plugin.otr.menu.TITLE=安全性の高いチャット
+plugin.otr.menu.CB_ENABLE=プライベートメッセージを有効にする
+plugin.otr.menu.CB_REQUIRE=プライベートメッセージを有効にする
+plugin.otr.menu.CB_RESET=リセット
+plugin.otr.menu.OTR_TOOLTIP=OTRで暗号化されたチャット
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD=どのように認証しますか？
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_QUESTION=認証の質問
 plugin.otr.authbuddydialog.CANCEL=キャンセル (&C)
 plugin.otr.authbuddydialog.HELP=ヘルプ (&H)
+plugin.otr.authbuddydialog.I_HAVE=あります
+plugin.otr.authbuddydialog.I_HAVE_NOT=ありません
+plugin.otr.smpprogressdialog.AUTHENTICATION_SUCCESS=認証成功！
+plugin.otr.smpprogressdialog.AUTHENTICATION_FAIL=認証に失敗しました。
+plugin.otr.configform.CB_ENABLE=プライベートメッセージを有効にする
+plugin.otr.configform.CB_REQUIRE=プライベートメッセージを有効にする
 plugin.otr.configform.GENERATE=生成
 plugin.otr.configform.REGENERATE=再生成
+plugin.otr.configform.FINGERPRINT=指紋
+plugin.otr.configform.VERIFY_FINGERPRINT=指紋認証
+plugin.otr.configform.FORGET_FINGERPRINT=指紋を忘れました
 plugin.otr.configform.COLUMN_NAME_CONTACT=問い合わせ
+plugin.otr.configform.COLUMN_NAME_VERIFIED_STATUS=証明
 plugin.otr.configform.COLUMN_VALUE_VERIFIED_TRUE=はい
 plugin.otr.configform.COLUMN_VALUE_VERIFIED_FALSE=いいえ
+plugin.otr.activator.unencryptedmsgreceived=メッセージ暗号化されずに受け取られました。
+plugin.otr.activator.requireencryption=メッセージ [{0}]は送信されませんでした。プライベートメッセージの送信が要求されました。
 
 # global proxy plugin
+plugin.globalproxy.GLOBAL_PROXY_CONFIG=グローバルプロキシ
+plugin.globalproxy.PROXY_TYPE=プロキシタイプ
+plugin.globalproxy.PROXY_ADDRESS=プロキシサーバー
+plugin.globalproxy.PROXY_PORT=プロキシポート
+plugin.globalproxy.PROXY_USERNAME=プロキシ名
+plugin.globalproxy.PROXY_PASSWORD=プロキシパスワード
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -652,25 +1145,39 @@ plugin.reconnectplugin.CONNECTION_FAILED_MSG=次のアカウントで接続に�
 #plugin chat config
 
 plugin.chatconfig.TITLE=チャット
+plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=絵文字置換を有効にする
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=有効
 
 #provisioning plugin
+plugin.provisioning.ENABLE_DISABLE=プロビジョニングを有効にする
 
 # packet logging service
+plugin.loggingutils.ENABLE_DISABLE=パケットのログ記録を有効にする
+plugin.loggingutils.PACKET_LOGGING_RTP=RTP
 
 # dns config plugin
+plugin.dnsconfig.chkBackupDnsEnabled.text=DNS正引きの並列化を有効にする
+plugin.dnsconfig.lblBackupResolver.text=ホスト名
+plugin.dnsconfig.lblBackupPort.text=ポート
+plugin.dnsconfig.dnssec.chkEnabled=DNSSEC正引きを有効にする
+plugin.dnsconfig.dnssec.ENABLE_FAILED_MSG=DNSSECを使用可能な状態に変更できませんでした。
 net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=無視する (&I)
 net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=拒否(&D)
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=編集する (&E)
+plugin.spellcheck.ENABLE_SPELL_CHECK=スペルチェックを有効にする
+plugin.spellcheck.DICT_ERROR_TITLE=辞書切り替えエラー
 
 
 #Certificate configuration plugin
 plugin.certconfig.KEYSTORE=ファイル (&F)
 plugin.certconfig.KEYSTORE_PASSWORD=パスワード
+plugin.certconfig.REVOCATION_CHECK_ENABLED=CRL (証明書排除リスト) チェックが有効
+plugin.certconfig.REVOCATION_OCSP_ENABLED=OCSP (オンライン証明書ステータスプロトコル) チェックが有効
 
 # Phone number contact source plugin
 
 # properties editor
 
 #Thunderbird address book plugin
+plugin.thunderbird.ENABLED=有効
diff --git a/resources/languages/resources_lt.properties b/resources/languages/resources_lt.properties
index 188d04a..2685111 100644
--- a/resources/languages/resources_lt.properties
+++ b/resources/languages/resources_lt.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -25,46 +36,39 @@
 # from your system's language, pass the language code to ant:
 # ant -Duser.language=xx run
 
-service.gui.ABOUT=Apie
-service.gui.ACCEPT=Sutinku
+service.gui.ABOUT=&Apie
+service.gui.ACCEPT=&Priimti
 service.gui.ACCOUNT=Paskyra
 service.gui.ACCOUNT_ME=Aš
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Paskyros registravimo vedlys
 service.gui.ACCOUNTS=Paskyros
-service.gui.ADD=Pridėti
-service.gui.ADD_ACCOUNT=Pridėti paskyrą
-service.gui.ADD_CONTACT=Pridėti kontaktą
-service.gui.ADD_CONTACT_TO=Pridėti kontaktą į
+service.gui.ADD=&Pridėti
+service.gui.ADD_CONTACT=&Pridėti kontaktą
+service.gui.ADD_CONTACT_TO=&Pridėti kontaktą į
 service.gui.ADD_CONTACT_ERROR=Nepavyko pridėti kontakto, kurio id: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Klaida pridedant kontaktą
-service.gui.ADD_CONTACT_EXIST_ERROR=Kontaktas ''{0}'' jau yra jūsų kontaktų sąraše.
-service.gui.ADD_CONTACT_IDENTIFIER=Žemiau esančiame lauke įveskite kontakto, kurį norite pridėti, identifikatorių.
-service.gui.ADD_CONTACT_WIZARD=Kontakto pridėjimo vedlys.
+service.gui.ADD_CONTACT_EXIST_ERROR=Kontaktas {0} jau yra jūsų kontaktų sąraše.
 service.gui.ADD_GROUP_LOCAL_ERROR=Nepavyko pridėti grupės: {0}. Įvyko vietinė įvesties/išvesties klaida.
-service.gui.ADD_GROUP_EXIST_ERROR={0} jau yra jūsų kontaktų sąraše. Pasirinkite kitą pavadinimą.
-service.gui.ADD_GROUP_NET_ERROR=Nepavyko pridėti grupės: {0}. Įvyko tinklo klaida. Patikrinkite savo tinklo jungtį ir pabandykite iš naujo.
+service.gui.ADD_GROUP_EXIST_ERROR=Grupė {0} jau yra jūsų kontaktų sąraše. Pasirinkite kitą pavadinimą.
+service.gui.ADD_GROUP_NET_ERROR=Nepavyko pridėti grupės: {0}. Įvyko tinklo klaida. Patikrinkite savo tinklo ryšį ir bandykite dar kartą.
 service.gui.ADD_GROUP_ERROR=Nepavyko pridėti grupės: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Grupės pavadinimas negali būti tuščias.
-service.gui.ADD_GROUP=Sukurti grupę
-service.gui.ADD_SUBCONTACT=Pridėti kontaktą kontakte
 service.gui.ADMINISTRATOR=administratorius
 service.gui.ADVANCED=papildomi nustatymai
-service.gui.ALL=Visi
-service.gui.ALL_CONTACTS=Visi kontaktai
-service.gui.APPLY=Taikyti
+service.gui.ALL_CONTACTS=&Visi kontaktai
+service.gui.APPLY=&Taikyti
 service.gui.ARE_CALLING=skambina...
 service.gui.ARE_NOW=Jūs dabar esate {0}
 service.gui.AT=prie
 service.gui.AUTHORIZATION_ACCEPTED=kontaktas priėmė jūsų kvietimą.
 service.gui.AUTHENTICATION_FAILED=Autentifikacija nepavyko. Įvestas neteisingas slaptažodis.
-service.gui.AUTHENTICATION_REQUESTED=Reikalinga autentifikacija
-service.gui.AUTHENTICATION_REQUESTED_SERVER=Serveris {0} paprašė jūsų autentifikacijos
+service.gui.AUTHENTICATION_REQUESTED_SERVER=Serveris {0} paprašė jūsų nustatyti tapatybę.
 service.gui.AUTHENTICATION_REJECTED=kontaktas atmetė jūsų kvietimą.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} kvietimas
 service.gui.AUTHORIZATION_REQUESTED=Reikalingas kvietimo priėmimas.
 service.gui.AUTHORIZATION_REQUESTED_INFO=Kontaktas {0} prašo jūsų sutikimo.
 service.gui.AUTHORIZATION_RESPONSE=Sutikimo atsakymas
-service.gui.AWAY_STATUS=Išėjęs
+service.gui.AWAY_STATUS=Pasišalinęs
 service.gui.BAN=&Uždrausti
 service.gui.BAN_FAILED=Uždraudimas nepavyko
 service.gui.BAN_FAILED_GENERAL_ERROR={0} Uždraudimas nepavyko. Įvyko serverio klaida.
@@ -96,12 +100,10 @@ service.gui.CHAT_ROOM_USER_KICKED=buvo išmestas iš {0}
 service.gui.CHAT_ROOM_USER_QUIT=išėjo iš {0}
 service.gui.CHAT_ROOM_NAME=Pokalbių kambario pavadinimas
 service.gui.ROOM_NAME=Pakalbių Kambarys
-service.gui.AUTOJOIN=Automatinis prisijungimas
 service.gui.CHAT_ROOM_NAME_INFO=Žemiau esančiame lauke įveskite kuriamo pokalbių kambario pavadinimą.
 service.gui.CHAT_ROOM_NOT_EXIST={0} kambarys nerastas {1} serveryje. Prašau patikrinti ar teisingai įvedėte pavadinimą.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Jūs turite būti užsiregistravęs, jei norite prisijungti prie {0} pokalbių kambario.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Jūs turite būti užsiregistravęs, jei norite palikti pokalbių kambarį.
-service.gui.CHAT_ROOM_NOT_JOINED=Turite būti prisijungęs prie pokalbių kambario, jei norite atlikti tolimesnius veiksmus su juo.
 service.gui.CHAT_ROOM_OPTIONS=Pokalbių kambario nustatymai
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Norint prisijungti prie {0} pokalbių kambario reikalinga registracija.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD={0} pokalbių kambarys reikalauja slaptažodžio.
@@ -115,9 +117,7 @@ service.gui.CONNECTING=Jungiamasi...
 service.gui.CONNECTING_STATUS=Jungtis
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Jungiamasi...
 service.gui.CONNECTION=Jungtis
-service.gui.CONNECTION_FAILED_MSG=Įvyko klaida bandant prisijungti šiai paskyrai: Vartotojo vardas: {0}, Serverio vardas: {1}. Patikrinkite savo tinklo jungtį arba susisiekite su tinklo administratoriumi.
 service.gui.CONNECTION_EXPIRED_MSG=Jūs esate atsijungęs nuo {0} serverio.
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Pasirinktas kontaktas nepalaiko telefoninių pokalbių.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Pasirinktas kontaktas nepalaiko konferenciniu pokalbių kambarių.
 service.gui.CONTACT_PAUSED_TYPING={0} stabtelėjo rašant žinutę
 service.gui.CONTACT_TYPING={0} rašo žinutę
@@ -130,23 +130,25 @@ service.gui.CREATE_CHAT_ROOM=&Sukurti pokalbių kambarį...
 service.gui.CREATE_CHAT_ROOM_ERROR=Nepavyko sukurti {0} pokalbių kambario.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Pokalbių kambario kūrimo vedlys
 service.gui.CREATE_CONFERENCE_CALL=&Pradėti konferencinį skambutį...
-service.gui.CREATE_CONFERENCE_CHAT=&Pradėti konferencinį pokalbių kambarį...
 service.gui.CREATE_GROUP=&Sukurti grupę...
 service.gui.CREATE_GROUP_NAME=Žemiau esančiame lauke įveskite kuriamos grupės pavadinimą.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Jūsų kontaktų sąraše nėra jokių grupių. Pirma sukurkite grupę (Failas/Sukurti grupę).
 service.gui.FAILED_STATUS=Skambutis nepavyko
 service.gui.IS_CALLING=skambina...
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Uždaryti
 service.gui.KICK_FAILED_GENERAL_ERROR={0} Uždraudimas nepavyko. Įvyko serverio klaida.
 service.gui.KICK_FAILED_NOT_ALLOWED={0} Uždraudimas nepavyko. Kambario savininkas ir administratorius negali būti uždraustas.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS={0} Uždraudimas nepavyko. Jūs neturite reikalingų teisių.
+service.gui.chat.role.ADMINISTRATOR=administratorius
+
 
 
 
+#enum values from IceProcessingState
 
 
 
-service.gui.security.COMPARE_WITH_PARTNER=Palyginkite su partneriu ir paspauskite ant užrakto patvirtinimui.
+#service.gui.CERT_INFO_ are combined from Rdn names
+
+
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Palyginkite su parnteriu: {0}
 
@@ -155,9 +157,6 @@ service.gui.avatar.imagepicker.CANCEL=&Panaikinti
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -167,6 +166,10 @@ service.gui.avatar.imagepicker.CANCEL=&Panaikinti
 # LDAP
 impl.ldap.CANCEL=&Panaikinti
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -183,9 +186,6 @@ impl.googlecontacts.CANCEL=&Panaikinti
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=Apie
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -194,23 +194,19 @@ plugin.branding.ABOUT_MENU_ENTRY=Apie
 # icqaccregwizz
 
 # irc accregwizz
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} kvietimas
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -220,23 +216,20 @@ plugin.updatechecker.BUTTON_CLOSE=Uždaryti
 
 # whiteboard
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=&Kopijuoti
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Pokalbis
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -249,6 +242,7 @@ impl.media.security.zrtp.TITLE=Skambinti
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
diff --git a/resources/languages/resources_lv.properties b/resources/languages/resources_lv.properties
index df516a6..df76ce1 100644
--- a/resources/languages/resources_lv.properties
+++ b/resources/languages/resources_lv.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Es
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Konta reģistrācijas vednis
 service.gui.ACCOUNTS=Konti
 service.gui.ADD=&Pievienot
-service.gui.ADD_ACCOUNT=Pievienot kontu
 service.gui.ADD_CONTACT=&Pievienot kontaktu
 service.gui.ADD_AUTHORIZED_CONTACT=Pievienot kontaktu {0} jūsu kontaktu sarakstam
 service.gui.ADD_CONTACT_TO=&Pievienot kontaktu
@@ -41,26 +51,20 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Kontaktu pievienošanas kļūda
 service.gui.ADD_CONTACT_EXIST_ERROR=Persona {0} jau eksistē jūsu kontaktu sarakstā.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Serveris neatbildēja uz personas pievienošanas pieprasījumu ar id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Neizdevās pievienot kontaktu ar id: {0}. Operācija netiek atbalstīta.
-service.gui.ADD_CONTACT_IDENTIFIER=Lauciņā zemāk ievadiet pievienojamā kontakta identifikatoru. 
-service.gui.ADD_CONTACT_WIZARD=Kontakta pievienošanas vednis
 service.gui.ADD_CONTACT_NOT_CONNECTED=Lai pievienotu kontaktu jābūt izveidotam savienojumam. Lūdzu pieslēdzaties izvēlētajam provaiderim un mēģiniet vēl.
 service.gui.ADD_GROUP_LOCAL_ERROR=Neizdevās pievienot grupu ar nosaukumu: {0}. Gadijās kļūme IO operācijas laikā.
 service.gui.ADD_GROUP_EXIST_ERROR=Grupa {0} jau eksistē jūsu kontaktu sarakstā. Lūdzu izvēlaties citu nosaukumu.
 service.gui.ADD_GROUP_NET_ERROR=Neizdevās pievienot grupu ar nosaukumu: {0}. Gadijās tīkla problēma. Lūdzu pārbaudiet tīkla savienojumu un atkārtojiet darbību.
 service.gui.ADD_GROUP_ERROR=Neizdevās pievienot grupu ar nosaukumu: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Jānorāda grupas nosaukums
-service.gui.ADD_GROUP=Izveidot grupu
-service.gui.ADD_SUBCONTACT=&Pievienot apakškontaktu
 service.gui.ADMINISTRATOR=administrators
 service.gui.ADVANCED=&Papildus
-service.gui.ALL=&Visi
 service.gui.ALL_CONTACTS=&Visi kontakti
 service.gui.APPLY=&Pielietot
 service.gui.ARE_NOW=Jūs esat {0}
 service.gui.AT=uz
 service.gui.AUTHORIZE=&Autorizēt
 service.gui.AUTHENTICATION_FAILED=Autentifikācija neizdevās {0}. Ievadītā parole nebija derīga.
-service.gui.AUTHENTICATION_REQUESTED=Pieprasīta autentifikācija
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Serveris {0} pieprasīja autentifikāciju.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autentifikācija
 service.gui.AUTHORIZATION_REQUESTED=Pieprasīta autorizācija
@@ -103,13 +107,11 @@ service.gui.CHAT_ROOM_USER_KICKED=izmests no {0}
 service.gui.CHAT_ROOM_USER_QUIT={0} pameta
 service.gui.CHAT_ROOM_NAME=Tērzēšanas istabas nosaukums
 service.gui.ROOM_NAME=Tērzēšanas istaba
-service.gui.AUTOJOIN=Autopievienoties
 service.gui.CHANGE_PASSWORD=Mainīt paroli
 service.gui.CHAT_ROOM_NAME_INFO=Lauciņā zemāk ievadiet izveidojamās tērzēšanas istabas nosaukumu. 
 service.gui.CHAT_ROOM_NOT_EXIST=Serverī {1} nav atrasta Istaba {0}. Lūdzu pārbaudiet vai ievadījāt istabas nosaukumu pareizi. 
 service.gui.CHAT_ROOM_NOT_CONNECTED=Jums jābūt pieslēgtam, lai pievienotos {0} tērzēšanas istabai.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Lai pamestu tērzēšanas istabu jums jābūt pieslēgtam.
-service.gui.CHAT_ROOM_NOT_JOINED=Jums jābūt pieslēgtam tērzēšanas istabai, lai veiktu kādas operācijas tajā.
 service.gui.CHAT_ROOM_OPTIONS=Tērzēšanas istabas opcijas
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Lai pievienotos tērzēšanas istabai {0} ir nepieciešama reģistrācija.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Tērzēšanas istaba {0} pieprasa paroli.
@@ -122,22 +124,18 @@ service.gui.CLEAR=Attīrīt
 service.gui.CLOSE=Ai&zvērt
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Jūs saņēmāt jaunu ziņu 2 sekundes atpakaļ. Vai tiešām vēlaties aizvērt šo tērzēšanas logu?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Ir aktīvas failu piegādes. Vai piekrītat tās atcelt?
-service.gui.CONFIRM=Apstiprināt
 service.gui.CONNECTED_STATUS=Savienots
 service.gui.CONNECTING=Savienojos...
 service.gui.CONNECTING_STATUS=Savienojas
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Savienojas*
 service.gui.CONNECTION=Savienojums
-service.gui.CONNECTION_FAILED_MSG=Neizdevās savienoties ar sekojošu kontu: Lietotājs: {0}, Serveris: {1}. Lūdzu pārbaudiet tīkla savienojumu vai arī lūdziet palīdzību tīkla administratoram.
 service.gui.CONNECTION_EXPIRED_MSG=Patreiz esiet atslēgts no servera {0}.
 service.gui.CONTACT_NAME=ID vai Numurs
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Izvēlētais kontakts {0} neatbalsta zvanīšanu.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Izvēlētais kontakts {0} neatbalsta tērzēšanas konferences saraksti.
 service.gui.CONTACT_PAUSED_TYPING={0} pārstāja rakstīt ziņu
 service.gui.CONTACT_TYPING={0} raksta ziņu
 service.gui.CONTACT_TYPING_SEND_FAILED=uh-oh... mēs nevarējām nosakaidrot kad jūs rakstījāt {0}
 service.gui.CONTACT_INFO=&Kontakta info
-service.gui.CONTACTLIST=Kontaktu lists
 service.gui.CONTACTS=Kontakti
 service.gui.COPY=&Kopēt
 service.gui.COPY_LINK=Kopēt &saiti
@@ -147,15 +145,12 @@ service.gui.CREATE_CHAT_ROOM=&Izveidot tērzēšanas istabu...
 service.gui.CREATE_CHAT_ROOM_ERROR=Neizdevās izveidot {0} tērzēšanas istabu.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Izveidot tērzēšanas istabas vedni
 service.gui.CREATE_CONFERENCE_CALL=&Izveidot konfrences izsaukumu...
-service.gui.CREATE_CONFERENCE_CHAT=&Veidot konferences tērzēšanu
 service.gui.CREATE_GROUP=&Izveidot grupu...
 service.gui.CREATE_GROUP_NAME=Lauciņā zemāk norādiet veidojamās grupas nosaukumu.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Jūsu kontaktos nav nevienas grupas. Lūdzu vispirms izveidojiet grupu (Faili/Izveidot grupu).
 service.gui.CREATE_VIDEO_BRIDGE=Izveidot &video tiltu...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Izveidot &video tiltu...
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Šis kontakts neatbalsta web kontaktu info
 service.gui.CUT=&Izgriezt
-service.gui.DATE=Datums
 service.gui.DELETE=Dzēst
 service.gui.DENY=&Aizliegt
 service.gui.DESKTOP_SHARING_WARNING=<b>Vai vēlaties sākt ekrāna kopīgošanu?</b><br> Ja noklikšķināsiet OK, citi cilvēki redzēs jūsu ekrānu.
@@ -165,7 +160,6 @@ service.gui.DISCONNECTED_STATUS=Atvienots
 service.gui.DND_STATUS=Lūdzu netraucēt
 service.gui.DO_NOT_ASK_AGAIN=Vairs nejautāt
 service.gui.DO_NOT_SHOW_AGAIN=Nerādīt vairāk šo paziņojumu.
-service.gui.DOWNLOAD_NOW=&Lejuplādēt tagad
 service.gui.DRAG_FOR_SHARING=Velciet visu ko vēlaties kopīgot...
 service.gui.DURATION=ilgums
 service.gui.EDIT=&Labot
@@ -180,7 +174,6 @@ service.gui.ERROR_WAS=Kļūda: {0}
 service.gui.ESTIMATED_TIME=Novērtētais laiks:
 service.gui.EVENTS=Notikumi
 service.gui.EXIT=I&ziet
-service.gui.EXTENDED_CRITERIA=Paplašināt kritēriju
 service.gui.GENERAL_ERROR=Vispārīga kļūda
 service.gui.GROUP_NAME=Grupas nosaukums
 service.gui.FAILED_STATUS=Zvans neizdevās
@@ -234,7 +227,6 @@ service.gui.HIDE_OFFLINE_CONTACTS=Paslēpt kontaktus bezsaistē
 service.gui.HIDE_MAIN_WINDOW=<DIV>Klikšķinot X loga pogu, neizbeigs aplikācijas darbu, bet tikai <BR> to paslēps. Ja vēlaties beigt aplikācijas darbu izvēlaties Fails/Iziet</DIV>
 service.gui.HISTORY=&Vēsture
 service.gui.HISTORY_CONTACT=Vēsture - {0}
-service.gui.HOUR=Stunda
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifikators
 service.gui.IGNORE=&Ignorēt
@@ -253,11 +245,8 @@ service.gui.INVITE_CONTACT_TO_CALL=Uzaicināt kontaktus zvanam
 service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Uzaicināt kontaktus video tiltam
 service.gui.INVITE_REASON=Uzaicinājuma iemesls
 service.gui.IS_NOW={0} patreiz ir {1}
-service.gui.JITSI_WARNING=SIP Communicator nesen tika pārsaukts par Jitsi.<br/>Ja vēlaties, lai jūsu versija būtu atjaunināta, lejuplādējiet Jitsi tagad.<br/><br/>Mēs ļoti atvainojamies par sagādātajām neērtībām.<br/><br/>Jitsi izstrādātāju komanda
-service.gui.JITSI_WARNING_TITLE=SIP Communicator pārtop par Jitsi
 service.gui.JOIN=&Pievienoties
 service.gui.JOIN_AS=P&ievienoties kā
-service.gui.CLOSE_CHAT_ROOM_DIALOG=A&izvērt
 service.gui.JOIN_CHAT_ROOM=&Pievienoties tērzēšanas istabai...
 service.gui.JOIN_CHAT_ROOM_TITLE=Pievienoties tērzēšanas istabai
 service.gui.JOIN_CHAT_ROOM_NAME=Lūdzu ievadiet tērzēšanas istabas nosaukumu, kurai vēlaties pievienoties.
@@ -272,9 +261,13 @@ service.gui.SHOW_OFFLINE_CONTACTS=Paslēpt kontaktus bezsaistē
 
 
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
-service.gui.security.NO_VIDEO=HD video
 # keep the following string short
 
 # service.gui.avatar.imagepicker
@@ -282,9 +275,6 @@ service.gui.avatar.imagepicker.CANCEL=&Atlikt
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -295,6 +285,10 @@ service.gui.avatar.imagepicker.CANCEL=&Atlikt
 impl.ldap.EDIT=&Labot
 impl.ldap.CANCEL=&Atlikt
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -312,9 +306,6 @@ impl.googlecontacts.CANCEL=&Atlikt
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=&Par programmu
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -326,22 +317,16 @@ plugin.branding.ABOUT_MENU_ENTRY=&Par programmu
 
 # jabber accregwizz
 
-# mailbox
-plugin.mailbox.CONFIRM=Apstiprināt
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
 plugin.sipaccregwizz.DISPLAY_NAME=Rādīt ar vārdu
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -353,24 +338,21 @@ plugin.updatechecker.BUTTON_CLOSE=Ai&zvērt
 plugin.whiteboard.COLOR=Krāsa
 plugin.whiteboard.DELETE=Dzēst
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=&Kopēt
 plugin.keybindings.CHAT_CUT=&Izgriezt
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Tērzēšana
 
 # Notification Configuration Form
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Ienākošais zvans
 plugin.notificationconfig.event.IncomingFile=Ienākošais zvans
 plugin.notificationconfig.event.HangUp=Nolikt klausuli
@@ -386,6 +368,7 @@ impl.media.security.zrtp.TITLE=Zvanīt
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
@@ -418,7 +401,6 @@ net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=&Ignorēt
 net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=&Aizliegt
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=&Labot
 
 
 #Certificate configuration plugin
diff --git a/resources/languages/resources_mk.properties b/resources/languages/resources_mk.properties
index cd47b3d..57dff6d 100644
--- a/resources/languages/resources_mk.properties
+++ b/resources/languages/resources_mk.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,23 +43,24 @@ service.gui.ACCOUNT_ME=Јас
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Волшебник за регистрирање на сметка
 service.gui.ACCOUNTS=Сметки
 service.gui.ADD=Додај
-service.gui.ADD_ACCOUNT=Додај сметка
 service.gui.ADD_CONTACT=Додај
 service.gui.ADD_CONTACT_TO=Додади контакт во
 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} . Проблемот се јави на локалена IO операција.
 service.gui.ADD_GROUP_EXIST_ERROR=Групата {0} веќе постои во твојата контакт листа. Ве молиме одберете друго име.
-service.gui.ADD_SUBCONTACT=Додај
 service.gui.ALL_CONTACTS=Додај
 service.gui.CALL_CONTACT=Додај
 
 
 
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
 # keep the following string short
@@ -57,9 +69,6 @@ service.gui.CALL_CONTACT=Додај
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -68,6 +77,10 @@ service.gui.CALL_CONTACT=Додај
 
 # LDAP
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -83,9 +96,6 @@ service.gui.CALL_CONTACT=Додај
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -97,20 +107,15 @@ plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -119,21 +124,18 @@ plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
 # whiteboard
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+#Enum KeybindingSet.Category
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -145,6 +147,7 @@ plugin.branding.ABOUT_MENU_ENTRY=&За програмот
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
diff --git a/resources/languages/resources_nl.properties b/resources/languages/resources_nl.properties
index 120c5b3..c08fc0e 100644
--- a/resources/languages/resources_nl.properties
+++ b/resources/languages/resources_nl.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Mezelf
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Account Registratie Gids
 service.gui.ACCOUNTS=Accounts
 service.gui.ADD=&Toevoegen
-service.gui.ADD_ACCOUNT=Voeg account toe
 service.gui.ADD_CONTACT=&Voeg contactpersoon toe
 service.gui.ADD_AUTHORIZED_CONTACT={0} toevoegen aan uw contactenlijst
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Contactpersoon toevoegen aan mijn contactenlijst
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Contact toevoegingsfout
 service.gui.ADD_CONTACT_EXIST_ERROR=De contactpersoon {0} bestaat al in uw contactenlijst.
 service.gui.ADD_CONTACT_NETWORK_ERROR=De server heeft niet geantwoord op het verzoek om contactpersoon met id: {0} toe te voegen.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Het toevoegen van contactpersoon met id: {0} is mislukt. Methode wordt niet ondersteund.
-service.gui.ADD_CONTACT_IDENTIFIER=Vul in onderstaand veld de identificatie van het contact dat u toe wilt voegen in.
-service.gui.ADD_CONTACT_WIZARD=Voeg contact toe gids
 service.gui.ADD_CONTACT_NOT_CONNECTED=Je dient verbonden te zijn om een contactpersoon toe te voegen. Meld je aan op de geselecteerde provider en probeer opnieuw.
 service.gui.ADD_GROUP_LOCAL_ERROR=Mislukt om een groep met naam {0} toe te voegen. Het probleem gebeurde tijdens een lokale IO operatie.
 service.gui.ADD_GROUP_EXIST_ERROR=De groep {0} bestaat al, gelieve een andere naam te kiezen.
 service.gui.ADD_GROUP_NET_ERROR=Mislukt om de groep met naam {0} toe te voegen. Het probleem gebeurde door een netwerkfout. Bekijk uw verbinding en probeer het opnieuw.
 service.gui.ADD_GROUP_ERROR=Mislukt om de groep met naam {0} toe te voegen.
 service.gui.ADD_GROUP_EMPTY_NAME=De naam van de groep mag niet leeg zijn.
-service.gui.ADD_GROUP=Maak een groep
-service.gui.ADD_SUBCONTACT=&Voeg subcontact toe
 service.gui.ADDRESS=Adres
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=&Geavanceerd
-service.gui.ALL=&Alles
 service.gui.ALL_CONTACTS=&Alle contacten
 service.gui.ALTERNATE_ADDRESS=Alternatief adres
 service.gui.APPLY=&Toepassen
@@ -65,7 +70,6 @@ service.gui.AT=te
 service.gui.AUTHORIZE=&Autoriseren
 service.gui.AUTHORIZATION_ACCEPTED={0} heeft uw autorisatieverzoek geaccepteerd.
 service.gui.AUTHENTICATION_FAILED=Authenticatie mislukt voor {0}. Het opgegeven wachtwoord is niet geldig.
-service.gui.AUTHENTICATION_REQUESTED=Authenticatie gevraagd
 service.gui.AUTHENTICATION_REQUESTED_SERVER=De {0} server heeft uw authenticatie gevraagd.
 service.gui.AUTHENTICATION_REJECTED={0} heeft uw autorisatieverzoek afgewezen.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} authenticatie
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=In onderstaand veld kan je je nieuwe nickname
 service.gui.CHANGE_NICKNAME_ERROR=Fout tijdens het wijzigen van nickname
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nickname bestaat al
 service.gui.CHANGE_VIDEO_QUALITY=Wijzig videokwaliteit
-service.gui.CHAT_CONFERENCE_LABEL=Conferenties
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}'s conferentie
 service.gui.CHAT_ROOM_ALREADY_JOINED=U zit al in chatroom {0}.
 service.gui.CHAT_ROOM_CONFIGURATION={0} chatroom configuratie
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=heeft {0} verlaten
 service.gui.CHAT_ROOM_USER_KICKED=is buitengesmeten bij {0}
 service.gui.CHAT_ROOM_USER_QUIT=is gestopt met {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Berichten verzenden is verboden (stem ontnomen)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Slaat de chat ruimte op voor toekomstig gebruik
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Verwijdert de geselecteerde ruimte uit de lijst van opgeslagen ruimtes.
 service.gui.CHAT_ROOM_NAME=Chatroom naam
 service.gui.CLEAR_CUSTOM_MESSAGES=Schoon aangepaste berichten op.
 service.gui.ROOM_NAME=Chatroom
-service.gui.AUTOJOIN=Autojoin
 service.gui.CHANGE_PASSWORD=Wijzig wachtwoord
 service.gui.CHAT_ROOM_NAME_INFO=Vul de naam van de chatroom in in onderstaand veld.
 service.gui.CHAT_ROOM_NOT_EXIST=De chatroom {0} is niet gevonden op server {1}. Controleer of de ingevoerde naam correct is.
 service.gui.CHAT_ROOM_NOT_CONNECTED=U moet ingelogd zijn om deel te nemen aan chatroom {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=U moet ingelogd zijn om een chatroom te verlaten.
-service.gui.CHAT_ROOM_NOT_JOINED=U moet deelnemen aan een chatroom om er verdere operaties mee te kunnen doen.
 service.gui.CHAT_ROOM_OPTIONS=Chat room opties.
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=De {0} chatroom verplicht registratie voor u deel kunt nemen.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=De {0} chatroom heeft een wachtwoord gevraagd.
@@ -151,22 +150,18 @@ service.gui.CLEAR=Wissen
 service.gui.CLOSE=&Sluiten
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=U heeft minder dan 2 seconden geleden een nieuw bericht ontvangen. Weet u zeker dat u deze chat wilt sluiten?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=U heeft actieve bestandsoverdrachten. Weet u zeker dat u deze wilt annuleren?
-service.gui.CONFIRM=Bevestig
 service.gui.CONNECTED_STATUS=Verbonden
 service.gui.CONNECTING=Verbinden...
 service.gui.CONNECTING_STATUS=Verbinden
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Verbinden*
 service.gui.CONNECTION=Verbinding
-service.gui.CONNECTION_FAILED_MSG=Verbinding mislukt voor de volgende account: Gebruikersnaam: {0}, Servernaam: {1}. Controleer uw netwerkverbinding, of neem contact op met uw beheerder voor meer informatie.
 service.gui.CONNECTION_EXPIRED_MSG=U bent momenteel niet meer verbonden met de {0} server.
 service.gui.CONTACT_NAME=ID of nummer
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Het gekozen {0} contact ondersteunt geen telefonie.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Het gekozen {0} contact ondersteunt geen chat conferenties.
 service.gui.CONTACT_PAUSED_TYPING={0} heeft het typen gepauzeerd
 service.gui.CONTACT_TYPING={0} is een bericht aan het typen
 service.gui.CONTACT_TYPING_SEND_FAILED=oh-oh ... we konden {0} niet vertellen dat je aan het typen bent
 service.gui.CONTACT_INFO=&Contact info
-service.gui.CONTACTLIST=Contactenlijst
 service.gui.CONTACTS=Contacten
 service.gui.COPY=&Kopiëren
 service.gui.COPY_LINK=&Link kopiëren
@@ -176,17 +171,14 @@ service.gui.CREATE_CHAT_ROOM=&Creëer een chatroom...
 service.gui.CREATE_CHAT_ROOM_ERROR=Mislukt om chatroom {0} te creëren.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Creëer chatroom gids
 service.gui.CREATE_CONFERENCE_CALL=&Creëer een conference call...
-service.gui.CREATE_CONFERENCE_CHAT=&Creëer een conference chat...
 service.gui.CREATE_GROUP=&Creëer groep...
 service.gui.CREATE_GROUP_NAME=Vul de naam van de te creëren groep in in onderstaand veld.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Uw contactenlijst bevat geen groepen. Maak eerst een groep (Bestand/Creëer groep).
 service.gui.CREATE_VIDEO_BRIDGE=Maak een &videobrug...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Maak een &videobrug
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Maak / bezoek videoconferentie
 service.gui.CREATE_VIDEO_CONFERENCE=Maak een nieuwe videoconferentie voor deze chatruimte
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Dit contact ondersteunt geen web contactinformatie.
 service.gui.CUT=&Knippen
-service.gui.DATE=Datum
 service.gui.DELETE=Verwijderen
 service.gui.DENY=&Afwijzen
 service.gui.DESKTOP_SHARING_WARNING=<b>Weet u zeker dat u schermdeling wilt starten?</b><br>Als u op OK klikt zal iedereen in dit gesprek uw scherm zien.
@@ -197,7 +189,6 @@ service.gui.DISCONNECTED_STATUS=Niet verbonden
 service.gui.DND_STATUS=Niet storen
 service.gui.DO_NOT_ASK_AGAIN=Niet opnieuw vragen
 service.gui.DO_NOT_SHOW_AGAIN=Toon dit bericht niet opnieuw
-service.gui.DOWNLOAD_NOW=&Download nu
 service.gui.DRAG_FOR_SHARING=Sleep hier alles wat u wilt delen...
 service.gui.DURATION=duur
 service.gui.DESTROY_CHATROOM=Verwijder de chatruimte
@@ -218,7 +209,6 @@ service.gui.ERROR_RECEIVED_FROM=Foutmelding ontvangen van {0}
 service.gui.ESTIMATED_TIME=Geschatte tijd:
 service.gui.EVENTS=Gebeurtenissen
 service.gui.EXIT=&Exit
-service.gui.EXTENDED_CRITERIA=Uitgebreide criteria
 service.gui.GENERAL=Algemeen
 service.gui.GENERAL_ERROR=Algemene fout
 service.gui.GROUP_NAME=Groepsnaam
@@ -260,7 +250,6 @@ service.gui.FONT_ITALIC=Cursief
 service.gui.FONT_SIZE=Grootte
 service.gui.FONT_STYLE=Stijl
 service.gui.FONT_UNDERLINE=Onderlijnen
-service.gui.FROM={0} van {1}
 service.gui.GRANT_OWNERSHIP=Geef eigenaarsrecht...
 service.gui.GRANT_ADMIN=Geef administratorrecht...
 service.gui.GRANT_MODERATOR=Geef moderatorrecht
@@ -286,7 +275,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Weet je zeker dat je alle lokaal opgeslag
 service.gui.HISTORY_REMOVE_ERROR=Fout tijdens het verwijderen van lokaal opgeslagen berichten.
 service.gui.HOME=Thuis
 service.gui.HOME_PAGE=Thuispagina
-service.gui.HOUR=Uur
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identificatie
 service.gui.IGNORE=&Negeren
@@ -310,13 +298,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Nodig contactpersonen uit voor videob
 service.gui.INVITE_REASON=Uitnodiginsreden
 service.gui.IS_CALLING={0} belt ...
 service.gui.IS_NOW={0} is nu {1}
-service.gui.JITSI_WARNING=SIP Communicator is hernoemd naar Jitsi.<br />Als u een recente versie wilt behouden, download Jitsi dan nu.<br /><br />We bieden onze excuses aan voor eventuele ongemakken die dit met zich meebrengt.<br /><br />Het Jitsi Ontwikkelaars Team
-service.gui.JITSI_WARNING_TITLE=SIP Communicator wordt Jitsi
 service.gui.JOIN=&Binnengaan
 service.gui.JOIN_AS=&Binnengaan als
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Neem deel aan een bestaande videoconferentie
 service.gui.JOIN_VIDEO=Neem deel aan video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Sluiten
 service.gui.JOB_TITLE=Werktitel
 service.gui.JOIN_CHAT_ROOM=Werktitel
 service.gui.JOIN_CHAT_ROOM_TITLE=Ga chatroom binnen
@@ -329,7 +314,6 @@ service.gui.KICK_FAILED=Buitengooien mislukt
 service.gui.KICK_FAILED_GENERAL_ERROR=Mislukt om {0} buiten te gooien. Er is een serverfout gebeurd.
 service.gui.KICK_FAILED_NOT_ALLOWED=Mislukt om {0} buiten te gooien. De eigenaar en administrator van de chatroom kunnen niet buitengegooid worden.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Mislukt om {0} buiten te gooien. U heeft geen privileges om dat te doen.
-service.gui.LAST=Laatste
 service.gui.LAST_NAME=Achternaam
 service.gui.LEAVE=&Verlaten
 service.gui.LIMIT_REACHED_FOR_IP=U heeft teveel bestaande registraties van het lokale IP-adres en de server {0} accepteert geen extra registraties.
@@ -349,7 +333,6 @@ service.gui.MESSAGE=Bericht
 service.gui.MISSED_CALLS_TOOL_TIP=Gemiste oproepen van:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= en {0} meer
 service.gui.MODERATOR=moderator
-service.gui.MORE=Toon meer
 service.gui.MORE_LABEL=Meer
 service.gui.MOVE=Verplaats
 service.gui.MOVE_SUBCONTACT=&Verplaats contact
@@ -358,7 +341,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Het gekozen contact is dezelfde als \n de ges
 service.gui.MOVE_SUBCONTACT_QUESTION=Weet u zeker dat u {0} naar {1} wilt verplaatsen?
 service.gui.MOVE_TO_GROUP=&Verplaats naar groep
 service.gui.MOVE_CONTACT=Verplaats Contact
-service.gui.MOVE_CONTACT_ERROR=&Contact kan niet verplaatst worden
 service.gui.MSG_DELIVERY_FAILURE=Bovenstaand bericht kon niet afgeleverd worden.
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Het protocol dat je gebruikt ondersteunt geen offline berichten. Je kunt proberen de contactpersoon te bereiken via een ander protocol of wachten tot hij/zij online komt.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Er is een interne fout opgetreden. Dit is waarschijnlijk een bug. Gelieve dit te rapporteren op http://www.jitsi.org/index.php/Development/BugsAndIssues.
@@ -372,7 +354,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=U dient verbonden te zijn voor u bericht
 service.gui.MULTIPLE_LOGINS=U bent meer dan één keer ingelogd met hetzelfde account. De account: Gebruikersnaam: {0}, Servernaam{1} is momenteel niet verbonden.
 service.gui.MY_CHAT_ROOMS=Chatruimte toevoegen
 service.gui.MY_CHAT_ROOMS_TITLE=Chatruimte toevoegen
-service.gui.MUTE=Mute
 service.gui.MUTUALLY_ON_HOLD_STATUS=Wederzijds on hold
 service.gui.NAME=Naam
 service.gui.NETWORK=Netwerk
@@ -404,7 +385,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=NietInContactenlijst
 service.gui.SD_QUALITY=Standaard kwaliteit
 service.gui.OFFLINE=Offline
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Oudere telefoongesprekken
 service.gui.ONLINE=Online
 service.gui.OPEN=Open
 service.gui.OPEN_FILE_FROM_IMAGE=Dubbelklik om bestand te openen.
@@ -416,7 +396,6 @@ service.gui.OPEN_ON_ACTIVITY=Openen bij activiteit
 service.gui.OPEN_ON_MESSAGE=Alleen openen bij berichten
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Alleen openen bij belangrijke berichten
 service.gui.OR=of
-service.gui.OR_ENTER_PHONE_NUMBER=Of voer hier een telefoonnummer in...
 service.gui.ORGANIZATION=Organisatie
 service.gui.OTHER=Anders
 service.gui.chat.role.OWNER=Eigenaar
@@ -442,7 +421,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' voor suggesties
 service.gui.PRESS_FOR_CALL_INFO=Klik voor gespreksinformatie
 service.gui.PRESS_TO_OPEN_CRM=Klik om CRM-applicatie te openen
 service.gui.PREVIOUS=Vorig
-service.gui.PREVIOUS_TOOLTIP=Blader door oudere conversaties
 service.gui.PRINT=&Print
 service.gui.PROACTIVE_NOTIFICATION=is een bericht aan het schrijven
 service.gui.PROBLEMS_ENCOUNTERED=Problemen tegengekomen
@@ -458,7 +436,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=U heeft te snel de verbinding met de ser
 service.gui.RE_REQUEST_AUTHORIZATION=&Opnieuw om autorisatie vragen
 service.gui.REFERRED_STATUS=Verwezen
 service.gui.REJECT=&Weigeren
-service.gui.REMIND_ME_LATER=Herinner mij later
 service.gui.REMEMBER_PASSWORD=Wachtwoord herinneren
 service.gui.REMOVE=&Verwijderen
 service.gui.REMOVE_ACCOUNT=&Verwijder account
@@ -484,29 +461,20 @@ service.gui.REVOKE_ADMIN=Beheerder intrekken
 service.gui.REVOKE_MODERATOR=Moderator intrekken
 service.gui.REVOKE_MEMBERSHIP=Deelname intrekken
 service.gui.REVOKE_VOICE=Stemgebruik intrekken
-service.gui.ROOT_GROUP=Hoofd groep
 service.gui.SAVE=&Opslaan
-service.gui.SAVE_AS_DEFAULT=Als standaard opslaan
 service.gui.SEARCH=&Zoeken
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Klik op de knop hieronder om alle bestaande chat rooms te tonen in de geselecteerde server. Selecteer vervolgens degene waar u deel aan wilt nemen en klik op de deelname knop.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Gezocht contactpersoon
 service.gui.SECURITY=Beveiliging
-service.gui.SELECT_ACCOUNT=Selecteer account
 service.gui.SELECT_COLOR=Selecteer kleur
 service.gui.SELECT_GROUP=Selecteer groep
-service.gui.SELECT_GROUP_WIZARD_MSG=De lijst hieronder bevat alle groepen in uw contactenlijst. Selecteer degene waar u het nieuwe contact wilt toevoegen.
 service.gui.SELECT_NO_GROUP=Geen groep
-service.gui.SELECT_GROUP_WIZARD=Specificeer groep 
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=De lijst hieronder bevat alle accounts die de meervoudige gebruikers chat functionaliteit gebruiken. Selecteer degene die u wilt gebruiken om uw chat room te maken.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=De lijst hieronder bevat alle geregistreerde accounts. Selecteer degene die u wilt gebruiken om te communiceren met het nieuwe contact.
-service.gui.SELECT_PROVIDERS_WIZARD=Selecteer account
 service.gui.SELECT_VIDEO_CONFERENCE=Kies videoconferentie
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Kies een chatruimte uit de lijst en druk op OK om deze toe te voegen.
 service.gui.SEND=&Versturen
 service.gui.SEND_FILE=Verstuur &bestand
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Er is geen informatie voor dit contact.
 service.gui.SEND_MESSAGE=&Verstuur een bericht
-service.gui.SEND_AS_SMS=Verstuur als SMS
 service.gui.SEND_PRIVATE_MESSAGE=Persoonlijk bericht versturen
 service.gui.SEND_SMS=&Verstuur SMS
 service.gui.SEND_SMS_DETAILS=Denk er aan dat u het nummer in internationaal formaat moet invoeren, bijvoorbeeld beginnend met +44 voor het Verenigd Koninkrijk, +447777000000
@@ -545,7 +513,6 @@ service.gui.STREET=Straat
 service.gui.SUBJECT=Onderwerp
 service.gui.SUMMARY=Samenvatting
 service.gui.TELEPHONY=Telefonie
-service.gui.TODAY=Vandaag
 service.gui.TOOLS=&Gereedschap
 service.gui.TRANSFER=&Overdracht
 service.gui.TO=&Aan:
@@ -555,7 +522,6 @@ service.gui.TRANSFER_CALL_TO=Overdragen aan:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparantie is niet ondersteund door uw huidige configuratie.
 service.gui.TYPE_YOUR_REQUEST=Typ uw verzoek hier
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Het is niet gelukt om de videokwaliteit voor dit gesprek te wijzigen.
-service.gui.UNMUTE=Mute opheffen
 service.gui.USER_IDENTIFIER=Gebruiker identificator:
 service.gui.USER_EXISTS_ERROR=Deze gebruiker bestaat reeds op het geselecteerde netwerk. Kies een andere gebruiker of netwerk.
 service.gui.USERNAME_NULL=Voer uw gebruikersnaam en wachtwoord in.
@@ -568,7 +534,6 @@ service.gui.USE_PROVISIONING=Gebruik online provisioning.
 service.gui.VALUE=Waarde
 service.gui.VIDEO_CALL=&Video gesprek
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&Weergeven
 service.gui.VIEW_HISTORY=Bekijk &geschiedenis
 service.gui.VIEW_SMILEYS=Bekijk &smileys
@@ -588,9 +553,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Volume aanpassen
 service.gui.WAITING_AUTHORIZATION=Wacht op autorisatie
 service.gui.WARNING=Waarschuwing
 service.gui.YES=Ja
-service.gui.YESTERDAY=Gisteren
-service.gui.EXISTING_ACCOUNT_ERROR=Het opgegeven account is reeds geïnstalleerd.
-service.gui.NEW_MAIL=<b>U heeft één nieuw email bericht</b><br/><b>Van:</b> {0} {1} <br/><b>Onderwerp:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=U heeft een nieuw email bericht in uw {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=U heeft {2} nieuwe email berichten ontvangen in uw {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=één ongelezen bericht in uw <a href="{0}">inbox</a>.<br/>
@@ -614,7 +576,6 @@ service.gui.SECURITY_ERROR=Beveiligingsfout
 service.gui.SPEED=Snelheid:
 service.gui.SILENT_MEMBER=stil lid
 service.gui.NON_SECURE_CONNECTION=Er kan geen beveiligde verbinding gemaakt worden voor account {0}. Als je verbinding wilt maken met een niet-beveiligide server, vink dan "Niet-beveiligde verbindingen toestaan" aan in accountinstellingen.
-service.gui.UPDATE=Update
 service.gui.MOBILE_PHONE=Mobiel
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Werk
@@ -649,12 +610,10 @@ service.gui.callinfo.CALL_INFORMATION=Telefoongesprekinformatie
 service.gui.callinfo.CALL_IDENTITY=Identiteit
 service.gui.callinfo.PEER_COUNT=Aantal deelnemers
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Focus van conferentie
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Encryptie ingeschakeld
 service.gui.callinfo.CALL_TRANSPORT=Transportprotocol
 service.gui.callinfo.CALL_DURATION=Duur van het telefoongesprek
 service.gui.callinfo.TLS_PROTOCOL=TLS-protocol
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS encryptiesuite
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Certificatenketen van de TLS server
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=De inhoud van het TLS servercertificaat wordt hieronder getoond.
 service.gui.callinfo.VIEW_CERTIFICATE=Certificaat weergeven
 service.gui.callinfo.CODEC=Codec / Frequentie
@@ -664,7 +623,6 @@ service.gui.callinfo.AUDIO_INFO=Audio-info
 service.gui.callinfo.VIDEO_INFO=Video-info
 service.gui.callinfo.LOCAL_IP=Lokaal IP-adres / poort
 service.gui.callinfo.REMOTE_IP=Tegenpartij IP / Poort
-service.gui.callinfo.BANDWITH=Bandbreedte
 service.gui.callinfo.LOSS_RATE=Verliesratio
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -674,10 +632,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Sleuteluitwisselingsprotocol
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE kandidaat uitgebreid type
 service.gui.callinfo.ICE_STATE=ICE verwerkingsstatus
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Kandidaten verzamelen
 service.gui.callinfo.ICE_STATE.RUNNING=Verbindingscontroles
 service.gui.callinfo.ICE_STATE.COMPLETED=Voltooid
 service.gui.callinfo.ICE_STATE.FAILED=Gefaald
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Lokaal IP-adres / poort
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Lokaal reflexief IP-adres / poort
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Lokaal doorgestuurd IP-adres / poort
@@ -698,11 +659,12 @@ service.gui.ALWAYS_TRUST=Dit certificaat altijd vertrouwen
 service.gui.CERT_DIALOG_TITLE=Controleer certificaat
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} kan de identiteit van de server niet verifiëren tijdens de verbindingspoging <br> naar {1}. Het certificaat is niet vertrouwd, wat betekent dat de serveridentiteit niet <br> automatisch kan worden vastgesteld. Wilt u verder gaan met het opzetten van deze verbinding? <br><br> Voor meer informatie, klik op ''Certificaat weergeven''.</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} kan de identiteit van de server niet verifiëren tijdens verbindingspoging <br> naar {1}. Het certificaat is niet vertrouwd, wat betekent dat de serveridentiteit niet <br> automatisch kan worden vastgesteld. Wilt u verder gaan met het opzetten van deze verbinding? <br><br> Voor meer informatie, klik op ''Toon Certificaat''.</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} kan de identiteit van de verbinding makende cliënt niet vaststellen. <br><br> Het certificaat is niet vertrouwd, wat betekent dat de cliëntidentiteit niet <br> automatisch kan worden vastgesteld. Wilt u deze verbinding accepteren? <br><br> Voor meer informatie, klik op ''Toon certificaat''. </html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} kan de identiteit van de verbinding makende cliënt niet vaststellen. <br><br> Het certificaat is niet vertrouwd, wat betekent dat de cliëntidentiteit niet <br> automatisch kan worden vastgesteld. Wilt u deze verbinding accepteren? <br><br> Voor meer informatie, klik op ''Certificaat weergeven''. </html>
 service.gui.CONTINUE_ANYWAY=Toch doorgaan
 service.gui.CERT_INFO_CHAIN=Certificatenketen:
 service.gui.CERT_INFO_ISSUED_TO=Uitgegeven aan
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Algemene naam:
 service.gui.CERT_INFO_O=Organisatie:
 service.gui.CERT_INFO_C=Land Naam:
@@ -721,12 +683,10 @@ service.gui.CERT_INFO_SIGN_ALG=Handtekeningsalgorithme
 service.gui.CERT_INFO_PUB_KEY_INFO=Info over publieke sleutel
 service.gui.CERT_INFO_ALG=Algorithme:
 service.gui.CERT_INFO_PUB_KEY=Publieke sleutel:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Exponent:
 service.gui.CERT_INFO_KEY_SIZE=Sleutelgrootte:
 service.gui.CERT_INFO_SIGN=Handtekening:
-service.gui.CONTINUE=Verder
 service.gui.SHOW_CERT=Weergeven certificaat
 service.gui.HIDE_CERT=Verbergen certificaat
 
@@ -749,12 +709,9 @@ service.gui.security.SECURE_AUDIO=Beveiligde audio
 service.gui.security.AUDIO_NOT_SECURED=Audio niet beveiligd
 service.gui.security.SECURE_VIDEO=Beveiligde video
 service.gui.security.VIDEO_NOT_SECURED=Video niet beveiligd
-service.gui.security.NO_VIDEO=Geen video
-service.gui.security.CIPHER=Codering: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Telefoongesprek beveiligd. Klik hier voor meer informatie.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Telefoongesprek niet beveiligd.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Klik hier om het beveiligingsgeheim te vergelijken met je partner.
-service.gui.security.COMPARE_WITH_PARTNER=Vergelijk met uw partner en klik het padlock om te bevestigen.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Vergelijk met je partner: {0}
 service.gui.security.STRING_COMPARED=Regel vergeleken!
@@ -772,20 +729,14 @@ service.gui.avatar.imagepicker.CLICK=Klik en lach
 service.gui.avatar.imagepicker.IMAGE_FILES=Afbeeldingsbestanden
 service.gui.avatar.imagepicker.IMAGE_PICKER=Afbeelding
 service.gui.avatar.imagepicker.IMAGE_SIZE=Afbeeldingsgrootte
-service.gui.avatar.imagepicker.INITIALIZING=Initialiseren
 service.gui.avatar.imagepicker.RESET=Reset
 service.gui.avatar.imagepicker.SET=Instellen
 service.gui.avatar.imagepicker.TAKE_PHOTO=Neem een foto
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Webcam fout
 
 service.gui.security.encryption.required=Encryptie verplicht!
 
 service.protocol.ICE_FAILED=Kan verbinding niet tot stand brengen (ICE mislukt en geen relay beschikbaar)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Fout in opslag van SIP contactenlijst
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Resource {0} kan niet gelezen worden. Voor {1}
@@ -815,9 +766,7 @@ impl.ldap.QUERY_CUSTOM=Aangepast zoeken
 impl.ldap.QUERY_CUSTOM_HINT=Gebruik {0} als plaatsvervanger voor de zoekterm.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Automatisch wildcards toevoegen aan zoekterm
 impl.ldap.QUERY_PHOTO_INLINE=Foto samen met andere attributen ophalen.
-impl.ldap.NEW=Nieuw
 impl.ldap.EDIT=bewerken
-impl.ldap.REMOVE=Verwijderen
 impl.ldap.ENABLED=Actief
 impl.ldap.SERVER_NAME=Servernaam
 impl.ldap.SERVER_NAME_EXAMPLE=Mijn LDAP server
@@ -850,6 +799,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 impl.ldap.PHONE_PREFIX=Telefoonvoorvoegsel
 impl.ldap.PHONE_PREFIX_EXAMPLE=Vb.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Adresboek
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=MacOSX adresboek doorzoeken inschakelen
@@ -864,9 +817,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Maak Outlook de standaard email
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google contacten
-impl.googlecontacts.NEW=Nieuw
 impl.googlecontacts.EDIT=bewerken
-impl.googlecontacts.REMOVE=Verwijderen
 impl.googlecontacts.ENABLED=Actief
 impl.googlecontacts.ACCOUNT_NAME=Accountnaam
 impl.googlecontacts.SAVE=Opslaan
@@ -905,11 +856,8 @@ plugin.accountinfo.ORGANIZATION=Naam van organisatie:
 plugin.accountinfo.JOB_TITLE=Werktitel:
 plugin.accountinfo.ABOUT_ME=Over Mij:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Gebruikersfoto's
 plugin.accountinfo.GLOBAL_ICON=Globaal icoon gebruiken
 plugin.accountinfo.LOCAL_ICON=Gebruik dit icoon:
-plugin.accountinfo.CHANGE=Veranderen
-plugin.accountinfo.ONLY_MESSAGE=Alleen berichten
 
 # connection info
 plugin.connectioninfo.TITLE=Verbindingsinformatie
@@ -929,49 +877,12 @@ plugin.aimaccregwizz.USERNAME=AIM schermnaam:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Scherm naam en wachtwoord
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Registreer nieuw account
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Heeft u geen AIM account, klik dan op deze knop om er een aan te maken.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Overschrijf standaard server opties
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Over {0}
 plugin.branding.LOGO_MESSAGE=Open Source VoIP && Instant Messaging
-plugin.branding.LOADING=Laden
 plugin.branding.ABOUT_MENU_ENTRY=&Over
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>Het {1} wordt momenteel actief ontwikkeld. De versie die u nu draait is slechts experimenteel en werkt MOGELIJK niet zoals verwacht. Raadpleeg {2} voor meer informatie.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright jitsi.org. Alle rechten voorbehouden. Bezoek <a href="http://jitsi.org">http://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}>Jitsi wordt gedistribueerd onder de voorwaarden van de LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Woordenboeken
-plugin.dictaccregwizz.ANY_DICTIONARY=Willekeurig woordenboek
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Willekeurig woordenboek van {0}
-plugin.dictaccregwizz.FIRST_MATCH=Eerste resultaat
-plugin.dictaccregwizz.NO_MATCH=Geen resultaat
-plugin.dictaccregwizz.MATCH_RESULT=Geen definities gevonden voor ''{0}'', misschien bedoeld u:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Het huidige woordenboek ''{0}'' bestaat niet langer op de server.
-plugin.dictaccregwizz.INVALID_STRATEGY=De huidige strategie is niet beschikbaar op de server.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Het Dict dienst protocol
-plugin.dictaccregwizz.HOST=Host
-plugin.dictaccregwizz.SERVER_INFO=Serverinformatie
-plugin.dictaccregwizz.STRATEGY_SELECTION=Strategie selectie
-plugin.dictaccregwizz.STRATEGY_LIST=Lijst van strategieën:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Zoek binnen strategieën
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategieën worden gebruikt vergelijkbare woorden te vinden, wanneer een vertaling niet gevonden is, dankzij verschillende methodes. Bijvoorbeeld de Prefix strategie zoekt woorden die beginnen met het woord dat u zou willen vertalen.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict account informatie
-plugin.dictaccregwizz.FIRST_ACCOUNT=Deze wizard maakt uw eerste Dict account aan op dict.org.\n\nU kunt nieuwe woordenboeken toevoegen door naar de Account Registratie Wizard te gaan. Vul het host veld met het woordenboek dat u toe wilt voegen.
-plugin.dictaccregwizz.THREAD_CONNECT=Probeert verbinding te maken met de server
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Verbindingspoging mislukt, dit is geen dict server of de server is offline
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Ophalen strategieën 
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Geen strategie gevonden op de server
-plugin.dictaccregwizz.POPULATE_LIST=Lijst aan het vullen
-plugin.dictaccregwizz.CLOSING_CONNECTION=Verbinding aan het sluiten
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Om Facebook Chat te kunnen gebruiken, is het noodzakelijk een ''Gebruikersnaam'' aan te maken <br> in uw ''Account instellingen'' pagina op Facebook.</a><br><br>Aantekening: Wanneer u een gebruikersnaam aangemaakt heeft, moet u uitloggen van de webpagina >br> en kan het even duren voordat u in staat bent in te loggen met uw nieuwe gebruikersnaam!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Het Facebook Chat protocol
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Gebruikersnaam:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Gebruikersnaam en wachtwoord:
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START={0} automatisch starten wanneer de computer opnieuw opstart
@@ -982,9 +893,6 @@ plugin.generalconfig.SHOW_HISTORY=Toon
 plugin.generalconfig.HISTORY_SIZE=recente berichten in nieuwe chats
 plugin.generalconfig.SEND_MESSAGES_WITH=Verstuur berichten met:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Breng chat venster naar de voorgrond
-plugin.generalconfig.ERROR_PERMISSION=U heeft niet voldoende privileges om automatisch starten te verwijderen.
-plugin.generalconfig.TRANSPARENCY=Transparantie
-plugin.generalconfig.ENABLE_TRANSPARENCY=Transparantie aanzetten
 plugin.generalconfig.DEFAULT_LANGUAGE=Interfacetaal
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Uw wijzigingen worden effectief na de volgende herstart.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0} % vertaald
@@ -1043,13 +951,13 @@ plugin.ircaccregwizz.EXAMPLE_SERVER=Vb.: chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Gebruik beveiligde verbinding
 plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=Contactpersoonaanwezigheid inschakelen
 plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=Aanwezigheid in chatruimte inschakelen
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} authenticatie
+plugin.ircaccregwizz.SASL_USERNAME=Gebruikersnaam
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Het XMPP protocol
 plugin.jabberaccregwizz.USERNAME=XMPP-gebruikersnaam
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Bevestig wachtwoord
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID en wachtwoord
 plugin.jabberaccregwizz.CSERVER=Server
 plugin.jabberaccregwizz.SERVER=Verbind met server
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Activeer keep alive
@@ -1065,13 +973,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Commentaar
 plugin.jabberaccregwizz.RESOURCE=Bron
 plugin.jabberaccregwizz.AUTORESOURCE=Genereer bron automatisch
 plugin.jabberaccregwizz.PRIORITY=Prioriteit
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP fout
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Onbekende XMPP-fout. ({0}) Controleer of de servernaam correct is.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=De wachtwoorden komen niet overeen.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Overschrijf standaard server opties
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Geavanceerde opties
 plugin.jabberaccregwizz.USE_ICE=Gebruik ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Gebruik Google's Jingle/ICE (experimenteel)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Ontdek STUN/TURN servers automatisch
 plugin.jabberaccregwizz.SUPPORT_TURN=Ondersteun TURN
 plugin.jabberaccregwizz.TURN_USERNAME=TURN gebruikersnaam
@@ -1099,11 +1003,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Berichtkopiën uitschakelen
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Kies automatisch tussen RTP en in-band
 plugin.jabberaccregwizz.SERVER_OPTIONS=Server-opties
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Wijzig account-wachtwoord
-plugin.jabberaccregwizz.NEW_PASSWORD=Nieuw wachtwoord
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Bevestig wachtwoord
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Vul een geldig poortnummer in om door te gaan.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Het account moet ingelogd zijn om het wachtwoord te kunnen wijzigen.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Het wachtwoord is leeg.
 plugin.jabberaccregwizz.TLS_REQUIRED=De verbinding is niet beveiligd. De wachtwoordwijziging wordt niet uitgevoerd.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Het wachtwoord is succesvol gewijzigd.
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Het wijzigen van het wachtwoord wordt op deze XMPP-server niet ondersteund.
@@ -1117,25 +1018,9 @@ plugin.jabberaccregwizz.RESET=Reset
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Resetten naar globale instellingen
 plugin.jabberaccregwizz.DISABLE_JINGLE=Jingle uitschakelen (audio en video gesprekken met XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Uitgaand bericht:
-plugin.mailbox.INCOMING=Binnenkomende berichten:
-plugin.mailbox.WAIT_TIME=Wachttijd voordat telefoongesprek naar Voicemail wordt doorverwezen
-plugin.mailbox.MAX_MESSAGE_TIME=Maximale binnenkomende gesprekstijd
-plugin.mailbox.CONFIRM=Bevestig
-plugin.mailbox.DEFAULTS=Standaardinstellingen
-plugin.mailbox.MAILBOX=Mailbox
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Een protocol om verbinding te maken en gesprekken te voeren op de MSN dienst.
-plugin.msnaccregwizz.USERNAME=Email:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID en wachtwoord
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Installeren
 plugin.pluginmanager.UNINSTALL=Deïnstalleren
-plugin.pluginmanager.UPDATE=Update
 plugin.pluginmanager.PLUGINS=Plug-ins
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=Selecteer bestand
@@ -1160,7 +1045,6 @@ plugin.sipaccregwizz.SERVER_PORT=Server poort
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxy poort
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Voorkeurstransport
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Geavanceerde opties
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxy opties
 plugin.sipaccregwizz.PROXY_AUTO=Configureer proxy automatisch
 plugin.sipaccregwizz.ENABLE_PRESENCE=Activeer aanwezigheid (SIMPLE)
@@ -1180,8 +1064,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Kies automatisch tussen RTP en in-band (gee
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=In-band
-plugin.sipaccregwizz.REGISTER=REGISTREREN
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Overschrijf standaard server opties
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Activeer ondersteuning voor gecodeerde telefoongesprekken
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Indicatie van ondersteuning voor ZRTP in signaling-protocol
 plugin.sipaccregwizz.AUTH_NAME=Autorisatienaam
@@ -1202,10 +1084,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=URI voor Voicemail-controle
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Uw wachtwoorden komen niet overeen.
 plugin.sipaccregwizz.NO_CERTIFICATE=<geen> (gebruik reguliere authenticatie)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP-indicatie
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Uitgeschakeld (indicatie alleen RTP/AVP) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Verplicht (bied aan en accepteer enkel RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Optioneel (biedt RTP/SAVP eerst aan, daarna RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=S-Descriptor inschakelen (staat ook bekend als SDES of SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Kies ingeschakelde encryptieprotocollen en hun prioriteit (bovenste protocol eerst):
 plugin.sipaccregwizz.CIPHER_SUITES=Ingeschakelde codeersuites:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} zal automatisch proberen al je gesprekken te beveiligen met ZRTP en jullie zullen beide een melding zien en horen als de beveiligide verbinding in stand gebracht is. Je zou de geavanceerde instellingen hieronder alleen moeten wijzigen als je goed weet wat je doet.</div></html>
@@ -1219,15 +1101,6 @@ plugin.skinmanager.DEFAULT_SKIN=Standaard skin
 plugin.skinmanager.ADD_NEW_SKIN=Voeg nieuwe skin toe...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=De standaard skin voor de applicatie.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Een protocol om verbinding te maken met externe machines over SSH.
-plugin.sshaccregwizz.USERNAME=Account ID:
-plugin.sshaccregwizz.IDENTITY_FILE=Identiteitsbestand:
-plugin.sshaccregwizz.KNOWN_HOSTS=Bekende hosts:
-plugin.sshaccregwizz.OPTIONAL=Optioneel
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Accountdetails
-
 # status update
 plugin.autoaway.AUTO_STATUS=Automatisch Weg
 plugin.autoaway.ENABLE_CHANGE_STATUS=Verander status tijdens weg zijn
@@ -1275,22 +1148,6 @@ plugin.whiteboard.DESELECT=Deselecteren
 plugin.whiteboard.DELETE=Verwijderen
 plugin.whiteboard.PROPERTIES=Eigenschappen
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Een protocol om verbinding te maken en gesprekken te voeren op de Yahoo!-dienst.
-plugin.yahooaccregwizz.USERNAME=Gebruikersnaam:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID en wachtwoord:
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Het Zeroconf (Bonjour) dienst protocol.
-plugin.zeroaccregwizz.FIRST_NAME=Voornaam:
-plugin.zeroaccregwizz.LAST_NAME=Achternaam:
-plugin.zeroaccregwizz.EMAIL=Email:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Onthouden Bonjour contacten?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID en wachtwoord
-plugin.zeroaccregwizz.USERID=Gebruikers ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Het Google Talk protocol
@@ -1304,19 +1161,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, het IP Telecommunicatie P
 plugin.iptelaccregwizz.USERNAME=Gebruikersnaam
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=lid worden van iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP en chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Gebruikersnaam
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Voor wachtwoord opnieuw in
 plugin.sip2sipaccregwizz.EMAIL=Email adres
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Voor help over deze dienst bezoek<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Het email adres wordt gebruikt om voicemail berichten te versturen,<br>gemiste oproep notificaties en om een verloren wachtwoord te herstellen</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Voor help over deze dienst bezoek <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Bestaand ip2sip.info account
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Maak een gratis sip2sip.info account aan
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Instant Messaging
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Voor help over deze dienst bezoek<br>http://ippi.fr
@@ -1325,6 +1174,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Bestaand ippi account
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Maak een gratis ippi account aan
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Sluit chat venster
 plugin.keybindings.CHAT_COPY=Kopiëren
 plugin.keybindings.CHAT_CUT=Knippen
@@ -1347,10 +1197,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Naam
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primaire sneltoets
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Secundaire sneltoets
 plugin.keybindings.globalchooser.PRESS_BTN=Druk om sneltoets in te stellen
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Wachten
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Indrukken om te spreken
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Detectie van speciale toetsen inschakelen
 plugin.keybindings.PLUGIN_NAME=Toetsenconfiguratie
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Main
 plugin.keybindings.GLOBAL=Globale sneltoetsen
@@ -1378,6 +1228,7 @@ plugin.notificationconfig.tableheader.SOUND=Speel geluid af via het meldingenapp
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Speel geluid af via afspeelapparaat
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Speel een geluid af via PC speaker-apparaat
 plugin.notificationconfig.tableheader.DESCRIPTION=Beschrijving van gebeurtenis
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Binnenkomend gesprek
 plugin.notificationconfig.event.SecurityMessage=Beveiligingsbericht
 plugin.notificationconfig.event.IncomingFile=Binnenkomend bestand
@@ -1479,6 +1330,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Periodieke intra-refresh
 impl.neomedia.configform.H264.defaultProfile=Standaard profiel om in te coderen:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Baseline
 impl.neomedia.configform.H264.defaultProfile.high=Hoog
 impl.neomedia.configform.H264.defaultProfile.main=Algemeen
@@ -1509,7 +1361,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Huidig wachtwoord:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Voer nieuw wachtwoord in:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Voer wachtwoord opnieuw in:
 plugin.securityconfig.masterpassword.MP_TITLE=Hoofd wachtwoord:
-plugin.securityconfig.masterpassword.MP_NOT_SET=(niet ingesteld)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=U heeft niet het correcte hoofd wachtwoord ingevoerd. Probeer het opnieuw.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Het hoofd wachtwoord is niet correct!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Wachtwoordwijziging niet geslaagd
@@ -1525,7 +1376,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Wachtwoord
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(onbekend)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(kan niet decoderen)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Opgeslagen wachtwoorden
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Verwijderen
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Verwijder alle
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Weet u zeker dat u alle wachtwoorden wilt verwijderen?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Verwijder alle wachtwoorden
@@ -1621,7 +1471,6 @@ plugin.globalproxy.PROXY_PORT=Proxy poort
 plugin.globalproxy.PROXY_USERNAME=Proxy gebruikersnaam
 plugin.globalproxy.PROXY_PASSWORD=Proxy wachtwoord
 plugin.globalproxy.DESCRIPTION={0} gebruikt de bovenstaande proxy instellingen voor alle netwerken waarmee u (opnieuw) verbinding maakt vanaf nu.\n Proxy ondersteuning is momenteel experimenteel en werkt alleen met sommige protocollen. Bekijk de tabel hieronder voor meer details:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Ook DNS proxy'en
 plugin.globalproxy.FWD_DNS_NOTE=Nuttig voor Tor. Dit helpt voorkomen dat DNS verzoeken lekken door alle DNS-verkeer te herleiden naar de Tor-proxy. Herstart nodig.
@@ -1659,7 +1508,6 @@ plugin.provisioning.RESTART_WARNING=Merk op dat uw wijzigingen pas van kracht wo
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Kopieer UUID naar klembord
 plugin.provisioning.CLIPBOARD_FAILED=Kopiëren van UUID naar klembord mislukt
-plugin.provisioning.EXIT_ON_FAIL=Sluit de applicatie als provisioning faalt
 plugin.provisioning.CREDENTIALS=Laatste opgeslagen provisioning-aanmeldgegevens
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Weet je zeker dat je het provisioning-wachtwoord wilt verwijderen?
 plugin.provisioning.PROV_FAILED=Provisioning is gefaald
@@ -1726,8 +1574,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} heeft geprobeerd om te verbin
 #plugin spellcheck
 plugin.spellcheck.TITLE=Spelling en Grammatica
 plugin.spellcheck.MENU=Toon Spelling en Grammatica
-plugin.spellcheck.LANG=Taal
-plugin.spellcheck.EDIT_PERSONAL_DICT=&Bewerken
 plugin.spellcheck.ENABLE_SPELL_CHECK=Spellingscontrole inschakelen
 plugin.spellcheck.dialog.FIND=Volgende zoeken
 plugin.spellcheck.dialog.REPLACE=Vervangen
diff --git a/resources/languages/resources_pl.properties b/resources/languages/resources_pl.properties
index 04611e8..a5fac15 100644
--- a/resources/languages/resources_pl.properties
+++ b/resources/languages/resources_pl.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -26,36 +37,30 @@
 # ant -Duser.language=xx run
 
 service.gui.ABOUT=&O programie
-service.gui.ACCEPT=&Zaakceptuj
+service.gui.ACCEPT=&Akceptuj
 service.gui.ACCOUNT=Konto
 service.gui.ACCOUNT_ME=Ja
-service.gui.ACCOUNT_REGISTRATION_WIZARD=Kreator rejestracji konta
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Asystent tworzenia konta
 service.gui.ACCOUNTS=Konta
 service.gui.ADD=&Dodaj
-service.gui.ADD_ACCOUNT=Dodaj konto
 service.gui.ADD_CONTACT=&Dodaj kontakt
-service.gui.ADD_AUTHORIZED_CONTACT=Dodaj {0} do listy kontaktów
+service.gui.ADD_AUTHORIZED_CONTACT=Dodaj {0} do swojej listy kontaktów
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Dodaj ten kontakt do mojej listy kontaktów
 service.gui.ADD_CONTACT_TO=&Dodaj kontakt do
 service.gui.ADD_CONTACT_ERROR=Nie udało się dodać kontaktu o identyfikatorze: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Błąd przy dodawaniu kontaktu
-service.gui.ADD_CONTACT_EXIST_ERROR=Ten kontakt już jest na liście kontaktów.
-service.gui.ADD_CONTACT_NETWORK_ERROR=Serwer nie odpowiedział na żądanie dodania kontaktu o identyfikatorze: {0}
-service.gui.ADD_CONTACT_NOT_SUPPORTED=Próba dodania kontaktu o identyfikatorze {0} została zakończona niepowodzeniem. Operacja nie jest obsługiwana.
-service.gui.ADD_CONTACT_IDENTIFIER=W polu poniżej wprowadź identyfikator kontaktu, którego chcesz dodać.
-service.gui.ADD_CONTACT_WIZARD=Kreator dodawania kontaktu
+service.gui.ADD_CONTACT_EXIST_ERROR=Kontakt {0} już jest na Twojej liście kontaktów.
+service.gui.ADD_CONTACT_NETWORK_ERROR=Serwer nie odpowiedział na żądanie dodania kontaktu o identyfikatorze: {0}.
+service.gui.ADD_CONTACT_NOT_SUPPORTED=Próba dodania kontaktu o identyfikatorze: {0} zakończona niepowodzeniem. Operacja nie jest obsługiwana.
 service.gui.ADD_CONTACT_NOT_CONNECTED=Musisz być połączony aby dodać kontakt. Zaloguj się do wybranego dostawcy i spróbuj ponownie.
 service.gui.ADD_GROUP_LOCAL_ERROR=Nie udało się dodać grupy o nazwie: {0}. Wystąpił błąd lokalnej operacji wejścia/wyjścia.
 service.gui.ADD_GROUP_EXIST_ERROR=Grupa {0} już jest na twojej liście kontaktów. Wybierz inną nazwę.
 service.gui.ADD_GROUP_NET_ERROR=Nie udało się dodać grupy o nazwie: {0}. Problem wystąpił z powodu awarii sieci. Sprawdź połączenie z Internetem i spróbuj ponownie.
 service.gui.ADD_GROUP_ERROR=Nie udało się dodać grupy o nazwie: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Nazwa grupy nie może być pusta.
-service.gui.ADD_GROUP=Utwórz grupę
-service.gui.ADD_SUBCONTACT=&Dodaj kontakt podrzędny
 service.gui.ADDRESS=Adres
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=&Zaawansowane
-service.gui.ALL=&Wszystkie
 service.gui.ALL_CONTACTS=&Wszystkie kontakty
 service.gui.ALTERNATE_ADDRESS=Adres alternatywny
 service.gui.APPLY=&Zastosuj
@@ -63,9 +68,8 @@ service.gui.ARE_CALLING={0} dzwonią...
 service.gui.ARE_NOW=Jesteś teraz {0}
 service.gui.AT=w
 service.gui.AUTHORIZE=&Autoryzuj
-service.gui.AUTHORIZATION_ACCEPTED=Użytkownik {0} zaakceptował twoją prośbę o autoryzację.
+service.gui.AUTHORIZATION_ACCEPTED={0} zaakceptował twoją prośbę o autoryzację.
 service.gui.AUTHENTICATION_FAILED=Błąd uwierzytelniania dla {0}. Wprowadzone hasło jest nieprawidłowe.
-service.gui.AUTHENTICATION_REQUESTED=Prośba o Uwierzytelnienie
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Serwer {0} zażądał uwierzytelnienia.
 service.gui.AUTHENTICATION_REJECTED={0} odrzucił twoją prośbę o autoryzację.
 service.gui.AUTHENTICATION_WINDOW_TITLE=uwierzytelnianie {0}
@@ -74,32 +78,32 @@ service.gui.AUTHORIZATION_REQUESTED_INFO=Kontakt {0} zażądał autoryzacji.
 service.gui.AUTHORIZATION_RESPONSE=Odpowiedź na autoryzację
 service.gui.AWAY_STATUS=Zaraz wracam
 service.gui.EXTENDED_AWAY_STATUS=Nieobecny na dłużej
-service.gui.BAN=&Zabroń wstępu
+service.gui.BAN=Za&blokuj
 service.gui.BANNED=Zablokowany
-service.gui.BAN_FAILED=Niepowodzenie blokady
+service.gui.BAN_FAILED=Nieudana blokada
 service.gui.BAN_FAILED_GENERAL_ERROR=Niepowodzenie blokady {0}. Ogólny błąd serwera.
 service.gui.BAN_FAILED_NOT_ALLOWED=Niepowodzenie blokady {0}. Właściciel/administrator pokoju nie mogą być zablokowani.
 service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Niepowodzenie blokady {0}. Nie masz wystarczających uprawnień.
-service.gui.BRB_MESSAGE=Zaraz wracam.
+service.gui.BRB_MESSAGE=Nie ma mnie, ale za niedługo wrócę
 service.gui.BROWSE=Przeglądaj
 service.gui.BUSY_MESSAGE=Przepraszam, jestem zajęty.
 service.gui.BUSY_STATUS=Zajęty
-service.gui.CALL=Telefon
+service.gui.CALL=Zadzwoń
 service.gui.CALL_CONTACT=Zadzwoń do kontaktu
 service.gui.CALL_FAILED=Połączenie nieudane
-service.gui.CALL_HISTORY_TOOL_TIP=Kliknij tu, by zobaczyć historię połączeń.
+service.gui.CALL_HISTORY_TOOL_TIP=Kliknij tutaj, aby zobaczyć historię połączeń.
 service.gui.CALL_HISTORY_GROUP_NAME=Historia połączeń
 service.gui.CALL_VIA=Zadzwoń przez:
 service.gui.CALL_NAME_OR_NUMBER=Wprowadź nazwę kontaktu lub numer
 service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=To połączenie obsługuje tylko uczestników z sieci {0} i twoje konto {1}. {2} nie zawiera żadnych adresów z tej sieci ani konta.
-service.gui.CALL_WITH=Zadzwoń z
+service.gui.CALL_WITH=Zadzwoń za pomocą
 service.gui.CALL_NO_AUDIO_DEVICE=Karta dźwiękowa nie została skonfigurowana.
 service.gui.CALL_NO_AUDIO_CODEC=Nie włączyłeś żadnych kodeków dźwiękowych.
-service.gui.CALL_NO_DEVICE_CODECS_Q=Czy chcesz kontynuować rozmowę ?
+service.gui.CALL_NO_DEVICE_CODECS_Q=Czy chcesz kontynuować rozmowę?
 service.gui.CANCEL=&Anuluj
 service.gui.CHAT=Czat
 service.gui.CHANGE_FONT=Zmień czcionkę
-service.gui.CHANGE_ROOM_SUBJECT=Zmień temat pokoju...
+service.gui.CHANGE_ROOM_SUBJECT=Zmień temat rozmowy
 service.gui.CHANGE_ROOM_SUBJECT_LABEL=W polu poniżej możesz wprowadzić nowy temat dla tego pokoju.
 service.gui.CHANGE_NICK=Zmień pseudonim
 service.gui.CHANGE_NICKNAME=Zmień pseudonim...
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=W polu poniżej możesz wprowadzić twój nowy
 service.gui.CHANGE_NICKNAME_ERROR=Błąd podczas zmieniania nazwy użytkownika
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Ta nazwa użytkownika już istnieje
 service.gui.CHANGE_VIDEO_QUALITY=Zmień jakość zdalnego video
-service.gui.CHAT_CONFERENCE_LABEL=Konferencje
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Konferencja {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Już przyłączyłeś się do pokoju rozmów {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=Konfiguracja pokoju czatu {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT={0} wyszedł
 service.gui.CHAT_ROOM_USER_KICKED=został wyrzucony z {0}
 service.gui.CHAT_ROOM_USER_QUIT={0} wyszedł
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Wysyłanie wiadomości zostało zablokowane(ograniczono uprawnienia).
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Zapamiętuje pokój rozmów.
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Usuwa wybrany pokój z listy zapisanych pokoi.
 service.gui.CHAT_ROOM_NAME=Nazwa pokoju rozmów
 service.gui.CLEAR_CUSTOM_MESSAGES=Wyczyść własne wiadomości
 service.gui.ROOM_NAME=Pokoje czatu
-service.gui.AUTOJOIN=Autodołączanie
 service.gui.CHANGE_PASSWORD=Zmień hasło
 service.gui.CHAT_ROOM_NAME_INFO=W poniższym polu wprowadź nazwę grupy, którą chcesz utworzyć.
 service.gui.CHAT_ROOM_NOT_EXIST=Pokój {0} nie został znaleziony na serwerze {1}. Zweryfikuj czy wprowadziłeś poprawną nazwę.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Musisz być zalogowany aby dołączyć do pokoju czatowego {0}
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Musisz być zalogowany aby opuścić pokój czatowy.
-service.gui.CHAT_ROOM_NOT_JOINED=Musisz być połączony z pokojem rozmów, aby móc wykonywać dalsze operacje z nim związane.
 service.gui.CHAT_ROOM_OPTIONS=Opcje pokojów czatu
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Ten pokój czatu {0} wymaga rejestracji.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Pokój czatu {0} poprosił o hasło.
@@ -151,21 +150,18 @@ service.gui.CLEAR=Wyczyść
 service.gui.CLOSE=&Zamknij
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Odebrano nową wiadomość mniej niż 2 sekundy temu. Czy na pewno chcesz zamknąć ten czat?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Masz aktywne transfery plików. Czy na pewno chcesz je przerwać?
-service.gui.CONFIRM=Potwierdź
 service.gui.CONNECTED_STATUS=Połączono
 service.gui.CONNECTING=Łączę...
 service.gui.CONNECTING_STATUS=Łączenie
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Łączę*
 service.gui.CONNECTION=Połączenie
-service.gui.CONNECTION_FAILED_MSG=Nieudana próba połączenia z serwerem dla konta: {0}, nazwa serwera: {1}. Sprawdź połączenie sieciowe lub skontaktuj się z administratorem sieci, aby uzyskać więcej informacji.
 service.gui.CONNECTION_EXPIRED_MSG=Nie masz połączenia z serwerem {0}.
 service.gui.CONTACT_NAME=Identyfikator użytkownika lub numer telefonu
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Wybrany kontakt {0} nie obsługuje telefonii.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Wybrany kontakt {0} nie obsługuje czatu podczas konferencji.
 service.gui.CONTACT_PAUSED_TYPING={0} przerwał pisanie
 service.gui.CONTACT_TYPING={0} pisze
+service.gui.CONTACT_TYPING_SEND_FAILED=uh-oh...nie możemy poinformować {0} że pisałeś
 service.gui.CONTACT_INFO=&O kontakcie
-service.gui.CONTACTLIST=Lista kontaktów
 service.gui.CONTACTS=Kontakty
 service.gui.COPY=&Kopiuj
 service.gui.COPY_LINK=&Kopiuj link
@@ -175,17 +171,14 @@ service.gui.CREATE_CHAT_ROOM=&Utwórz pokój czatu...
 service.gui.CREATE_CHAT_ROOM_ERROR=Nie udało się utworzyć pokoju czatu {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Kreator tworzenia pokoju czatu
 service.gui.CREATE_CONFERENCE_CALL=&Utwórz telekonferencję...
-service.gui.CREATE_CONFERENCE_CHAT=&Utwórz czat grupowy...
 service.gui.CREATE_GROUP=&Utwórz grupę...
 service.gui.CREATE_GROUP_NAME=W poniższym polu wprowadź nazwę grupy, którą chcesz utworzyć.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Twoja lista kontaktów nie zawiera żadnej grupy. Najpierw utwórz grupę (Plik/Utwórz grupę).
 service.gui.CREATE_VIDEO_BRIDGE=Utwórz most &video
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Utwórz most &wideo.
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Stwórz/przyłącz się do wideokonferencji
 service.gui.CREATE_VIDEO_CONFERENCE=Utwórz wideokonferencję dla tego pokoju rozmów
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Ten kontakt nie obsługuje sieciowej informacji o kontakcie
 service.gui.CUT=&Wytnij
-service.gui.DATE=Data
 service.gui.DELETE=Usuń
 service.gui.DENY=O&dmów
 service.gui.DESKTOP_SHARING_WARNING=<b>Czy na pewno chcesz włączyć udostępnianie ekranu?</b> <br>Kliknięcie OK pozwoli obecnym rozmówcom zobaczyć twój ekran.
@@ -196,7 +189,6 @@ service.gui.DISCONNECTED_STATUS=Rozłączony
 service.gui.DND_STATUS=Nie przeszkadzać
 service.gui.DO_NOT_ASK_AGAIN=Nie pytaj więcej
 service.gui.DO_NOT_SHOW_AGAIN=Nie wyświetlaj więcej tej wiadomości
-service.gui.DOWNLOAD_NOW=&Pobierz teraz
 service.gui.DRAG_FOR_SHARING=Przeciągnij tutaj, aby udostępnić...
 service.gui.DURATION=czas trwania rozmowy
 service.gui.DESTROY_CHATROOM=Skasuj pokój rozmów
@@ -217,7 +209,6 @@ service.gui.ERROR_RECEIVED_FROM=Otrzymano błąd od {0}
 service.gui.ESTIMATED_TIME=Przewidywany czas:
 service.gui.EVENTS=Zdarzenia
 service.gui.EXIT=&Wyjście
-service.gui.EXTENDED_CRITERIA=Rozszerzone kryteria
 service.gui.GENERAL=Ogólne
 service.gui.GENERAL_ERROR=Błąd ogólny
 service.gui.GROUP_NAME=Nazwa grupy
@@ -259,7 +250,6 @@ service.gui.FONT_ITALIC=Kursywa
 service.gui.FONT_SIZE=Rozmiar
 service.gui.FONT_STYLE=Styl
 service.gui.FONT_UNDERLINE=Podkreślenie
-service.gui.FROM={0} z {1}
 service.gui.GRANT_OWNERSHIP=Przyznaj prawa właściciela...
 service.gui.GRANT_ADMIN=Przyznaj prawa administratora...
 service.gui.GRANT_MODERATOR=Przyznaj prawa moderatora...
@@ -285,14 +275,14 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Czy na pewno chcesz trwale usunąć wszys
 service.gui.HISTORY_REMOVE_ERROR=Błąd przy usuwaniu wiadomości.
 service.gui.HOME=Telefon domowy
 service.gui.HOME_PAGE=Strona domowa
-service.gui.HOUR=Godzina
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identyfikator
 service.gui.IGNORE=&Ignoruj
 service.gui.INSERT_SMILEY=Wstaw emotikonę
 service.gui.INCOMING_CALL=Rozmowa przychodząca od: {0}
-service.gui.INCOMING_SCREEN_SHARE=Rozmowa przychodząca od: {0}
+service.gui.INCOMING_SCREEN_SHARE=Przychodzący ekran współdzielony otrzymany od: {0}
 service.gui.INCOMING_CALL_STATUS=Połączenie przychodzące
+service.gui.INSTANT_MESSAGINGS=Komunikatory Internetowe
 service.gui.IM=IM
 service.gui.INITIATING_CALL_STATUS=Nawiązuję połączenie
 service.gui.INVITATION=Tekst zaproszenia
@@ -305,15 +295,12 @@ service.gui.INVITE_CONTACT_TO_CHAT=Zaproś kontakty do czatu.
 service.gui.INVITE_CONTACT_TO_CALL=Zaproś kontakty do rozmowy.
 service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Zaproś kontakty do mostu wideo
 service.gui.INVITE_REASON=Powód zaproszenia
-service.gui.IS_CALLING=dzwoni...
+service.gui.IS_CALLING={0} dzwoni...
 service.gui.IS_NOW={0} jest teraz {1}
-service.gui.JITSI_WARNING=SIP Communicator zmienił nazwę na Jitsi. <br/> Jeśli chcesz, aby Twoja wersja w dalszym ciągu była aktualizowana pobierz Jitsi teraz. <br/> Przepraszamy za wszelkie niedogodności. <br/> Jitsi dev Team
-service.gui.JITSI_WARNING_TITLE=SIP Communicator staje się Jitsi
 service.gui.JOIN=&Dołącz się
 service.gui.JOIN_AS=D&ołącz się jako
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Dołącz do istniejącej konferencji wideo
 service.gui.JOIN_VIDEO=Połącz z wideo
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Z&amknij
 service.gui.JOB_TITLE=Zawód
 service.gui.JOIN_CHAT_ROOM=&Dołącz do kanału...
 service.gui.JOIN_CHAT_ROOM_TITLE=Dołącz do kanału
@@ -326,28 +313,33 @@ service.gui.KICK_FAILED=Wyrzucenie nie powiodło się
 service.gui.KICK_FAILED_GENERAL_ERROR=Wyrzucenie nie powiodło się {0}. Wystąpił ogólny błąd serwera.
 service.gui.KICK_FAILED_NOT_ALLOWED=Wyrzucenie nie powiodło się {0}. Właściciel i administrator pokoju nie mogą zostać wyrzuceni.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Wyrzucenie nie powiodło się {0}. Nie masz wystarczających praw, by to zrobić.
-service.gui.LAST=Ostatni
 service.gui.LAST_NAME=Nazwisko
 service.gui.LEAVE=&Wyjdź
 service.gui.LIMIT_REACHED_FOR_IP=Masz zbyt wiele istniejących połączeń z lokalnego adresu IP i serwer {0} nie pozwala na utworzenie kolejnych.
 service.gui.LIST=Lista
 service.gui.LOADING_ROOMS=Wczytuję kanały...
+service.gui.LOADING=Ładowanie...
+service.gui.LOCALLY_ON_HOLD_STATUS=Lokalnie zawieszone
+service.gui.LOGIN_NETWORK_ERROR=Nie można zalogować się na konto: Nazwa użytkownika: {0}, nazwa serwera: {1}, z powodu awarii sieci. Proszę sprawdzić swoje połączenie sieciowe.
 service.gui.LOGIN_GENERAL_ERROR=Wystąpił błąd podczas logowania na konto: nazwa użytkownika: {0}, nazwa serwera: {1}:{2}.
+service.gui.LOGIN_INTERNAL_ERROR=Wystąpił błąd podczas logowania się na konto: Nazwa użytkownika: {0}, nazwa serwera: {1}. Jest to najprawdopodobniej wewnętrzny błąd aplikacji. Proszę zgłosić problem do naszych programistów (dev@jitsi.java.net).
+service.gui.LOGIN_INVALID_PROPERTIES_ERROR=Nie można zalogować się na konto: Nazwa użytkownika: {0}, nazwa serwera: {1}, ze względu na problem z konfiguracją konta. Proszę sprawdzić konfigurację swojego konta.
 service.gui.LOGOFF_NOT_SUCCEEDED=Wystąpił błąd podczas wylogowywania z konta: nazwa użytkownika: {0}, nazwa serwera: {1}.
+service.gui.LOW_QUALITY=Niska jakość
 service.gui.MEMBER=członek
+service.gui.MERGE_TO_CALL=Złącz wszystkie połączenia
 service.gui.MESSAGE=Wiadomość
 service.gui.MISSED_CALLS_TOOL_TIP=Nieodebrane rozmowy od:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= i {0} innych
 service.gui.MODERATOR=moderator
-service.gui.MORE=Pokaż więcej
-service.gui.MORE_LABEL=Przenieś
+service.gui.MORE_LABEL=Więcej
 service.gui.MOVE=Przenieś
 service.gui.MOVE_SUBCONTACT=&Przenieś kontakt
 service.gui.MOVE_SUBCONTACT_MSG=Zaznacz kontakt lub grupę, do których chcesz przenieść wybrany kontakt.
+service.gui.MOVE_SUBCONTACT_FAILED=Kontakt wybrany przez ciebie jest taki sam jak \n źródłowy. Proszę wybrać inny kontakt!
 service.gui.MOVE_SUBCONTACT_QUESTION=Czy na pewno chcesz przenieść {0} do {1}?
 service.gui.MOVE_TO_GROUP=&Przenieś do grupy
 service.gui.MOVE_CONTACT=&Przenieś kontakt
-service.gui.MOVE_CONTACT_ERROR=&Kontakt nie może zostać przeniesiony
 service.gui.MSG_DELIVERY_FAILURE=Powyższa wiadomość nie może być dostarczona
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Protokół, którego używasz nie obsługuje wiadomości w trybie offline. Należy poczekać, aż {0} będzie znowu dostępny.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Wystąpił błąd wewnętrzny. Możesz pomóc go naprawić zgłaszając go tutaj http://jitsi.org/Developement/BugsAndIssues.
@@ -361,7 +353,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Musisz mieć połączenie z siecią, że
 service.gui.MULTIPLE_LOGINS=Jesteś zalogowany więcej niż jeden raz z tego samego konta. Użytkownik: {0}, serwer: {1} jest aktualnie odłączony.
 service.gui.MY_CHAT_ROOMS=Dodaj pokój rozmów
 service.gui.MY_CHAT_ROOMS_TITLE=Moje pokoje rozmów
-service.gui.MUTE=Wycisz
 service.gui.MUTUALLY_ON_HOLD_STATUS=Obustronnie zawieś połączenie
 service.gui.NAME=Nazwa
 service.gui.NETWORK=Sieć
@@ -376,6 +367,10 @@ service.gui.NICKNAME=Nick:
 service.gui.NO=Nie
 service.gui.NONE=Brak
 service.gui.NO_CAMERA_AVAILABLE=Brak dostępnej kamery
+service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=Udostępnianie pulpitu nie jest obsługiwane przez ten protokół
+service.gui.NO_VIDEO_ENCODINGS=Brak kodeka wideo dla wybranej konfiguracji
+service.gui.NO_VIDEO_FOR_PROTOCOL=Wideo nie jest wspierane przez ten protokół
+service.gui.NO_AVAILABLE_ROOMS=Lista pokoi dla tego serwera nie jest aktualnie dostępna.
 service.gui.NO_CONTACTS_FOUND=Nie znaleziono pasujących kontaktów. Naciśnij Ctrl+Enter, aby zadzwonić do {0} lub użyj poniższych przycisków.
 service.gui.NO_CONTACTS_FOUND_SHORT=Nie znaleziono pasujących kontaktów.
 service.gui.NO_MESSAGE=Brak wiadomości
@@ -384,7 +379,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Spoza listy kontaktów
 service.gui.SD_QUALITY=Standartowa jakość
 service.gui.OFFLINE=Niedostępny
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Starsze połączenia
 service.gui.ONLINE=Dostępny
 service.gui.OPEN=Otwórz
 service.gui.OPEN_FILE_FROM_IMAGE=Podwójne kliknięcie otworzy plik.
@@ -396,30 +390,40 @@ service.gui.OPEN_ON_ACTIVITY=otwórz kiedy aktywny
 service.gui.OPEN_ON_MESSAGE=Tylko dla wiadomości
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Tylko dla ważnych wiadomości
 service.gui.OR=lub
-service.gui.OR_ENTER_PHONE_NUMBER=Lub wprowadź tu number telefonu...
 service.gui.ORGANIZATION=Organizacja
 service.gui.OTHER=Inne
 service.gui.chat.role.OWNER=Właściciel
 service.gui.chat.role.ADMINISTRATOR=administrator
-service.gui.chat.role.MODERATOR=moderator
-service.gui.chat.role.MEMBER=członek
+service.gui.chat.role.MODERATOR=Moderator
+service.gui.chat.role.MEMBER=Członek
+service.gui.chat.role.GUEST=Gość
 service.gui.OWNER=właściciel pokoju
 service.gui.PASSWORD=Hasło
 service.gui.PASSWORD_CHANGE_FAILURE=Zmiana hasła nie powiodła się
 service.gui.PASSWORD_CHANGE_SUCCESS=Hasło główne zostało zmienione
 service.gui.PASTE=&Wklej
+service.gui.PERSONAL=Osobiste
 service.gui.PORT=Port
+service.gui.POSTAL_CODE=Kod pocztowy
 service.gui.PREFERENCES=Ustawienia
+service.gui.PREFIX=Przedrostek
 service.gui.PRESENCE=Dostępność
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' wyświetli propozycje
+service.gui.PRESS_FOR_CALL_INFO=Naciśnij aby uzyskać informację o połączeniu
 service.gui.PREVIOUS=Poprzedni
-service.gui.PREVIOUS_TOOLTIP=Przeglądaj starsze połączenia
 service.gui.PRINT=&Drukuj
 service.gui.PROACTIVE_NOTIFICATION=pisze wiadomość
+service.gui.PROBLEMS_ENCOUNTERED=Napotkane problemy
 service.gui.PROTOCOL=Protokół
+service.gui.PUT_OFF_HOLD=Zawieś
+service.gui.PUT_ON_HOLD=Zawieś
 service.gui.QUIT=&Zakończ
 service.gui.READY=Gotowe
+service.gui.RECENT_MESSAGES=Ostatnie konwersacje/rozmowy
 service.gui.REASON=Powód
+service.gui.RECEIVED={0} otrzymał
+service.gui.RE_REQUEST_AUTHORIZATION=Ponownie poproś o autoryzację
+service.gui.REFERRED_STATUS=Odnosi się
 service.gui.REJECT=&Odrzuć
 service.gui.REMEMBER_PASSWORD=Zapamiętaj hasło
 service.gui.REMOVE=&Usuń
@@ -427,28 +431,30 @@ service.gui.REMOVE_ACCOUNT=&Usuń konto
 service.gui.REMOVE_ACCOUNT_MESSAGE=Czy na pewno chcesz usunąć to konto?
 service.gui.REMOVE_CONTACT=&Usuń kontakt
 service.gui.REMOVE_CONTACT_TEXT=<DIV>Czy na pewno chcesz usunąć <B> {0} </B><BR>z listy kontaktów?</DIV>
+service.gui.REMOVE_CONTACT_NOT_CONNECTED=Musisz być połączony w celu usunięcia tego kontaktu. Zaloguj się i spróbuj ponownie.
 service.gui.REMOVE_GROUP=&Usuń grupę
+service.gui.REMOTELY_ON_HOLD_STATUS=Zdalnie zawieszony
 service.gui.RENAME=&Zmień nazwę
 service.gui.RENAME_CONTACT=&Zmień nazwę kontaktu
 service.gui.RENAME_CONTACT_WIZARD=W poniższym polu wpisz nazwę, którą chcesz używać dla tego kontaktu.
 service.gui.RENAME_GROUP=&Zmień nazwę grupy
 service.gui.RENAME_GROUP_INFO=W poniższym polu wpisz nazwę, którą chcesz używać dla tej grupy.
+service.gui.RENAME_CLEAR_USER_DEFINED=Przywróć
+service.gui.RINGING_STATUS=Dzwoni
+service.gui.REQUEST=&Żądanie
+service.gui.REQUEST_AUTHORIZATION=&Poproś o autoryzację
 service.gui.RETRY=Ponów
 service.gui.SAVE=&Zapisz
 service.gui.SEARCH=&Wyszukiwanie
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Kliknij przycisk poniżej, aby zobaczyć wszystkie czaty istniejące na wybranym serwerze. Następnie wybierz jeden do którego chcesz dołączyć i kliknij przycisk połącz.
+service.gui.SEARCH_STRING_CONTACT_SOURCE=Wyszukane kontakty
 service.gui.SECURITY=Zabezpieczenia
-service.gui.SELECT_ACCOUNT=Wybierz konto
 service.gui.SELECT_COLOR=Wybierz kolor
 service.gui.SELECT_GROUP=Wybierz grupę
-service.gui.SELECT_GROUP_WIZARD_MSG=Poniższa lista zawiera wszystkie grupy z twojej listy kontaktów. Wybierz tę, do której chcesz dodać nowy kontakt.
 service.gui.SELECT_NO_GROUP=Brak grup
-service.gui.SELECT_GROUP_WIZARD=Określ grupę
-service.gui.SELECT_PROVIDERS_WIZARD=Wybierz konto
 service.gui.SEND=&Wyślij
 service.gui.SEND_FILE=Wyślij &plik
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Brak informacji o tym kontakcie.
 service.gui.SEND_MESSAGE=&Wyślij wiadomość
-service.gui.SEND_AS_SMS=Wyślij jako SMS
 service.gui.SEND_SMS=W&yślij SMS
 service.gui.SEND_SMS_DETAILS=Pamiętaj, że należy wpisywać numery z kodem kraju; dla Polski +48 (np. +48777000000)
 service.gui.SEND_SMS_NOT_SUPPORTED=Wybrany protokół nie obsługuje SMS-ów.
@@ -468,6 +474,11 @@ service.gui.TOOLS=Na&rzędzia
 service.gui.TO=&Do:
 service.gui.UNKNOWN=Nieznany użytkownik
 service.gui.VIDEO_CALL=&Rozmowa wideo
+service.gui.VIEW=&Widok
+service.gui.VIEW_HISTORY=Pokaż &historię
+service.gui.VIEW_SMILEYS=Pokaz &buźki
+service.gui.VIEW_TOOLBAR=Pokaż &pasek narzedzi
+service.gui.VIEW_SIMPLE_CHAT_THEME=prosty motyw/widok czatu
 service.gui.VOICEMAIL_NEW_OLD_RECEIVED={0} nowych i {1} starych wiadomości
 service.gui.VOICEMAIL_NEW_RECEIVED={0} nowych wiadomości
 service.gui.VOICEMAIL_OLD_RECEIVED={0} starych wiadomości
@@ -475,15 +486,12 @@ service.gui.VOICEMAIL_NO_MESSAGES=Brak wiadomości.
 service.gui.VOLUME_CONTROL_TOOL_TIP=Reguluj głośność
 service.gui.WARNING=Ostrzeżenie
 service.gui.YES=Tak
-service.gui.YESTERDAY=Wczoraj
-service.gui.EXISTING_ACCOUNT_ERROR=Wybrane konto zostało już zainstalowane.
 service.gui.ACTIVATE=Włącz
 service.gui.DEACTIVATE=Wyłącz
 service.gui.NEW=Nowa
 service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Włącz tryb pełnoekranowy
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Wyłącz tryb pełnoekranowy
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Pokaż/ukryj lokalne wideo
-service.gui.UPDATE=Aktualizuj
 service.gui.VIDEO_PHONE=Wideo
 service.gui.PHONE=Telefon
 service.gui.PHONES=Telefony
@@ -502,10 +510,15 @@ service.gui.OCTOBER=PAŹ
 service.gui.NOVEMBER=LIS
 service.gui.DECEMBER=GRU
 
-service.gui.callinfo.VIEW_CERTIFICATE=Pokaż certyfikat
+service.gui.callinfo.VIEW_CERTIFICATE=Wyświetl certyfikat
 service.gui.callinfo.MEDIA_STREAM_RTP=RTP
 service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_O=Organizacja:
 service.gui.CERT_INFO_C=Kraj:
 service.gui.CERT_INFO_ST=Region:
@@ -518,11 +531,9 @@ service.gui.CERT_INFO_VER=Wersja:
 service.gui.CERT_INFO_SIGN_ALG=Algorytm podpisu:
 service.gui.CERT_INFO_ALG=Algorytm:
 service.gui.CERT_INFO_PUB_KEY=Klucz publiczny:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bajtów: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bitów
 service.gui.CERT_INFO_KEY_SIZE=Długość klucza:
 service.gui.CERT_INFO_SIGN=Podpis:
-service.gui.CONTINUE=Kontynuuj
 service.gui.SHOW_CERT=Pokaż certyfikat
 service.gui.HIDE_CERT=Ukryj certyfikat
 
@@ -541,14 +552,9 @@ service.gui.avatar.imagepicker.IMAGE_PICKER=Obraz
 service.gui.avatar.imagepicker.RESET=Resetuj
 service.gui.avatar.imagepicker.SET=Ustaw
 service.gui.avatar.imagepicker.TAKE_PHOTO=Zrób zdjęcie
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Błąd kamery internetowej
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 
 # systray
@@ -562,9 +568,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=wybierz sieć
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=Konfiguracja LDAP
 impl.ldap.GENERAL=Ogólne
-impl.ldap.NEW=Nowy
 impl.ldap.EDIT=edytuj
-impl.ldap.REMOVE=Usuń
 impl.ldap.ENABLED=Włączony
 impl.ldap.SERVER_NAME=Nazwa serwera
 impl.ldap.SERVER_NAME_EXAMPLE=Mój serwer LDAP
@@ -580,6 +584,10 @@ impl.ldap.PASSWORD=Hasło
 impl.ldap.MAIL_FIELD_EXAMPLE=E-mail:
 impl.ldap.MAILSUFFIX_FIELD_EXAMPLE=@domena.org (nie zapomnij dodać '@')
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Książka adresowa
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Włącz wyszukiwanie w książce adresowej MacOSX
@@ -587,9 +595,7 @@ plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=Włącz wyszukiwanie Microsoft Outlook
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Kontakty Google
-impl.googlecontacts.NEW=Nowy
 impl.googlecontacts.EDIT=edytuj
-impl.googlecontacts.REMOVE=Usuń
 impl.googlecontacts.ENABLED=Włączony
 impl.googlecontacts.ACCOUNT_NAME=Nazwa konta
 impl.googlecontacts.SAVE=Zapisz
@@ -607,11 +613,12 @@ plugin.accountinfo.NICKNAME=Nick:
 plugin.accountinfo.AGE=Wiek:
 plugin.accountinfo.BDAY=Data urodzenia:
 plugin.accountinfo.GENDER=Płeć:
+plugin.accountinfo.CITY=Miasto
+plugin.accountinfo.POST=Kod pocztowy
+plugin.accountinfo.COUNTRY=Kraj
 plugin.accountinfo.EMAIL=E-mail:
 plugin.accountinfo.PHONE=Telefon:
-plugin.accountinfo.USER_PICTURES=Zdjęcia użytkownika
-plugin.accountinfo.CHANGE=Zmień
-plugin.accountinfo.ONLY_MESSAGE=Tylko wiadomości
+plugin.accountinfo.JOB_TITLE=Zawód
 
 # connection info
 
@@ -626,27 +633,11 @@ plugin.aimaccregwizz.USERNAME=Nazwa ekranowa AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Nazwa użytkownika i hasło
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Zarejestruj nowe konto:
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Jeżeli nie masz konta AIM, kliknij ten przycisk, żeby je utworzyć.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Nie uwzględniaj domyślnych opcji serwera
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=O {0}
 plugin.branding.ABOUT_MENU_ENTRY=&O programie
 
-# Dict protocol
-service.protocol.DICTIONARIES=Słowniki
-plugin.dictaccregwizz.ANY_DICTIONARY=Dowolny słownik
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Dowolny słownik z {0}
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Protokół Dict
-plugin.dictaccregwizz.SERVER_INFO=Informacje o serwerze
-plugin.dictaccregwizz.STRATEGY_SELECTION=Wybór strategii
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informacje o koncie Dict
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Protokół czatu Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nazwa użytkownika:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nazwa użytkownika i hasło
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Uruchom automatycznie {0} po uruchomieniu systemu
@@ -654,8 +645,6 @@ plugin.generalconfig.LOG_HISTORY=Zapisuj historię czatów
 plugin.generalconfig.SHOW_HISTORY=Wyświetl
 plugin.generalconfig.HISTORY_SIZE=ostatnich wiadomości w nowym czacie
 plugin.generalconfig.SEND_MESSAGES_WITH=Wysyłaj wiadomości po naciśnięciu:
-plugin.generalconfig.TRANSPARENCY=Przezroczystość
-plugin.generalconfig.ENABLE_TRANSPARENCY=Włącz przezroczystość
 plugin.generalconfig.DEFAULT_LANGUAGE=Język interfejsu
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Zmiany zostaną zastosowane po ponownym uruchomieniu programu.
 plugin.generalconfig.SIP_CLIENT_PORT=Port klienta SIP
@@ -686,11 +675,12 @@ plugin.ircaccregwizz.INFO_PASSWORD=Większość serwerów IRC nie wymaga hasła.
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Używaj domyślnego portu
 plugin.ircaccregwizz.HOST=Nazwa hosta:
 plugin.ircaccregwizz.IRC_SERVER=Serwer
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=uwierzytelnianie {0}
+plugin.ircaccregwizz.SASL_USERNAME=Nazwa użytkownika
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Protokół XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Potwierdź hasło
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=Nazwa użytkownika i hasło
 plugin.jabberaccregwizz.CSERVER=Serwer
 plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=Rejestracja nowego konta XMPP
 plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Utwórz darmowe konto XMPP
@@ -699,13 +689,9 @@ plugin.jabberaccregwizz.CHOOSE=&Wybierz
 plugin.jabberaccregwizz.SERVER_COLUMN=Serwer
 plugin.jabberaccregwizz.COMMENT_COLUMN=Komentarz
 plugin.jabberaccregwizz.PRIORITY=Priorytet
-plugin.jabberaccregwizz.XMPP_ERROR=Błąd XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Nieznany błąd XMPP. Sprawdź, czy nazwa serwera jest poprawna.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Podane hasła nie są takie same.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Przestaw domyślne opcje serwera
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Opcje zaawansowane
 plugin.jabberaccregwizz.USE_ICE=Używaj ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Używaj Google Jingle/ICE (funkcja eksperymentalna)
 plugin.jabberaccregwizz.TURN_USERNAME=Nazwa użytkownika TURN 
 plugin.jabberaccregwizz.IP_ADDRESS=Adres IP
 plugin.jabberaccregwizz.ADD_STUN_SERVER=Dodaj serwer STUN
@@ -716,29 +702,14 @@ plugin.jabberaccregwizz.NO_STUN_USERNAME=Wpisz ważną nazwę użytkownika serwe
 plugin.jabberaccregwizz.JID_ADDRESS=Adres JID
 plugin.jabberaccregwizz.USE_UPNP=Używaj UPnP
 plugin.jabberaccregwizz.EXISTING_ACCOUNT=Istniejące konto XMPP
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Potwierdź nowe hasło
 plugin.jabberaccregwizz.ENCODINGS=Kodowania
 plugin.jabberaccregwizz.AUDIO=Audio
 plugin.jabberaccregwizz.VIDEO=Wideo
 plugin.jabberaccregwizz.RESET=Resetuj
 
-# mailbox
-plugin.mailbox.OUTGOING=Wiadomość wychodząca:
-plugin.mailbox.INCOMING=Wiadomości przychodzące:
-plugin.mailbox.CONFIRM=Potwierdź
-plugin.mailbox.DEFAULTS=Domyślne
-plugin.mailbox.MAILBOX=Skrzynka pocztowa
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Protokół do połączeń i czatu w usłudze MSN.
-plugin.msnaccregwizz.USERNAME=E-mail:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Nazwa użytkownika i hasło
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Zainstaluj
 plugin.pluginmanager.UNINSTALL=Odinstaluj
-plugin.pluginmanager.UPDATE=Aktualizuj
 plugin.pluginmanager.PLUGINS=Wtyczki
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.CHOOSE_FILE=Wybierz plik
@@ -761,10 +732,8 @@ plugin.sipaccregwizz.REGISTRAR=Rejestrator
 plugin.sipaccregwizz.SERVER_PORT=Port serwera
 plugin.sipaccregwizz.PROXY=Serwer pośredniczący
 plugin.sipaccregwizz.PROXY_PORT=Port serwera pośredniczącego
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Opcje zaawansowane
 plugin.sipaccregwizz.PROXY_OPTIONS=Opcje serwera
 plugin.sipaccregwizz.PROXY_AUTO=Konfiguruj pośrednika automatycznie
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Uchyl domyślne opcje serwera
 plugin.sipaccregwizz.DISPLAY_NAME=Wyświetlana nazwa
 plugin.sipaccregwizz.EXISTING_ACCOUNT=Istniejące konto SIP
 plugin.sipaccregwizz.CREATE_ACCOUNT=Utwórz darmowe konto SIP
@@ -773,6 +742,7 @@ plugin.sipaccregwizz.CLIST_TYPE=Typ
 plugin.sipaccregwizz.XCAP_USER=Użytkownik
 plugin.sipaccregwizz.XCAP_PASSWORD=Hasło
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Podane hasła nie są takie same.
+#used from SecurityPanel
 
 # skin manager
 plugin.skinmanager.SKINS=Skórki
@@ -780,13 +750,6 @@ plugin.skinmanager.DEFAULT_SKIN=Skórka domyślna
 plugin.skinmanager.ADD_NEW_SKIN=Dodaj nową skórkę...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Skórka domyślna programu.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Protokół nawiązywania połączeń ze zdalnymi maszynami przez SSH.
-plugin.sshaccregwizz.USERNAME=Identyfikator konta:
-plugin.sshaccregwizz.OPTIONAL=Opcjonalny
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Szczegóły konta
-
 # status update
 plugin.autoaway.AUTO_STATUS=Automatyczny status "nie ma mnie"
 plugin.autoaway.ENABLE_CHANGE_STATUS=Zmień status, kiedy odejdę od komputera
@@ -825,21 +788,6 @@ plugin.whiteboard.DESELECT=Odznacz
 plugin.whiteboard.DELETE=Usuń
 plugin.whiteboard.PROPERTIES=Właściwości
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Protokół czatu w usłudze Yahoo.
-plugin.yahooaccregwizz.USERNAME=Nazwa użytkownika:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Nazwa użytkownika i hasło
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Protokół usługi Zeroconf (Bonjour)
-plugin.zeroaccregwizz.FIRST_NAME=Imię:
-plugin.zeroaccregwizz.LAST_NAME=Nazwisko:
-plugin.zeroaccregwizz.EMAIL=E-mail:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Zapamiętać kontakty Bonjour?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=Nazwa użytkownika i hasło
-plugin.zeroaccregwizz.USERID=Nazwa użytkownika
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Protokół Google Talk
 plugin.googletalkaccregwizz.USERNAME=Nazwa użytkownika Google Talk
@@ -852,18 +800,10 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, portal IP Telecommunicati
 plugin.iptelaccregwizz.USERNAME=Nazwa użytkownika
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Zarejestruj się na iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP i czat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Nazwa użytkownika
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Wprowadź hasło ponownie
 plugin.sip2sipaccregwizz.EMAIL=Adres e-mail
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Informacje o tej usłudze pod adresem<br>http://wiki.sip2sip.info
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Informacje o tej usłudze znajdziesz pod adresem <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Istniejące konto sip2sip.info
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Utwórz konto sip2sip.info
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && komunikator internetowy
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Informacje o tej usłudze pod adresem<br>http://ippi.fr
@@ -872,6 +812,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Istniejące konto ippi
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Utwórz darmowe konto ippi
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Zamknij okno czatu
 plugin.keybindings.CHAT_COPY=Kopiuj
 plugin.keybindings.CHAT_CUT=Wytnij
@@ -887,6 +828,7 @@ plugin.keybindings.OPEN_HISTORY=Wyświetl historię
 plugin.keybindings.OPEN_SMILIES=Pokaż emotikony
 plugin.keybindings.globalchooser.SHORTCUT_NAME=Nazwa
 plugin.keybindings.PLUGIN_NAME=Skróty klawiszowe
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Czat
 plugin.keybindings.MAIN=Główne
 
@@ -902,6 +844,7 @@ plugin.notificationconfig.EXEC_PROG=Uruchom program:
 plugin.notificationconfig.DISPLAY_POPUP=Wyświetl wiadomość w wyskakującym oknie
 plugin.notificationconfig.POPUP_NOTIF_HANDLER=Typ wyskakujących powiadomień
 plugin.notificationconfig.tableheader.EXECUTE=Uruchom program
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Połączenie przychodzące
 plugin.notificationconfig.event.IncomingFile=Połączenie przychodzące
 plugin.notificationconfig.event.IncomingMessage=Wiadomości przychodzące
@@ -950,6 +893,7 @@ impl.neomedia.configform.AUDIO=Audio
 impl.neomedia.configform.VIDEO=Wideo
 
 impl.neomedia.configform.H264=H.264
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.main=Główne
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTCP
 
@@ -974,7 +918,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Obecne hasło:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Wprowadź nowe hasło:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Wprowadź hasło ponownie:
 plugin.securityconfig.masterpassword.MP_TITLE=Hasło główne
-plugin.securityconfig.masterpassword.MP_NOT_SET=(nieustawione)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Nie wprowadzono poprawnego hasła głównego. Spróbuj ponownie.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Hasło główne nie jest poprawne.
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Zmiana hasła nie powiodła się
@@ -988,7 +931,6 @@ plugin.securityconfig.masterpassword.COL_NAME=Nazwa
 plugin.securityconfig.masterpassword.COL_PASSWORD=Hasło
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(nieznany)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(nie mogę rozszyfrować)
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Usuń
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Usuń wszystkie
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Czy na pewno chcesz usunąć wszystkie hasła?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Usuń wszystkie hasła
@@ -1034,7 +976,6 @@ plugin.globalproxy.PROXY_ADDRESS=Serwer proxy
 plugin.globalproxy.PROXY_PORT=Port proxy
 plugin.globalproxy.PROXY_USERNAME=Login proxy
 plugin.globalproxy.PROXY_PASSWORD=Hasło proxy
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -1077,10 +1018,9 @@ plugin.dnsconfig.PARALLEL_DNS=Równoległy DNS
 plugin.dnsconfig.lblBackupResolver.text=Nazwa hosta
 plugin.dnsconfig.lblBackupPort.text=Port
 net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=Ignoruj
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=O&dmów
 
 #plugin spellcheck
-plugin.spellcheck.LANG=Język
-plugin.spellcheck.EDIT_PERSONAL_DICT=Edycja
 plugin.spellcheck.ENABLE_SPELL_CHECK=Włącz sprawdzanie pisowni
 plugin.spellcheck.dialog.FIND=Znajdź następny
 plugin.spellcheck.dialog.REPLACE=Zastąp
diff --git a/resources/languages/resources_pt.properties b/resources/languages/resources_pt.properties
index 3f959e5..037763c 100644
--- a/resources/languages/resources_pt.properties
+++ b/resources/languages/resources_pt.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Eu
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Assistente de criação de contas
 service.gui.ACCOUNTS=Contas
 service.gui.ADD=&Adicionar
-service.gui.ADD_ACCOUNT=Adicionar conta
 service.gui.ADD_CONTACT=&Adicionar contato
 service.gui.ADD_AUTHORIZED_CONTACT=Adicionar {0} a sua lista de contatos
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Adicionar este contato à sua lista
@@ -42,20 +52,15 @@ 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_NETWORK_ERROR=O servidor não respondeu ao seu pedido de adição de contato com o id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Falha ao adicionar o contato de ID: {0}. Operação não suportada.
-service.gui.ADD_CONTACT_IDENTIFIER=Insira no campo abaixo o identificador do contato que pretende adicionar.
-service.gui.ADD_CONTACT_WIZARD=Assistente para adicionar contato
 service.gui.ADD_CONTACT_NOT_CONNECTED=Você precisa de estar conectado para poder adicionar um contacto. Por favor registre-se no provedor selecionado e tente novamente.
 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 de IO local.
 service.gui.ADD_GROUP_EXIST_ERROR=O grupo {0} já existe na sua lista de contatos. Escolha outro nome.
 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 conexã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_EMPTY_NAME=O nome do grupo não pode estar vazio.
-service.gui.ADD_GROUP=Criar grupo
-service.gui.ADD_SUBCONTACT=&Adicionar subcontato
 service.gui.ADDRESS=Endereço
 service.gui.ADMINISTRATOR=administrador
 service.gui.ADVANCED=&Avançadas
-service.gui.ALL=&Todos
 service.gui.ALL_CONTACTS=&Todos os contactos
 service.gui.ALTERNATE_ADDRESS=Endereço alternativo
 service.gui.APPLY=&Aplicar
@@ -65,7 +70,6 @@ service.gui.AT=em
 service.gui.AUTHORIZE=&Autorizar
 service.gui.AUTHORIZATION_ACCEPTED={0} rejeitou o seu pedido de autorização.
 service.gui.AUTHENTICATION_FAILED=Falha na autenticação da conta para {0}. A senha utilizada é inválida.
-service.gui.AUTHENTICATION_REQUESTED=Pedido de autorização submetido
 service.gui.AUTHENTICATION_REQUESTED_SERVER=O {0} servidor pede que se autentique.
 service.gui.AUTHENTICATION_REJECTED={0} rejeitou o seu pedido de autorização.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autenticação
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=No campo em baixo, pode inserir a sua nova alc
 service.gui.CHANGE_NICKNAME_ERROR=Erro ao alterar a alcunha
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Nome já existe
 service.gui.CHANGE_VIDEO_QUALITY=Mudar a qualidade do video remoto
-service.gui.CHAT_CONFERENCE_LABEL=Conferencias
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}''s conferencia
 service.gui.CHAT_ROOM_ALREADY_JOINED=Já está participando na sala {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=configuração da sala {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT={0} saiu da sala
 service.gui.CHAT_ROOM_USER_KICKED={0} foi expulso da sala
 service.gui.CHAT_ROOM_USER_QUIT={0} saiu da sala
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=O envio da mensagem foi negado (voz não permitida)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Salvar a sala de conversa para usos futuros
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Eliminar a sala de conversa selecionada da lista de salas salvas
 service.gui.CHAT_ROOM_NAME=Nome da sala
 service.gui.CLEAR_CUSTOM_MESSAGES=Limpar mensagens personalizadas
 service.gui.ROOM_NAME=Sala de conversa
-service.gui.AUTOJOIN=Participar automaticamente
 service.gui.CHANGE_PASSWORD=Mudar password
 service.gui.CHAT_ROOM_NAME_INFO=Insira no campo abaixo o nome da sala que pretende criar.
 service.gui.CHAT_ROOM_NOT_EXIST=A sala {0} não foi encontrada no servidor {1}. Por favor verifique se inseriu o nome correctamente.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Precisa estar ligado para poder entrar na sala {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Precisa estar ligado para poder sair de uma sala.
-service.gui.CHAT_ROOM_NOT_JOINED=Você tem de estar a participar numa sala para poder realizar operações sobre ela.
 service.gui.CHAT_ROOM_OPTIONS=Opções da sala
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Precisa estar registado para poder entrar na sala {0}.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=A sala {0} necessita que insira uma palavra-passe.
@@ -150,22 +149,18 @@ service.gui.CLEAR=Limpar
 service.gui.CLOSE=Fechar
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Você recebeu uma nova mensagem há menos de 2 segundos. Tem a certeza que deseja fechar esta conversa?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Você tem transferências de ficheiros activas. Tem a certeza que as deseja cancelar?
-service.gui.CONFIRM=Confirmar
 service.gui.CONNECTED_STATUS=Ligação estabelecida
 service.gui.CONNECTING=Ligando-se...
 service.gui.CONNECTING_STATUS=Ligando-se
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Conectando*
 service.gui.CONNECTION=Ligação
-service.gui.CONNECTION_FAILED_MSG=A ligação falhou para a seguinte conta: Nome de utilizador: {0}, Nome do servidor: {1}. POr favor verifique a sua ligação de rede ou contacte o seu administrador de rede para mais informação.
 service.gui.CONNECTION_EXPIRED_MSG=Você encontra-se de momento desligado do servidor {0}.
 service.gui.CONTACT_NAME=ID ou número
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=O contacto {0} não suporta chamadas.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=O contacto {0} não suporta conferências de mensagens escritas.
 service.gui.CONTACT_PAUSED_TYPING={0} parou de escrever a mensagem
 service.gui.CONTACT_TYPING={0} está a escrever uma messagem
 service.gui.CONTACT_TYPING_SEND_FAILED=hoooo... não conseguimos dizer se {0} está a escrever
 service.gui.CONTACT_INFO=&Informação do contacto
-service.gui.CONTACTLIST=Lista de contato
 service.gui.CONTACTS=Contactos
 service.gui.COPY=&Copiar
 service.gui.COPY_LINK=Copiar &hiperligação
@@ -175,17 +170,14 @@ service.gui.CREATE_CHAT_ROOM=&Criar sala de conversa...
 service.gui.CREATE_CHAT_ROOM_ERROR=Falha na criação da sala com o nome: {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Assistente de criação de sala
 service.gui.CREATE_CONFERENCE_CALL=&Criar uma chamada com múltiplos participantes...
-service.gui.CREATE_CONFERENCE_CHAT=&Iniciar uma conversa com múltiplos participantes...
 service.gui.CREATE_GROUP=&Criar grupo...
 service.gui.CREATE_GROUP_NAME=Insira no campo abaixo o nome do grupo que pretende criar.
-service.gui.CREATE_FIRST_GROUP_WIZARD=A sua lista de contactos não contêm grupos. Por favor primeiro crie um grupo (Ficheiro/Criar grupo).
 service.gui.CREATE_VIDEO_BRIDGE=Criar uma ligação de video...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Criar uma ligação de video
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Crie / Junte-se a uma videoconferencia
 service.gui.CREATE_VIDEO_CONFERENCE=Crie uma nova videoconferencia para esta sala de conversa
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Este contacto não suporta informação de contacto via web
 service.gui.CUT=C&ortar
-service.gui.DATE=Data
 service.gui.DELETE=Apagar
 service.gui.DENY=&Negar
 service.gui.DESKTOP_SHARING_WARNING=<b>Tem a certeza que deseja iniciar o compartilhamento de tela?</b> <br> Clique em OK para as pessoas nesta conversa verem sua tela.
@@ -195,7 +187,6 @@ service.gui.DISCONNECTED_STATUS=Desconectado
 service.gui.DND_STATUS=Não perturbar
 service.gui.DO_NOT_ASK_AGAIN=Não pergunte de novo
 service.gui.DO_NOT_SHOW_AGAIN=Não mostrar esta mensagem novamente
-service.gui.DOWNLOAD_NOW=&Baixar agora
 service.gui.DRAG_FOR_SHARING=Arraste para aqui qualquer coisa que deseje partilhar...
 service.gui.DURATION=duração
 service.gui.DESTROY_CHATROOM=Destruir sala de conversação
@@ -216,7 +207,6 @@ service.gui.ERROR_RECEIVED_FROM=Erro recebido de {0}
 service.gui.ESTIMATED_TIME=Tempo estimado:
 service.gui.EVENTS=Eventos
 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
@@ -258,7 +248,6 @@ service.gui.FONT_ITALIC=Itálico
 service.gui.FONT_SIZE=Tamanho
 service.gui.FONT_STYLE=Estilo
 service.gui.FONT_UNDERLINE=Sublinhado
-service.gui.FROM={0} de {1}
 service.gui.GRANT_OWNERSHIP=Conceder a posse...
 service.gui.GRANT_ADMIN=Conceder administrador...
 service.gui.GRANT_MODERATOR=Conceder categoria de moderador
@@ -284,12 +273,12 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Tem certeza que deseja remover permanente
 service.gui.HISTORY_REMOVE_ERROR=Erro ao remover as mensagens armazenadas localmente.
 service.gui.HOME=Casa
 service.gui.HOME_PAGE=Página inicial
-service.gui.HOUR=Hora
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identificador
 service.gui.IGNORE=&Ignorar
 service.gui.INSERT_SMILEY=Inserir smiley
 service.gui.INCOMING_CALL=Chamadas recebidas de: {0}
+service.gui.INCOMING_SCREEN_SHARE=Chamadas recebidas de: {0}
 service.gui.INCOMING_CALL_STATUS=Chamada recebida
 service.gui.INSTANT_MESSAGINGS=IM's
 service.gui.IM=IM
@@ -306,13 +295,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Convidar contactos para a videoconfer
 service.gui.INVITE_REASON=Razão do convite
 service.gui.IS_CALLING={0} está a chamar...
 service.gui.IS_NOW={0} está {1}
-service.gui.JITSI_WARNING=O SIP Communicator foi recentemente renomeado para Jitsi.<br/>Se pretender manter a sua versão actualizada, faça o download do Jitsi agora.<br/><br/>Pedimos desculpa por qualquer inconveniente que possa causar-lhe.<br/><br/>A equipa de desenvolvimento do Jisti
-service.gui.JITSI_WARNING_TITLE=O SIP Comunicator tornou-se Jitsi
 service.gui.JOIN=&Entrar
 service.gui.JOIN_AS=E&ntrar como
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Associar-se a uma videoconferência existente
 service.gui.JOIN_VIDEO=Juntar video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=F&echar
 service.gui.JOB_TITLE=Cargo
 service.gui.JOIN_CHAT_ROOM=&Entrar no chat room...
 service.gui.JOIN_CHAT_ROOM_TITLE=Entrar no chat room
@@ -325,7 +311,6 @@ 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 da sala.
 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.LAST_NAME=Apelido
 service.gui.LEAVE=&Abandonar
 service.gui.LIMIT_REACHED_FOR_IP=Você tem demasiados registos em uso a partir do mesmo endereço IP local, o {0} servidor não permite abrir mais registos.
@@ -345,7 +330,6 @@ service.gui.MESSAGE=Mensagem
 service.gui.MISSED_CALLS_TOOL_TIP=Chamadas perdidas de:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= e {0} mais
 service.gui.MODERATOR=moderador
-service.gui.MORE=Ver mais
 service.gui.MORE_LABEL=Mais
 service.gui.MOVE=Mover
 service.gui.MOVE_SUBCONTACT=M&over contacto
@@ -354,7 +338,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=O contato que escolheu é o mesmo que o \n co
 service.gui.MOVE_SUBCONTACT_QUESTION=Tem a certeza que pretende mover {0} para {1}?
 service.gui.MOVE_TO_GROUP=&Mover para o grupo
 service.gui.MOVE_CONTACT=M&over Subcontato
-service.gui.MOVE_CONTACT_ERROR=&Não é possível mover o contacto
 service.gui.MSG_DELIVERY_FAILURE=Não foi possível 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 {0} usando outro protocolo ou esperar até que ele/ela fique disponível.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Um erro interno ocorreu. Isto é provavelmente um bug. Por favor informe em: https://jitsi.org/Development/BugsAndIssues.
@@ -368,7 +351,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Necessita estar ligado para poder enviar
 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.MY_CHAT_ROOMS=Adicionar sala de conversação
 service.gui.MY_CHAT_ROOMS_TITLE=Adicionar sala de conversação
-service.gui.MUTE=Silenciar
 service.gui.MUTUALLY_ON_HOLD_STATUS=Ambos em espera
 service.gui.NAME=Nome
 service.gui.NETWORK=Rede
@@ -379,6 +361,7 @@ service.gui.NEW_MESSAGE=Nova mensagem
 service.gui.NEW_NAME=Novo nome
 service.gui.NEW_STATUS_MESSAGE=Nova mensagem de estado
 service.gui.NEW_STATUS_MESSAGE_SAVE=Guardar como mensagem personalizada
+service.gui.NICKNAME=Alcunha
 service.gui.NO=Não
 service.gui.NONE=Nenhum
 service.gui.NO_CAMERA_AVAILABLE=Nenhuma câmara disponivel
@@ -399,7 +382,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Nao está na lista de contactos
 service.gui.SD_QUALITY=Qualidade normal
 service.gui.OFFLINE=Desligado
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Chamadas antigas
 service.gui.ONLINE=Ligado
 service.gui.OPEN=Abrir
 service.gui.OPEN_FILE_FROM_IMAGE=Duplo clique para abrir o ficheiro.
@@ -411,9 +393,12 @@ service.gui.OPEN_ON_ACTIVITY=Aberto em actividade
 service.gui.OPEN_ON_MESSAGE=Aberto apenas com mensagem
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Aberto apenas com mensagens importantes
 service.gui.OR=ou
-service.gui.OR_ENTER_PHONE_NUMBER=Ou insira o número de telefone aqui...
 service.gui.ORGANIZATION=Organização
 service.gui.OTHER=Outro
+service.gui.chat.role.ADMINISTRATOR=administrador
+service.gui.chat.role.MODERATOR=moderador
+service.gui.chat.role.MEMBER=membro
+service.gui.chat.role.SILENT_MEMBER=membro silencioso
 service.gui.OWNER=dono da sala
 service.gui.ON_MOBILE_TOOLTIP=(no telemóvel)
 service.gui.PASSWORD=Palavra-passe
@@ -430,7 +415,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' para sugestões
 service.gui.PRESS_FOR_CALL_INFO=Prima para informações de chamada
 service.gui.PRESS_TO_OPEN_CRM=Prima para abrir a aplicação de CRM
 service.gui.PREVIOUS=Anterior
-service.gui.PREVIOUS_TOOLTIP=Procure conversações antigas
 service.gui.PRINT=&Imprimir
 service.gui.PROACTIVE_NOTIFICATION=está escrevendo uma mensagem
 service.gui.PROBLEMS_ENCOUNTERED=Encontrados problemas
@@ -446,7 +430,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Voçê está ligando e religando-se ao s
 service.gui.RE_REQUEST_AUTHORIZATION=Voltar a pedir autorização
 service.gui.REFERRED_STATUS=Mencionados
 service.gui.REJECT=&Rejeitar
-service.gui.REMIND_ME_LATER=Lembrar-me mais tarde
 service.gui.REMEMBER_PASSWORD=Lembrar palavra-chave
 service.gui.REMOVE=&Remover
 service.gui.REMOVE_ACCOUNT=&Remover conta
@@ -472,29 +455,20 @@ service.gui.REVOKE_ADMIN=Retirar estado de administrador
 service.gui.REVOKE_MODERATOR=Retirar estado de moderador
 service.gui.REVOKE_MEMBERSHIP=Retirar estado de membro
 service.gui.REVOKE_VOICE=Retirar voz
-service.gui.ROOT_GROUP=Grupo raiz
 service.gui.SAVE=&Salvar
-service.gui.SAVE_AS_DEFAULT=Salvar como por defeito
 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.SEARCH_STRING_CONTACT_SOURCE=Contacto procurado
 service.gui.SECURITY=Segurança
-service.gui.SELECT_ACCOUNT=Escolher conta
 service.gui.SELECT_COLOR=Escolher cor
 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_NO_GROUP=Sem grupo
-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
 service.gui.SELECT_VIDEO_CONFERENCE=Seleccionar videoconferencia
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Seleccione uma conversação da lista e pressione OK para a adicionar.
 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_AS_SMS=Enviar como SMS
 service.gui.SEND_PRIVATE_MESSAGE=Enviar uma mensagem privada
 service.gui.SEND_SMS=Enviar SMS
 service.gui.SEND_SMS_DETAILS=Lembre-se que tem de introduzir o numero no formato internacional; iniciar com +44 para UK; por exemplo: +447777000000
@@ -533,7 +507,6 @@ service.gui.STREET=Rua
 service.gui.SUBJECT=Assunto
 service.gui.SUMMARY=Sumário
 service.gui.TELEPHONY=Telefonia
-service.gui.TODAY=Hoje
 service.gui.TOOLS=&Ferramentas
 service.gui.TRANSFER=Transferencia
 service.gui.TO=&Para:
@@ -543,7 +516,6 @@ service.gui.TRANSFER_CALL_TO=Transferir para:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparência não é suportada pela configuração actual.
 service.gui.TYPE_YOUR_REQUEST=Escreva o seu pedido aqui
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Não fomos capazes de alterar a qualidade do vídeo para esta chamada.
-service.gui.UNMUTE=Ativar som
 service.gui.USER_IDENTIFIER=Identificador do utilizador:
 service.gui.USER_EXISTS_ERROR=Este utilizador já existe na rede seleccionada. Escolha outro utilizador ou outra rede.
 service.gui.USERNAME_NULL=Preencha com o seu nome de utilizador e password.
@@ -556,7 +528,6 @@ service.gui.USE_PROVISIONING=Use provisionamento online
 service.gui.VALUE=Valor
 service.gui.VIDEO_CALL=&Chamada de vídeo
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&Visualizar
 service.gui.VIEW_HISTORY=Mostrar &histórico
 service.gui.VIEW_SMILEYS=Mostrar &smileys
@@ -576,9 +547,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Ajustar o volume
 service.gui.WAITING_AUTHORIZATION=A aguardar autorização
 service.gui.WARNING=Aviso
 service.gui.YES=Sim
-service.gui.YESTERDAY=Ontem
-service.gui.EXISTING_ACCOUNT_ERROR=A conta que introduziu já está instalada.
-service.gui.NEW_MAIL=<b>Tem novo Correio!</b><br/><b>De:</b> {0} {1} <br/><b>Assunto:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Recebeu novo correio no seu {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Recebeu {2} novas mensagens na sua {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=mais uma conversação por ler na sua <a href="{0}">inbox</a>.<br/>
@@ -602,7 +570,6 @@ service.gui.SECURITY_ERROR=Erro de segurança
 service.gui.SPEED=Velocidade:
 service.gui.SILENT_MEMBER=membro silencioso
 service.gui.NON_SECURE_CONNECTION=Pode ser feira uma conexão não segura pela conta {0}. Se pretender conectar-se a um servidor não seguro, marque "Permitir conexão não segura" na sua configuração da conta
-service.gui.UPDATE=Actualizar
 service.gui.MOBILE_PHONE=Telemóvel
 service.gui.VIDEO_PHONE=Vídeo
 service.gui.WORK_PHONE=Trabalho
@@ -637,12 +604,10 @@ service.gui.callinfo.CALL_INFORMATION=Informação de chamada
 service.gui.callinfo.CALL_IDENTITY=Identidade
 service.gui.callinfo.PEER_COUNT=Contador de participante
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Realçar conferencia
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Encriptação activa
 service.gui.callinfo.CALL_TRANSPORT=Transporte da chamada de sinalização
 service.gui.callinfo.CALL_DURATION=Duração da chamada
 service.gui.callinfo.TLS_PROTOCOL=Protocolo TLS
 service.gui.callinfo.TLS_CIPHER_SUITE=Arquivo de cifras do TLS
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Chave de certificação do servidor TLS
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=O conteudo do certificado do servidor TLS é apresentado abaixo.
 service.gui.callinfo.VIEW_CERTIFICATE=Mostrar certificado
 service.gui.callinfo.CODEC=Codec / Frequencia
@@ -662,10 +627,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Protocolo de troca de chaves
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Candidado ICE de tipo extendido
 service.gui.callinfo.ICE_STATE=Estado de Processamento ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Reunir candidatos
 service.gui.callinfo.ICE_STATE.RUNNING=Verificações de ligação
 service.gui.callinfo.ICE_STATE.COMPLETED=Terminado
 service.gui.callinfo.ICE_STATE.FAILED=Falhou
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Computador local IP / Porta
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Reflexção local IP / Porta
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Retransmissão local IP / Porta
@@ -686,9 +654,10 @@ service.gui.ALWAYS_TRUST=Sempre confiar neste certificado
 service.gui.CERT_DIALOG_TITLE=Verificar Certificado
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} não foi possivel verificar a identidade do servidor durante a ligação a<br><b>{1}</b>.<br><br> O certificado não é confiavel, o quer quer dizer que a identidade do servidor não pode ser verificada automaticamente.<br><br> Deseja continuar com a ligação?<br> Para mais informações, clique em "Mostrar Certificado".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} não foi possivel verificar a identidade do certificado do servidor.<br><br> O certificado não é confiavel, o que quer dizer que a identidade do servidor não pode<br> ser verificada automaticamente. Deseja continuar com a ligação?<br><br> Para mais informações clique em "Mostrar Certificado".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} não é possivel a identidade do cliente.<br><br> O certificado não é confiavel, o que quer dizer que a identidade do cliente não pode<br> ser verificada automaticamente. Deseja aceitar a ligação?<br><br> Para mais informação, clique em "Mostrar Certificado".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} não é possiver verificar a identidade da origem {1}.<br><br> O certificado não é confiavel, o que quer dizer que a identidade da origem não pode ser <br> verificada automaticamente. Deseja prosseguir com a ligação?<br><br> Para mais informações, clique em "Mostrar Certificado".</html>
 service.gui.CONTINUE_ANYWAY=Continuar na mesma
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nome Comum:
 service.gui.CERT_INFO_O=Organização:
 service.gui.CERT_INFO_C=Nome do País:
@@ -705,12 +674,10 @@ service.gui.CERT_INFO_SIGN_ALG=Algoritmo usado para a assinatura:
 service.gui.CERT_INFO_PUB_KEY_INFO=Informações de Chave Pública
 service.gui.CERT_INFO_ALG=Algoritmo:
 service.gui.CERT_INFO_PUB_KEY=Chave Publica:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=Expoente:
 service.gui.CERT_INFO_KEY_SIZE=Tamanho da Chave:
 service.gui.CERT_INFO_SIGN=Assinatura:
-service.gui.CONTINUE=Continuar
 service.gui.SHOW_CERT=Mostrar Certificado
 service.gui.HIDE_CERT=Esconder Certificado
 
@@ -733,12 +700,9 @@ service.gui.security.SECURE_AUDIO=Audio seguro
 service.gui.security.AUDIO_NOT_SECURED=Audio não seguro
 service.gui.security.SECURE_VIDEO=Video seguro
 service.gui.security.VIDEO_NOT_SECURED=Video não seguro
-service.gui.security.NO_VIDEO=Sem video
-service.gui.security.CIPHER=Cifra: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Chamada segura. Para mais informações carregue aqui.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Chamada não segura.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Prima aqui pata comparar a sua segurança com a do seu parceiro.
-service.gui.security.COMPARE_WITH_PARTNER=Verifique com o parceiro, e clique no cadeado para confirmar.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Comparar com o parceiro:
 service.gui.security.STRING_COMPARED=String comparada!
@@ -756,20 +720,14 @@ service.gui.avatar.imagepicker.CLICK=Clique e Sorria
 service.gui.avatar.imagepicker.IMAGE_FILES=Ficheiros de imagem
 service.gui.avatar.imagepicker.IMAGE_PICKER=Imagem
 service.gui.avatar.imagepicker.IMAGE_SIZE=Tamanho da imagem
-service.gui.avatar.imagepicker.INITIALIZING=Inicializando
 service.gui.avatar.imagepicker.RESET=Repor
 service.gui.avatar.imagepicker.SET=Definir
 service.gui.avatar.imagepicker.TAKE_PHOTO=Tirar fotografia
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Erro da camara
 
 service.gui.security.encryption.required=É requerida encriptação!
 
 service.protocol.ICE_FAILED=Não foi possivel estabelecer ligação (Falha de ICE e encaminhamento não encontrado)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Erro no arquivo de contactos SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=O recurso não pode ser lido {0}. Para {1}
@@ -799,9 +757,7 @@ impl.ldap.QUERY_CUSTOM=Consulta personalizada
 impl.ldap.QUERY_CUSTOM_HINT=Use {0} como um espaço reservado para o termo de pesquisa.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Adicionar automaticamente expressoes para termos de procura
 impl.ldap.QUERY_PHOTO_INLINE=Trazer foto juntamento com outros atributos.
-impl.ldap.NEW=Novo
 impl.ldap.EDIT=editar
-impl.ldap.REMOVE=Remover
 impl.ldap.ENABLED=Activo
 impl.ldap.SERVER_NAME=Nome do servidor
 impl.ldap.SERVER_NAME_EXAMPLE=Servidor LDAP
@@ -834,6 +790,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=telefoneCasa
 impl.ldap.PHONE_PREFIX=Prefixo telefonico
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ex.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Livro de endereços
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Activar procura no Livro de Endereços do MacOSX
@@ -848,9 +808,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Definir o Outlook como cliente
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Contactos do Google
-impl.googlecontacts.NEW=Novo
 impl.googlecontacts.EDIT=Alterar
-impl.googlecontacts.REMOVE=Remover
 impl.googlecontacts.ENABLED=Activo
 impl.googlecontacts.ACCOUNT_NAME=Nome da conta
 impl.googlecontacts.SAVE=Salvar
@@ -869,6 +827,7 @@ plugin.accountinfo.DISPLAY_NAME=Mostrar nome:
 plugin.accountinfo.FIRST_NAME=Nome Próprio:
 plugin.accountinfo.MIDDLE_NAME=Nome do Meio:
 plugin.accountinfo.LAST_NAME=Apelido:
+plugin.accountinfo.NICKNAME=Alcunha:
 plugin.accountinfo.URL=URL:
 plugin.accountinfo.AGE=Idade:
 plugin.accountinfo.BDAY=Data de Nascimento:
@@ -888,11 +847,8 @@ plugin.accountinfo.ORGANIZATION=Nome da Organização
 plugin.accountinfo.JOB_TITLE=Cargo:
 plugin.accountinfo.ABOUT_ME=Acerca de mim:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Imagens do utilizador
 plugin.accountinfo.GLOBAL_ICON=Usar icone global
 plugin.accountinfo.LOCAL_ICON=Usar este icone:
-plugin.accountinfo.CHANGE=Modificar
-plugin.accountinfo.ONLY_MESSAGE=Só mensagens
 
 # connection info
 plugin.connectioninfo.TITLE=Informações da Ligação
@@ -912,46 +868,11 @@ plugin.aimaccregwizz.USERNAME=Nome de utilizador do AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Nome de usuário e senha
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Registrar nova conta
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Caso você não tenha uma conta AIM, clique neste botão para criar uma.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Substituir as opções predefinidas no servidor
 
 # branding
 plugin.branding.LOGO_MESSAGE=Open Source VoIP && Instant Messaging
-plugin.branding.LOADING=Carregando
 plugin.branding.ABOUT_MENU_ENTRY=&Sobre
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>A {1} está actualmente em activo desenvolvimento. A versão que está a usar é apenas experimental e PODE NÃO FUNCIONAR como se espera. Contacte {2} para mais informação.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Todos os direitos reservados. Visite <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> é distribuido sob o termos LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Dicionários
-plugin.dictaccregwizz.ANY_DICTIONARY=Qualquer Dicionario
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Qualquer Dicionario de {0}
-plugin.dictaccregwizz.FIRST_MATCH=Primeira equivalência
-plugin.dictaccregwizz.NO_MATCH=Nenhuma equivalência
-plugin.dictaccregwizz.MATCH_RESULT=Nenhumas definições encontradas para "{0}", talvez queira dizer:\n
-plugin.dictaccregwizz.INVALID_DATABASE=O dicionario actual "{0}" já não existe no servidor.
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=O protocolo do serviço AIM
-plugin.dictaccregwizz.HOST=Servidor
-plugin.dictaccregwizz.SERVER_INFO=Informações do servidor
-plugin.dictaccregwizz.STRATEGY_SELECTION=Seleccionar estrategia
-plugin.dictaccregwizz.STRATEGY_LIST=Lista de estrategias:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Procurar estrategias
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=A estrategia é usada para procurar palavras semelhantes, se a tradução não for encontrada, graças a diferentes abordagens. Por exemplo, as estratégias de prefixo irá procurar palavras que começam como a palavra que se traduziria.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informação da conta Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Este assistente ajuda-o a criar a sua primeira conta Dict em dict.org.\n\nPode adicionar um novo dicionario, indo ao Assistente de Registo de Conta. Preencha o campo de entrada com dicionário que gostaria de adicionar.
-plugin.dictaccregwizz.THREAD_CONNECT=A tentar ligar ao servidor
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Tentativa de conexção falhada, não é um servidor dict ou o servidor não está acessivel.
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=A obter estrategias
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Não foram encontradas estratégias no servidor
-plugin.dictaccregwizz.POPULATE_LIST=Preenchendo a lista
-plugin.dictaccregwizz.CLOSING_CONNECTION=Fechando a conexão
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Para poder usar a Conversação por Facebook você precisa de criar um "Utilizador" <br> e ativar a Conversação a partir de Definições de Conta na página do Facebook.</a><br><br>Nota: Quando você cria um utilizador, você tem que fechar a sessão na página web <br> e pode demorar algum tempo até que possa entrar com o seu novo utilizador!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=O protocolo de Conversação do Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nome do usuário:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nome do usuário e senha
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Início automático {0} após o computador reiniciar
@@ -960,9 +881,6 @@ plugin.generalconfig.LOG_HISTORY=Gravar histórico das conversas
 plugin.generalconfig.SHOW_HISTORY=Mostrar
 plugin.generalconfig.HISTORY_SIZE=mensagens recentes em novas conversas
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Trazer a janela de conversação para a frente
-plugin.generalconfig.ERROR_PERMISSION=Não tem previlegios suficientes para remover o arranque automatico
-plugin.generalconfig.TRANSPARENCY=Transparencia
-plugin.generalconfig.ENABLE_TRANSPARENCY=Activar transparencia
 plugin.generalconfig.DEFAULT_LANGUAGE=Idioma da interface
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=As suas alterações terão efeito no proximo reinicio.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% traduzido
@@ -972,6 +890,7 @@ plugin.generalconfig.SIP_SSL_PROTOCOLS=Activar os protocolos SSL/TLS
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Converter letras em números de telefone
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=Exemplo: +1-800-MEUNUMERO -> +1-800-638686376 
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Taxa de amostragem:
 plugin.generalconfig.OPUS_BITRATE=Taxa media da codificação (kbps):
@@ -1000,6 +919,7 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Registar uma conta nova
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=Protocolo IRC.
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN e palavra-passe
+plugin.ircaccregwizz.USERNAME=Alcunha
 plugin.ircaccregwizz.INFO_PASSWORD=A maioria dos servidores IRC não requerem password.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=Alterar automaticamente a alcunha quando já estiver a ser usada
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Usar a porta predefinida
@@ -1007,13 +927,14 @@ plugin.ircaccregwizz.HOST=Nome da máquina:
 plugin.ircaccregwizz.IRC_SERVER=Servidor
 plugin.ircaccregwizz.EXAMPLE_SERVER=Exemplo: chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Usar conexão segura
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} autenticação
+plugin.ircaccregwizz.SASL_USERNAME=Nome do utilizador
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=O protocolo XMPP
 plugin.jabberaccregwizz.USERNAME=Nome de Usuário do XMPP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirmar senha
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID e Senha
 plugin.jabberaccregwizz.CSERVER=Servidor
 plugin.jabberaccregwizz.SERVER=Conectar ao Servidor
 plugin.jabberaccregwizz.ENABLE_GMAIL_NOTIFICATIONS=Ativar notificações do Gmail para novas mensagens
@@ -1042,11 +963,8 @@ plugin.jabberaccregwizz.AUTO_DISCOVER_JN=Auto-descobrir retransmissões de Jingl
 plugin.jabberaccregwizz.ADD_JINGLE_NODE=Adicionar Jingle Node
 plugin.jabberaccregwizz.EDIT_JINGLE_NODE=Editar Jingle Node
 plugin.jabberaccregwizz.JID_ADDRESS=Endereço JID
-plugin.jabberaccregwizz.NEW_PASSWORD=Nova senha
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirmar nova senha
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Por favor, entre com um número de porta válida para continuar.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=A conta tem que ser registrada antes de mudar a senha.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=A senha está vazia.
 plugin.jabberaccregwizz.TLS_REQUIRED=A conexão não usa TLS, assim não tentará uma mudança de senha.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=A senha foi alterada com sucesso.
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Seu servidor XMPP não suporte mudanças de senha
@@ -1055,21 +973,9 @@ plugin.jabberaccregwizz.VIDEO=Vídeo
 plugin.jabberaccregwizz.RESET=Repor
 plugin.jabberaccregwizz.DISABLE_JINGLE=Desativar Jingle (chamadas de áudio e vídeo com XMPP).
 
-# mailbox
-plugin.mailbox.CONFIRM=Confirmar
-plugin.mailbox.DEFAULTS=Padrões
-plugin.mailbox.MAILBOX=Caixa de Correio
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Um protocolo para conectar no serviço MSN.
-plugin.msnaccregwizz.USERNAME=E-mail:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID e Senha
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Instalar
 plugin.pluginmanager.UNINSTALL=Desinstalar
-plugin.pluginmanager.UPDATE=Actualizar
 plugin.pluginmanager.PLUGINS=Plugins
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.NEW=Novo
@@ -1078,6 +984,8 @@ plugin.pluginmanager.NEW=Novo
 plugin.simpleaccregwizz.LOGIN_USERNAME=Nome do utilizador
 
 # sipaccregwizz
+plugin.sipaccregwizz.PROTOCOL_NAME=SIP
+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=O protocolo XMPP
 plugin.sipaccregwizz.USERNAME=ID SIP
 plugin.sipaccregwizz.USERNAME_AND_PASSWORD=Nome do usuário e senha
 plugin.sipaccregwizz.CLIENT_CERTIFICATE=Certificado TLS do cliente
@@ -1086,7 +994,6 @@ plugin.sipaccregwizz.SERVER_PORT=Porta do Servidor
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Porta do proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Transporte preferido
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Opções avançadas
 plugin.sipaccregwizz.PROXY_OPTIONS=Opções de Proxy
 plugin.sipaccregwizz.PROXY_AUTO=Configurar proxy automaticamente
 plugin.sipaccregwizz.ENABLE_PRESENCE=Ativar presença (SIMPLES)
@@ -1101,17 +1008,15 @@ plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Entre 1 e 3600 segundos
 plugin.sipaccregwizz.DISPLAY_NAME=Mostrar o nome
 plugin.sipaccregwizz.CREATE_ACCOUNT=Criar nova conta XMPP
 plugin.sipaccregwizz.XCAP_PASSWORD=Palavra-passe
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-plugin.sshaccregwizz.USERNAME=Informação da Conta ID:
-plugin.sshaccregwizz.OPTIONAL=Configurar
-
 # status update
 
 # updatechecker
 plugin.updatechecker.BUTTON_CLOSE=Fechar
+plugin.updatechecker.BUTTON_INSTALL=Instalar
 
 # usersearch
 
@@ -1121,41 +1026,33 @@ plugin.whiteboard.COLOR=Cor
 plugin.whiteboard.MODIFICATION=Notificações
 plugin.whiteboard.DELETE=Apagar
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.USERNAME=Nome do usuário:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=UIN e palavra-passe
-
-# zero accregwizz
-plugin.zeroaccregwizz.FIRST_NAME=Nome:
-plugin.zeroaccregwizz.LAST_NAME=Apelido:
-plugin.zeroaccregwizz.EMAIL=E-mail:
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=UIN e palavra-passe
-
 # gtalk accregwizz
 
 # iptel accregwizz
 plugin.iptelaccregwizz.USERNAME=Nome do utilizador
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.USERNAME=Nome do utilizador
-
 # ippi accregwizz
+plugin.sip2sipaccregwizz.USERNAME=Nome do utilizador
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Criar nova conta XMPP
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=Copiar
 plugin.keybindings.CHAT_CUT=C&ortar
 plugin.keybindings.CHAT_PASTE=Colar
 plugin.keybindings.MAIN_RENAME=Re&nomear contato
 plugin.keybindings.globalchooser.SHORTCUT_NAME=Nome
 plugin.keybindings.PLUGIN_NAME=Teclas de atalho
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Conversar
 
 # Notification Configuration Form
 plugin.notificationconfig.ENABLE_NOTIF=Activo
 plugin.notificationconfig.DESCRIPTION=Descrição
+plugin.notificationconfig.RESTORE=Restaurar padrões
 plugin.notificationconfig.SOUND_FILE=Ficheiro de som:
 plugin.notificationconfig.BROWSE_SOUND=Escolha um ficheiro de som
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Chamada recebida
 plugin.notificationconfig.event.IncomingFile=Chamada recebida
 plugin.notificationconfig.event.HangUp=Desligar
@@ -1173,9 +1070,11 @@ impl.media.security.zrtp.PUB_KEYS=Chaves publicas
 
 impl.media.configform.AUDIO_NOTIFY=&Notificações:
 impl.media.configform.VIDEO_RESOLUTION=Resolução do vídeo
+impl.media.configform.VIDEO_RESET=Restaurar padrões
 
 impl.neomedia.configform.VIDEO=Vídeo
 
+#in JNIEncoder
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTP
 
 # The callrecordingconfig plugin was never really committed into trunk and its
@@ -1193,7 +1092,6 @@ plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS_MSG=Alteração da passwo
 plugin.securityconfig.masterpassword.MP_REMOVE_SUCCESS_MSG=Alteração da password com sucesso
 plugin.securityconfig.masterpassword.COL_NAME=Nome
 plugin.securityconfig.masterpassword.COL_PASSWORD=Palavra-passe
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Remover
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Remover todas as senhas
 plugin.securityconfig.masterpassword.SHOW_PASSWORDS_BUTTON=Mostrar Senhas
 plugin.securityconfig.masterpassword.HIDE_PASSWORDS_BUTTON=Esconder Senhas
@@ -1215,6 +1113,7 @@ plugin.otr.authbuddydialog.I_HAVE_NOT=Eu não tenho
 plugin.otr.configform.MY_PRIVATE_KEYS=Minhas Chaves Privadas
 plugin.otr.configform.GENERATE=Gerar
 plugin.otr.configform.REGENERATE=Gerar novamente
+plugin.otr.configform.FINGERPRINT=Digitais
 plugin.otr.configform.COLUMN_NAME_CONTACT=Contatos
 plugin.otr.configform.COLUMN_NAME_VERIFIED_STATUS=Confirmado
 plugin.otr.configform.COLUMN_VALUE_VERIFIED_TRUE=Sim
@@ -1257,7 +1156,7 @@ net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=Ignorar
 net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=&Recusar
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=Editar
+plugin.spellcheck.UNINSTALL_DICTIONARY=Desinstalar
 
 
 #Certificate configuration plugin
diff --git a/resources/languages/resources_pt_BR.properties b/resources/languages/resources_pt_BR.properties
index 1769ea8..f8e335b 100644
--- a/resources/languages/resources_pt_BR.properties
+++ b/resources/languages/resources_pt_BR.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -29,42 +40,36 @@ service.gui.ABOUT=&Sobre
 service.gui.ACCEPT=&Aceitar
 service.gui.ACCOUNT=Conta
 service.gui.ACCOUNT_ME=Eu
-service.gui.ACCOUNT_REGISTRATION_WIZARD=Utilitário para registro de contas
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Assistente para registro de contas
 service.gui.ACCOUNTS=Contas
 service.gui.ADD=&Adicionar
-service.gui.ADD_ACCOUNT=Adicionar conta
 service.gui.ADD_CONTACT=&Adicionar contato
 service.gui.ADD_AUTHORIZED_CONTACT=Adicionar {0} à sua lista de contatos
-service.gui.ADD_CONTACT_TO_CONTACTLIST=Adicionar contato à sua lista de contatos
-service.gui.ADD_CONTACT_TO=&Adicionar contato
+service.gui.ADD_CONTACT_TO_CONTACTLIST=Adicionar o contato à sua lista de contatos
+service.gui.ADD_CONTACT_TO=&Adicionar contato para
 service.gui.ADD_CONTACT_ERROR=Falha ao adicionar o contato com a id: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Erro ao adicionar contato
 service.gui.ADD_CONTACT_EXIST_ERROR=O contato {0}, já está na sua lista de contatos.
 service.gui.ADD_CONTACT_NETWORK_ERROR=O servidor não respondeu a sua requisição para adicionar o contato com a id: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Falha ao adicionar contato com a id: {0}. Operação não suportada.
-service.gui.ADD_CONTACT_IDENTIFIER=Insira no campo abaixo a identificação do contato que você deseja adicionar.
-service.gui.ADD_CONTACT_WIZARD=Utilitário para adicionar contato
 service.gui.ADD_CONTACT_NOT_CONNECTED=É preciso estar conectado para que seja possível adicionar um contato. Por favor, conecte-se ao serviço selecionado e tente novamente.
 service.gui.ADD_GROUP_LOCAL_ERROR=Falha ao adicionar grupo com o nome: {0}. O problema ocorreu durante uma operação de E/S local.
 service.gui.ADD_GROUP_EXIST_ERROR=O grupo {0} já existe na sua lista de contatos. Por favor escolha outro nome.
 service.gui.ADD_GROUP_NET_ERROR=Falha ao adicionar grupo com o nome: {0}. O problema ocorreu devido a uma falha na rede. Por favor, verifique sua conexão com a rede e tente novamente.
 service.gui.ADD_GROUP_ERROR=Falha ao adicionar grupo com o nome: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=O nome do grupo não pode ser deixado em branco.
-service.gui.ADD_GROUP=Criar grupo
-service.gui.ADD_SUBCONTACT=&Adicionar subcontato
 service.gui.ADDRESS=Endereço
 service.gui.ADMINISTRATOR=administrador
 service.gui.ADVANCED=&Avançado
-service.gui.ALL=&Tudo
 service.gui.ALL_CONTACTS=&Todos os contatos
 service.gui.ALTERNATE_ADDRESS=Endereço alternativo
 service.gui.APPLY=&Aplicar
 service.gui.ARE_CALLING={0} estão chamando...
 service.gui.ARE_NOW=Você agora é {0}
+service.gui.AT=em 
 service.gui.AUTHORIZE=&Autorizar
 service.gui.AUTHORIZATION_ACCEPTED={0} aceitou o seu pedido de autorização.
 service.gui.AUTHENTICATION_FAILED=A autenticação para {0} falhou. A senha inserida é inválida.
-service.gui.AUTHENTICATION_REQUESTED=Autenticação requisitada
 service.gui.AUTHENTICATION_REQUESTED_SERVER=O servidor {0}, requisitou sua autenticação.
 service.gui.AUTHENTICATION_REJECTED={0} rejeitou seu pedido de autorização.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autenticação
@@ -106,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=Você pode inserir seu novo apelido no campo a
 service.gui.CHANGE_NICKNAME_ERROR=Erro ao mudar o apelido
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Este apelido já existe
 service.gui.CHANGE_VIDEO_QUALITY=Mudar a qualidade do vídeo remoto
-service.gui.CHAT_CONFERENCE_LABEL=Conferências
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Conferência de {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Você já está na sala de conversação {0}.
 service.gui.CHAT_ROOM_CONFIGURATION=Configuração da sala de conversação {0}
@@ -120,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=saiu de {0}
 service.gui.CHAT_ROOM_USER_KICKED=foi expulso de {0}
 service.gui.CHAT_ROOM_USER_QUIT=saiu de {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Envio de mensagem proibido (fala revogada)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Salva a sala de conversação para uso futuro
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Remove a sala selecionada da lista de salas salvas
 service.gui.CHAT_ROOM_NAME=Nome da sala de conversação
 service.gui.CLEAR_CUSTOM_MESSAGES=Limpar mensagens personalizadas
 service.gui.ROOM_NAME=Sala de conversação
-service.gui.AUTOJOIN=Entrar automaticamente
 service.gui.CHANGE_PASSWORD=Alterar a senha
 service.gui.CHAT_ROOM_NAME_INFO=Coloque o nome da nova sala de conversação no campo abaixo.
 service.gui.CHAT_ROOM_NOT_EXIST=A sala {0} não foi encontrada no servidor {1}. Por favor verifique se o nome digitado está correto.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Você precisa estar logado para entrar na sala de conversação {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Você precisa estar conectado para poder deixar a sala de conversação.
-service.gui.CHAT_ROOM_NOT_JOINED=Você precisa entrar na sala de conversação para poder fazer alterações.
 service.gui.CHAT_ROOM_OPTIONS=Opções de sala de conversação
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=A sala de conversação {0}, requer um registro para poder entrar.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=A sala de conversação {0} requisitou uma senha.
@@ -150,22 +150,20 @@ service.gui.CLEAR=Limpar
 service.gui.CLOSE=F&echar
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Você recebeu uma nova mensagem a menos de 2 segundos. Você tem certeza que deseja fechar esta janela?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Você tem transferências de arquivo ativas. Tem certeza que deseja cancelar elas?
-service.gui.CONFIRM=Confirmar
 service.gui.CONNECTED_STATUS=Conectado
 service.gui.CONNECTING=Conectando...
 service.gui.CONNECTING_STATUS=Conectando
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Conectando*
 service.gui.CONNECTION=Conexão
-service.gui.CONNECTION_FAILED_MSG=A conexão falhou para as seguintes contas: Nome de usuário: {0}, Nome do servidor: {1}. Por favor, verifique suas conexões de rede ou fale com o administrador para mais informações.
 service.gui.CONNECTION_EXPIRED_MSG=Você está desconectado do servidor {0}, neste momento.
 service.gui.CONTACT_NAME=ID ou número
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=O contato escolhido [(0)] não suporta telefonia.
+service.gui.CONTACT_NAME_PROMPT=joao.silva@exemplo.com
+service.gui.CONTACT_NAME_INFO=Adicione um endereço de mensageiro instantâneo (como joao.ninguem@exemplo.com) ou número VoIP
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=O usuário escolhido [{0}] não tem suporte para conversas em conferência.
 service.gui.CONTACT_PAUSED_TYPING={0} parou de digitar a mensagem
 service.gui.CONTACT_TYPING={0} está digitando uma mensagem
-service.gui.CONTACT_TYPING_SEND_FAILED=O-ou... Não foi possível informar à {0} que você estava digitando
-service.gui.CONTACT_INFO=Informação do &contato
-service.gui.CONTACTLIST=Lista de contatos
+service.gui.CONTACT_TYPING_SEND_FAILED=Ooops!... Não foi possível informar {0} que você estava digitando
+service.gui.CONTACT_INFO=Informações do &contato
 service.gui.CONTACTS=Contatos
 service.gui.COPY=&Copiar
 service.gui.COPY_LINK=Copiar &endereço
@@ -175,34 +173,34 @@ service.gui.CREATE_CHAT_ROOM=&Criar sala de conversação...
 service.gui.CREATE_CHAT_ROOM_ERROR=Falha ao criar a sala de conversação {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Utilitário de sala de conversação
 service.gui.CREATE_CONFERENCE_CALL=&Criar uma chamada em conferência...
-service.gui.CREATE_CONFERENCE_CHAT=&Criar uma conversa em conferência...
 service.gui.CREATE_GROUP=&Criar grupo...
 service.gui.CREATE_GROUP_NAME=No campo abaixo coloque o nome do grupo que deseja criar.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Sua lista de contatos não contém nenhum grupo. Por favor crie um grupo primeiro (Arquivo/Criar grupo).
 service.gui.CREATE_VIDEO_BRIDGE=Criar uma ponte de &vídeo...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Criar uma ponte de &vídeo
-service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Criar ou entrar em uma conferência com vídeo
+service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Criar/entrar videoconferência
 service.gui.CREATE_VIDEO_CONFERENCE=Criar uma nova conferência de vídeo para esta sala de conversação
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Este contato não suporta informações de contato da web
 service.gui.CUT=&Recortar
-service.gui.DATE=Data
 service.gui.DELETE=Excluir
 service.gui.DENY=&Negar
 service.gui.DESKTOP_SHARING_WARNING=<b>Você tem certeza que deseja iniciar o compartilhamento de área de trabalho?</b> <br> Clicar em OK permitirá que os participantes desta chamada vejam sua área de trabalho.
 service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Você está compartilhando sua tela
 service.gui.DIALPAD=Discador
 service.gui.DISPLAY_NAME=Exibir nome
+service.gui.DISPLAY_NAME_PROMPT=João Silva
+service.gui.DISPLAY_NAME_INFO=Dê um nome a este contato. Se deixado em branco será usado o endereço de MI ou número VoIP. (Opcional)
 service.gui.DISCONNECTED_STATUS=Desconectado
 service.gui.DND_STATUS=Não perturbe
 service.gui.DO_NOT_ASK_AGAIN=Não perguntar novamente
 service.gui.DO_NOT_SHOW_AGAIN=Não mostrar esta mensagem novamente
-service.gui.DOWNLOAD_NOW=&Transferir agora
 service.gui.DRAG_FOR_SHARING=Arraste aqui tudo que deseja compartilhar...
 service.gui.DURATION=duração
 service.gui.DESTROY_CHATROOM=Destruir sala de conversação
 service.gui.DESTROY_MESSAGE=Para informar outros participantes, por favor, entre uma razão e uma sala alternativa para entrarem.
 service.gui.EDIT=&Editar
 service.gui.EDITED_AT=editado em {0}
+service.gui.EMAIL=E-mail
+service.gui.EMAILS=E-mails
 service.gui.EMPTY_HISTORY=&Histórico vazio
 service.gui.ENABLE_DESKTOP_REMOTE_CONTROL=Ativar controle remoto da área de trabalho
 service.gui.ENABLE_TYPING_NOTIFICATIONS=Informar aos outros quando estiver escrevendo uma mensagem (envia atividade da conversa)
@@ -215,12 +213,12 @@ service.gui.ERROR_RECEIVED_FROM=Erro recebido de {0}
 service.gui.ESTIMATED_TIME=Tempo estimado:
 service.gui.EVENTS=Eventos
 service.gui.EXIT=&Sair
-service.gui.EXTENDED_CRITERIA=Critério estendido
 service.gui.GENERAL=Geral
 service.gui.GENERAL_ERROR=Erro genérico
 service.gui.GROUP_NAME=Nome do grupo
 service.gui.FAILED_STATUS=A chamada falhou
 service.gui.FAILED_TO_JOIN_CHAT_ROOM=Falha ao entrar na sala de conversação com o nome: {0}.
+service.gui.FAX=Fax
 service.gui.FFC_STATUS=Disponível para conversar
 service.gui.FILE=&Arquivo
 service.gui.FILE_WAITING_TO_ACCEPT=Aguardando aceitação de arquivo para {0}.
@@ -240,10 +238,13 @@ service.gui.FILE_TRANSFER_PREPARING=Preparando transferência de arquivo com {0}
 service.gui.FILE_TRANSFER_REQUEST_RECIEVED={0} está compartilhando um arquivo com você.
 service.gui.FILE_DOES_NOT_EXIST=O arquivo especificado não pode ser encontrado. Foi deletado ou movido.
 service.gui.FILE_OPEN_FAILED=Falha ao abrir o arquivo. O arquivo pode ter sido excluído ou movido.
+service.gui.FILE_OPEN_NOT_SUPPORTED=Desculpe-nos, a operação com arquivo aberto não é suportada na plataforma atual
 service.gui.FILE_OPEN_NO_PERMISSION=Você não tem permissões suficientes para abrir este arquivo. Por favor, verifique suas permissões de leitura e tente novamente.
 service.gui.FILE_OPEN_NO_APPLICATION=Não foi possível encontrar um aplicativo associado a este tipo de arquivo.
 service.gui.FINISH=&Finalizar
+service.gui.FOLDER_DOES_NOT_EXIST=A pasta contendo este arquivo não foi encontrada. Ou ela foi apagada ou foi movida. 
 service.gui.FOLDER_OPEN_FAILED=Falha ao abrir o diretório.
+service.gui.FOLDER_OPEN_NO_PERMISSION=Você não tem permissões suficientes para abrir este arquivo. Por favor verifique suas permissões de leitura e tente de novo.
 service.gui.FOLDER_OPEN_NO_APPLICATION=Não foi possível encontrar um aplicativo para abrir este diretório.
 service.gui.FONT=Fonte
 service.gui.FONT_BOLD=Negrito
@@ -253,132 +254,621 @@ service.gui.FONT_ITALIC=Itálico
 service.gui.FONT_SIZE=Tamanho
 service.gui.FONT_STYLE=Estilo
 service.gui.FONT_UNDERLINE=Sublinhar
-service.gui.FROM={0} de {1}
+service.gui.GRANT_OWNERSHIP=Conceder a posse...
+service.gui.GRANT_ADMIN=Dar permissão de administrador
+service.gui.GRANT_MODERATOR=Dar permissão de moderador
+service.gui.GRANT_MEMBERSHIP=Conceder ao membro participação
+service.gui.GRANT_VOICE=Conceder voz
 service.gui.GUEST=visitante
 service.gui.HANG_UP=Desligar
 service.gui.HD_QUALITY=Vídeo HD
 service.gui.HELP=Aj&uda
 service.gui.HIDE=Ocultar
 service.gui.HIDE_OFFLINE_CONTACTS=Ocultar contatos desconectados
+service.gui.HIDE_MAIN_WINDOW=<DIV>Clicando no botão da janela X não irá fechar o aplicativo, mas somente <BR> escondê-lo. Se você deseja sair do aplicativo, escolha Arquivo/Fechar.</DIV>
+service.gui.HISTORY=&Histórico
+service.gui.HISTORY_CONTACT=Histórico - {0}
 service.gui.HISTORY_TOGGLE_PER_CONTACT=Desativar histórico para este contato
 service.gui.HISTORY_TOGGLE_PER_CHATROOM=Desativar histórico para esta sala de conversação
 service.gui.HISTORY_TOGGLE_ALL=Desativar histórico para todas as conversas e contatos
 service.gui.HISTORY_ERASE_PER_CONTACT=Apagar todo o histórico para este contato
+service.gui.HISTORY_ERASE_PER_CHATROOM=Apagar todo o histórico desta sala de conversação
 service.gui.HISTORY_ERASE_ALL=Apagar todo o histórico de conversação em {0}
+service.gui.HISTORY_REMOVE_PER_CONTACT_WARNING=Tem a certeza que deseja remover definitivamente todas as mensagens guardadas localmente para {0}?
+service.gui.HISTORY_REMOVE_ALL_WARNING=Tem certeza que deseja remover permanentemente todas as mensagens armazenadas localmente?
+service.gui.HISTORY_REMOVE_ERROR=Erro ao remover as mensagens armazenadas localmente.
+service.gui.HOME=Inicio
+service.gui.HOME_PAGE=Página Inicial
+service.gui.ICE=ICE
+service.gui.IDENTIFIER=Identificador
+service.gui.IGNORE=&Ignorar
 service.gui.INSERT_SMILEY=Inserir emoticon
 service.gui.INCOMING_CALL=Chamada recebida de: {0}
 service.gui.INCOMING_SCREEN_SHARE=Compartilhamento de tela recebido de: {0}
+service.gui.INCOMING_CALL_STATUS=Recebendo chamada
+service.gui.INCOMING_SCREEN_SHARE_STATUS=Compartilhar a tela de entrada
+service.gui.INSTANT_MESSAGINGS=IM's
+service.gui.IM=IM
+service.gui.INITIATING_CALL_STATUS=Chamada inicializada
+service.gui.INVITATION=Texto de convite
+service.gui.INVITATION_RECEIVED=Convite recebido
 service.gui.INVITATION_RECEIVED_MSG={0} convidou você para a sala de conversação {1}. Você pode aceitar, rejeitar ou ignorar este convite.
 service.gui.INVITATION_REJECTED={0} rejeitou o seu convite para entrar na sala de conversação. Razão: {1}.
+service.gui.INVITE=&Convidar
 service.gui.INVITE_CONTACT_MSG=Selecione os contatos que você gostaria de adicionar à esta conversa, e então clique Convidar.
+service.gui.INVITE_CONTACT_TO_CHAT=Convidar contato para chat
+service.gui.INVITE_CONTACT_TO_CALL=Convidar contactos para chamada
+service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Convide contatos para a videoconferência
 service.gui.INVITE_REASON=Recebendo chamada de {0}...
 service.gui.IS_CALLING={0} e está ligando...
 service.gui.IS_NOW={0} é agora {1}
-service.gui.JITSI_WARNING=O SIP Communicator recentemente foi renomeado para Jitsi. <br/> Se você deseja que sua versão permaneça atualizada, por favor baixe o Jitsi agora.<br/><br/> Nos desculpamos por qualquer inconveniência que isso possa causar. <br/><br/> Grupo de desenvolvimento do Jitsi
+service.gui.JOIN=&Juntar
+service.gui.JOIN_AS=J&untar como
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Participar de uma vídeo conferência já existente
+service.gui.JOIN_VIDEO=Juntar video
+service.gui.JOB_TITLE=Cargo
+service.gui.JOIN_CHAT_ROOM=&Entrar na sala de bate-papo...
+service.gui.JOIN_CHAT_ROOM_TITLE=Entrar na sala de bate-papo
 service.gui.JOIN_CHAT_ROOM_NAME=Por favor, digite o nome da sala de conversação que você gostaria de entrar.
+service.gui.JOIN_CHAT_ROOM_WIZARD=Assistente para entrar na sala de bate-papo
+service.gui.JOIN_AUTOMATICALLY=Entrar automáticamente
+service.gui.DONT_JOIN_AUTOMATICALLY=Não entrar automáticamente
+service.gui.KICK=&Expulsar
+service.gui.KICK_FAILED=Falha na expulsão
 service.gui.KICK_FAILED_GENERAL_ERROR=Falha ao expulsar {0}. Ocorreu um erro genérico do servidor.
+service.gui.KICK_FAILED_NOT_ALLOWED=Falha na expulsão {0}. O proprietário e o administrador da sala não pode ser expulso.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Falha ao expulsar {0}. Você não tem privilégios suficientes para fazer isto.
+service.gui.LAST_NAME=Sobrenome
+service.gui.LEAVE=&Sair
+service.gui.LIMIT_REACHED_FOR_IP=Você tem muitos registos em uso do mesmo endereço IP local, o {0} servidor não permite abrir mais registos.
+service.gui.LIST=Lista
 service.gui.LOADING_ROOMS=Carregando salas...
 service.gui.LOADING=Carregando...
+service.gui.LOCALLY_ON_HOLD_STATUS=Chamada local em espera
+service.gui.LOGIN_NETWORK_ERROR=Impossível logar: Usuário: {0}, Nome do Servidor: {1}, devido a uma falha de rede. Verifique a conexão de rede.
+service.gui.LOGIN_GENERAL_ERROR=Um erro ocorreu enquanto tentava logar-se com a conta: Nome de usuário: {0}, Nome do servidor: {1}:{2}.
+service.gui.LOGIN_INTERNAL_ERROR=Ocorreu um erro quando se tentava logar com a conta: Usuário: {0}, Servidor: {1}. Isto deve-se provavelmente a um erro interno da aplicação. Reporte o problema a nossa equipe de desenvolvimento (dev@jitsi.java.net).
+service.gui.LOGIN_INVALID_PROPERTIES_ERROR=Impossível se conectar com a conta: Usuário: {0}, Servidor: {1}, devido a um erro de configuração. Por favor, verifique a configuração de sua conta. 
+service.gui.LOGOFF_NOT_SUCCEEDED=Um erro ocorreu enquanto tentava se desconectar da conta: Nome do usuário: {0}, Nome do servidor: {1}.
 service.gui.LOW_QUALITY=Baixa qualidade
 service.gui.MEMBER=membro
+service.gui.MERGE_TO_CALL=Juntar todas as chamadas
+service.gui.MESSAGE=Mensagem
 service.gui.MISSED_CALLS_TOOL_TIP=Chamadas perdidas de:
+service.gui.MISSED_CALLS_MORE_TOOL_TIP= e {0} mais
 service.gui.MODERATOR=moderador
+service.gui.MORE_LABEL=Mais
+service.gui.MOVE=Mover
+service.gui.MOVE_SUBCONTACT=M&over contato
+service.gui.MOVE_SUBCONTACT_MSG=Selecione o contato ou o grupo onde você deseja mover o contato selecionado.
+service.gui.MOVE_SUBCONTACT_FAILED=O contato escolhido é o mesmo que \n o contato de origem. Por favor, escolha outro contato!
 service.gui.MOVE_SUBCONTACT_QUESTION=Você tem certeza que deseja mover {0} para {1}?
 service.gui.MOVE_TO_GROUP=&Mover para o grupo
+service.gui.MOVE_CONTACT=Mover Contato
+service.gui.MSG_DELIVERY_FAILURE=Não foi possível entregar a mensagem acima
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=O protocolo que você está usando não suporta mensagens offline. Você pode tentar alcançar {0} através de outro protocolo ou aguardar até que ele/ela fique disponível.
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=Um erro interno ocorreu. Isto é provavelmente um bug. Por favor informe em: https://jitsi.org/Development/BugsAndIssues.
+service.gui.MSG_DELIVERY_ERROR=Falhou ao enviar a mensagem.
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Um erro desconhecido ocorreu durante o envio de sua mensagem.
+service.gui.MSG_DELIVERY_UNSUPPORTED_OPERATION=Operação não suportada.
+service.gui.MSG_NOT_DELIVERED=Ocorreu um problema de rede. Verifique a sua configuração de rede e tente novamente.
+service.gui.MSG_NOT_POSSIBLE=Mensagens não são possíveis para este contato (não é suportado pelo protocolo)
+service.gui.MSG_RECEIVED={0} escreveu
+service.gui.MSG_SEND_CONNECTION_PROBLEM=Você precisa estar conectado para poder enviar mensagens.
+service.gui.MULTIPLE_LOGINS=Você se conectou mais de uma vez com a mesma conta. A conta seguinte: Nome do Usuário: {0}, Nome do Servidor: {1} encontra-se desconectada no momento.
 service.gui.MY_CHAT_ROOMS=Adicionar sala de conversação
 service.gui.MY_CHAT_ROOMS_TITLE=Adicionar sala de conversação
+service.gui.MUTUALLY_ON_HOLD_STATUS=Ambos em espera
+service.gui.NAME=Nome
+service.gui.NETWORK=Rede
+service.gui.NETWORK_FAILURE=Falha de rede
+service.gui.NEXT=Pró&ximo
 service.gui.NEW_ACCOUNT=Adicionar uma &nova conta...
+service.gui.NEW_MESSAGE=Nova mensagem
+service.gui.NEW_NAME=Novo nome
+service.gui.NEW_STATUS_MESSAGE=Nova mensagem de status
+service.gui.NEW_STATUS_MESSAGE_SAVE=Salvar como mensagem personalizada
+service.gui.NICKNAME=Apelido
+service.gui.NO=Não
+service.gui.NONE=Nenhum
 service.gui.NO_CAMERA_AVAILABLE=Nenhuma câmera disponível
+service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=Compartilhamento de tela não é suportado por este protocolo
+service.gui.NO_VIDEO_ENCODINGS=Nehuma codificação de vídeo foi selecionada na configuração.
+service.gui.NO_VIDEO_FOR_PROTOCOL=O vídeo não é suportado por este protocolo
+service.gui.NO_AVAILABLE_ROOMS=A lista de salas deste servidor não está disponível no momento.
+service.gui.NO_CONTACTS_FOUND=Não foram encontrados contatos. Pressione Ctrl+Enter para chamar {0} ou use os botões abaixo.
+service.gui.NO_CONTACTS_FOUND_SHORT=Não foram encontrados contatos.
+service.gui.NO_MESSAGE=Sem mensagem
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Não foi encontrada nenhuma conta que suporte conversações de múltiplos usuários. Consulte jitsi.org para mais informações sobre quais protocolos suportam conversações de múltiplos usuários.
+service.gui.NO_ONLINE_CONFERENCING_ACCOUNT=Nenhuma conta de conferência disponível. Consulte https://jitsi.org para mais informações sobre quais protocolos suportam conferências.
+service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=É necessária pelo menos uma conta telefônica online conectada para fazer a chamada. Por favor conecte-se a uma de suas contas telefônicas e tente novamente.
+service.gui.NOT_AUTHORIZED=Não autorizado
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Você está tentando fechar uma janela de conversação com uma mensagem não enviada. Tem certeza que quer fechar esta janela de conversação?
+service.gui.NON_EXISTING_USER_ID=O servidor {0} não reconhece o id de usuário especificado.
+service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Não está na lista de contatos
+service.gui.SD_QUALITY=Qualidade normal
 service.gui.OFFLINE=Desconectado
+service.gui.OK=&OK
 service.gui.ONLINE=Disponível
+service.gui.OPEN=Abrir
+service.gui.OPEN_FILE_FROM_IMAGE=Duplo clique para abrir o arquivo.
+service.gui.OPEN_FOLDER=Abrir pasta
+service.gui.OPEN_IN_BROWSER=A&brir no navegador
 service.gui.OPTIONS=Opções
+service.gui.OPEN_AUTOMATICALLY=Abrir esta sala automaticamente quando
+service.gui.OPEN_ON_ACTIVITY=Aberto em atividade
+service.gui.OPEN_ON_MESSAGE=Abrir somente com mensagem
+service.gui.OPEN_ON_IMPORTANT_MESSAGE=Abrir apenas com mensagens importantes
+service.gui.OR=ou
+service.gui.ORGANIZATION=Empresa
+service.gui.OTHER=Outro
+service.gui.chat.role.OWNER=Proprietário
 service.gui.chat.role.ADMINISTRATOR=Administrador
 service.gui.chat.role.MODERATOR=Moderador
 service.gui.chat.role.MEMBER=Membro
+service.gui.chat.role.GUEST=Convidado
+service.gui.chat.role.SILENT_MEMBER=Silenciar membro
+service.gui.chat.role.OUTCAST=Proibido de entrar
+service.gui.OWNER=dono da sala
+service.gui.ON_MOBILE_TOOLTIP=(no celular)
+service.gui.PASSWORD=Senha
+service.gui.PASSWORD_CHANGE_FAILURE=A alteração de senha falhou
+service.gui.PASSWORD_CHANGE_SUCCESS=Senha alterada com sucesso
+service.gui.PASTE=&Colar
+service.gui.PERSONAL=Pessoal
+service.gui.PORT=Porta
+service.gui.POSTAL_CODE=Código postal
+service.gui.PREFERENCES=Preferências
+service.gui.PREFIX=Prefixo
+service.gui.PRESENCE=Presença
+service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' para sugestões
 service.gui.PRESS_FOR_CALL_INFO=Pressione para obter informações da chamada
+service.gui.PRESS_TO_OPEN_CRM=Clique para abrir aplicação de CRM
+service.gui.PREVIOUS=Anterior
+service.gui.PRINT=Im&primir
+service.gui.PROACTIVE_NOTIFICATION=está escrevendo uma mensagem
+service.gui.PROBLEMS_ENCOUNTERED=Problemas encontrados
+service.gui.PROTOCOL=Protocolo
+service.gui.PUT_OFF_HOLD=Cancelar espera
+service.gui.PUT_ON_HOLD=Colocar em espera
 service.gui.QUIT=&Sair
+service.gui.READY=Pronto
+service.gui.RECENT_MESSAGES=Conversas recentes
+service.gui.REASON=Motivo
+service.gui.RECEIVED={0} recebido
+service.gui.RECONNECTION_LIMIT_EXCEEDED=Você está sendo conectado e desconectado do servidor muito 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 conectar novamente.
+service.gui.RE_REQUEST_AUTHORIZATION=Pedir autorização novamente
+service.gui.REFERRED_STATUS=Mencionado
+service.gui.REJECT=&Rejeitar
+service.gui.REMEMBER_PASSWORD=Lembrar senha
+service.gui.REMOVE=&Remover
+service.gui.REMOVE_ACCOUNT=&Remover conta
+service.gui.REMOVE_ACCOUNT_MESSAGE=Tem certeza de que deseja remover esta conta?
+service.gui.REMOVE_CONTACT=&Remover contato
+service.gui.REMOVE_CONTACT_TEXT=<DIV>Tem certeza que pretende remover <B> {0} </B><BR>da sua lista de contatos?</DIV>
+service.gui.REMOVE_CONTACT_NOT_CONNECTED=Você precisa estar conectado para remover esse contato. Por favor acesse e tente novamente.
+service.gui.REMOVE_GROUP=&Remover grupo
+service.gui.REMOTELY_ON_HOLD_STATUS=Remotamente em espera
+service.gui.RENAME=&Renomear
+service.gui.RENAME_CONTACT=Re&nomear contato
+service.gui.RENAME_CONTACT_WIZARD=No campo abaixo você pode definir o nome que deseja usar para o contato.
+service.gui.RENAME_GROUP=Re&nomear grupo
+service.gui.RENAME_GROUP_INFO=No campo abaixo você pode definir o nome que deseja usar para o grupo.
+service.gui.RENAME_CLEAR_USER_DEFINED=Restaurar
+service.gui.RINGING_STATUS=Chamando
+service.gui.REQUEST=&Solicitar
+service.gui.REQUEST_AUTHORIZATION=Solicita&r 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 informe seu pedido abaixo.
+service.gui.RETRY=Tentar novamente
+service.gui.REVOKE_OWNERSHIP=Revogar propriedade
+service.gui.REVOKE_ADMIN=Revogar privilégio de administração
+service.gui.REVOKE_MODERATOR=Revogar privilégio de moderador
+service.gui.REVOKE_MEMBERSHIP=Revogar participação
+service.gui.REVOKE_VOICE=Revogar voz
+service.gui.SAVE=&Salvar
+service.gui.SEARCH=Pe&squisar
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Clique no botão abaixo para mostrar todas as salas existentes no servidor selecionado. Depois escolha aquela que você deseja participar e clique no botão Entrar.
+service.gui.SEARCH_STRING_CONTACT_SOURCE=Contato pesquisado
 service.gui.SECURITY=Segurança
+service.gui.SELECT_ACCOUNT_INFO=Qual conta deseja usar para se comunicar com este contato?
+service.gui.SELECT_COLOR=Selecionar cor
+service.gui.SELECT_GROUP=Selecionar grupo
+service.gui.SELECT_GROUP_INFO=Em qual grupo deseja incluir este contato? (Opcional)
+service.gui.SELECT_NO_GROUP=Sem grupo
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=A lista abaixo contém todas as contas que suportam o recurso de conversas com múltiplos usuários. Selecione aquela que vocês deseja utilizar para criar sua sala.
+service.gui.SELECT_VIDEO_CONFERENCE=Selecionar videoconferência
+service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Selecione sala da lista e pressione OK para adicioná-la.
+service.gui.SEND=&Enviar
+service.gui.SEND_FILE=Enviar &arquivo
 service.gui.SEND_MESSAGE=&Enviar mensagem
+service.gui.SEND_PRIVATE_MESSAGE=Enviar mensagem privada
+service.gui.SEND_SMS=&Enviar SMS
+service.gui.SEND_SMS_DETAILS=Lembre-se que você tem de introduzir o número no formato internacional; iniciar com +55 para BR; por exemplo: +5521977770000
+service.gui.SEND_SMS_NOT_SUPPORTED=O protocolo que você selecionou não suporta mensagens SMS.
+service.gui.SMS=SMS
+service.gui.SEND_VIA=Enviar via
+service.gui.SENT=enviado
+service.gui.SERVER_CHAT_ROOMS=Salas do servidor
 service.gui.SET_GLOBAL_STATUS=Definir estado global
+service.gui.SET_STATUS_MESSAGE=Definir mensagem de status
+service.gui.SET_SUBJECT=Definir assunto
 service.gui.SETTINGS=&Opções
+service.gui.SHARE_DESKTOP=&Compartilhar a área de trabalho
+service.gui.SHARE_DESKTOP_WITH_CONTACT=Compartilhar área de trabalho com contato
+service.gui.SHARE_FULL_SCREEN=Compartilhar tela completa
+service.gui.SHARE_REGION=Compartilhar região
 service.gui.SHOW=Mostrar
+service.gui.SHOW_CONTACT_LIST_TOOL_TIP=Clique aqui para fechar a visualização do histórico e mostrar a sua lista de contatos.
+service.gui.SHOW_MORE=exibir mais...
 service.gui.SHOW_OFFLINE_CONTACTS=Mostrar contatos desconectados
+service.gui.SIGN_IN=Entrar
+service.gui.SMS_SUCCESSFULLY_SENT=Mensagem SMS enviada com sucesso!
+service.gui.SMS_SEND_CONNECTION_PROBLEM=Você tem que estar conectado antes de poder enviar mensagens SMS. Conecte-se primeiro ao ser provedor de SMS.
+service.gui.SPECIFY_REASON=No campo abaixo você pode definir o motivo desta operação.
+service.gui.SPECIFY_SERVER=Complete as informações do servidor da sua conta.
 service.gui.SOUND_OFF=Desativar sons
 service.gui.SOUND_ON=Ativar sons
+service.gui.START_SHARING=Iniciar compartilhamento
+service.gui.STATUS=Status
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=tornou-se {0}
+service.gui.STATUS_CHANGE_GENERAL_ERROR=Falha na mudança de status 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.STATUS_MESSAGE_INFO=Na linha abaixo pode indicar a nova mensagem que pretende usar.
+service.gui.STOP_SHARING=Interromper compartilhamento
+service.gui.STREET=Rua
+service.gui.SUBJECT=Assunto
+service.gui.SUMMARY=Resumo
+service.gui.TELEPHONY=Telefonia
 service.gui.TOOLS=&Ferramentas
+service.gui.TRANSFER=Trans&ferência
+service.gui.TO=&Para:
+service.gui.TRANSFER_CALL_MSG=Selecione o nome do contato que você deseja transferir e depois clique em Transferir.
+service.gui.TRANSFER_CALL_TITLE=Transferir Chamada
+service.gui.TRANSFER_CALL_TO=Transferir para:
+service.gui.TRANSPARENCY_NOT_ENABLED=Transparência não é suportada por sua configuração atual.
+service.gui.TYPE_YOUR_REQUEST=Escreva o seu pedido aqui
+service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Não foi possível alterar a qualidade do vídeo para esta chamada.
+service.gui.USER_IDENTIFIER=Identificador de usuário:
+service.gui.USER_EXISTS_ERROR=Este usuário existe na rede selecionada. Escolha outro usuário ou outra rede.
+service.gui.USERNAME_NULL=Digite o seu nome de usuário e sua senha.
+service.gui.WEBPAGE=Abrir a página web
+service.gui.ACCOUNT_CREATION_FAILED=Não foi possível criar a sua conta devido ao erro: {0}
+service.gui.UNKNOWN=Usuário desconhecido
+service.gui.UNKNOWN_STATUS=Estado desconhecido
+service.gui.UNREGISTERED_MESSAGE=Não foi possível conectar à conta: Nome de usuário: {0}, Nome do servidor: {1}. Você está offline.
+service.gui.USE_PROVISIONING=Use provisionamento online
+service.gui.VALUE=Valor
+service.gui.VIDEO_CALL=Chamada de &vídeo
+service.gui.VIA=via
+service.gui.VIEW=&Visualizar
+service.gui.VIEW_HISTORY=Exibir &histórico
+service.gui.VIEW_SMILEYS=Exibir &smileys
 service.gui.VIEW_TOOLBAR=Visualizar &barra de ferramentas
+service.gui.VIEW_SIMPLE_CHAT_THEME=Ver tema simples de janela de conversação
+service.gui.VOICEMAIL_NEW_URGENT_OLD_RECEIVED={0} nova(s) ({1} urgente(s)) e {2} antigas
+service.gui.VOICEMAIL_NEW_URGENT_RECEIVED={0} nova ({1} urgente) mensagens
+service.gui.VOICEMAIL_NEW_OLD_RECEIVED={0} novas e {1} mensagens antigas
+service.gui.VOICEMAIL_NEW_RECEIVED={0} mensagens novas
+service.gui.VOICEMAIL_OLD_RECEIVED={0} mensagens antigas
+service.gui.VOICEMAIL_NO_MESSAGES=Sem mensagens.
+service.gui.VOICEMAIL_TITLE=Mensagens de voz
+service.gui.VOICEMAIL_TOOLTIP=Mensagens de voz para:
+service.gui.VOICEMAIL_TIP=Clique no botão de chamada para ouvir suas mensagens.
+service.gui.VOICEMAIL_TIP_NO_ACCOUNT=Configure o URI para verificar o voicemail no assistente de conta
+service.gui.VOLUME_CONTROL_TOOL_TIP=Ajustar o volume
+service.gui.WAITING_AUTHORIZATION=Aguardando autorização
+service.gui.WARNING=Alerta
+service.gui.YES=Sim
+service.gui.NEW_GMAIL_HEADER=Você recebeu uma nova mensagem em sua {0} <a href="{1}">caixa de entrada</a>:<br/>
+service.gui.NEW_GMAIL_MANY_HEADER=Você recebeu {2} novas mensagens em sua {0} <a href="{1}">caixa de entrada</a>:<br/>
+service.gui.NEW_GMAIL_FOOTER=mais uma conversa não lida em sua <a href="{0}">caixa de entrada</a>.<br/>
+service.gui.NEW_GMAIL_MANY_FOOTER={1} mais conversas não lidas em sua <a href="{0}">caixa de entrada</a>.<br/>
+service.gui.ACTIVATE=Ativar
+service.gui.DEACTIVATE=Desativar
+service.gui.NEW=Novo
+service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Mudar para tela cheia
+service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Sair da tela cheia
+service.gui.HOLD_BUTTON_TOOL_TIP=Alternar espera
+service.gui.MUTE_BUTTON_TOOL_TIP=Alternar Mudo ou segure o botão para ajustar som do microfone
+service.gui.PARK=Em espera
+service.gui.PARKING_SLOT=Fila de espera
+service.gui.PARK_BUTTON_TOOL_TIP=Chamada em espera
+service.gui.RECORD_BUTTON_TOOL_TIP=Alternar Gravação
+service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=Alternar Vídeo
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Mostrar/Esconder vídeo local
 service.gui.SHOW_HIDE_PEERS_TOOL_TIP=Mostrar/Esconder lista de participantes da chamada
+service.gui.TRANSFER_BUTTON_TOOL_TIP=Transferir chamada
+service.gui.TRANSFER_TO=Transferir para...
 service.gui.SECURITY_INFO=Informações de segurança
-service.gui.UPDATE=Atualizar
-
-
+service.gui.SECURITY_WARNING=Alerta de segurança
+service.gui.SECURITY_ERROR=Erro de segurança
+service.gui.SPEED=Velocidade:
+service.gui.SILENT_MEMBER=membro silencioso
+service.gui.NON_SECURE_CONNECTION=Não é possível estabelecer uma conexão segura para a conta {0}. Se você quer conectar através de um servidor não seguro, por favor marque "Permitir conexões não seguras" na configuração de sua conta
+service.gui.MOBILE_PHONE=Celular
+service.gui.VIDEO_PHONE=Vídeo
+service.gui.WORK_PHONE=Trabalho
+service.gui.PHONE=Telefone
+service.gui.PHONES=Telefones
+service.gui.EDIT_NOT_SUPPORTED=Edição desta conta não é suportada
+service.gui.SHOW_PREVIEW=(exibir visualização)
+service.gui.SHOW_PREVIEW_WARNING_DESCRIPTION=Pretende continuar com a visualização desta imagem?\n\nTenha em mente que ao ativar a visualização de Imagem/Vídeo pode comprometer o seu anonimato e expor a sua atividade na rede.
+service.gui.SHOW_PREVIEW_DIALOG_TITLE=Mostrar previsualização de Imagem/Video
+
+service.gui.ZID_NAME_SET=Nome do identificador ZRTP:
+service.gui.ZID_NAME_NOT_SET=O nome do identificador ZRTP não está definido.
+service.gui.ZID_NAME_BUTTON=Clique para definir o nome do identificador ZRTP.
+service.gui.ZID_NAME_DIALOG=Alterar nome do identificador ZRTP
+service.gui.ZID_NAME_UNEXPECTED=<html>As chaves ZRTP não coincidem.<br><b>Compare e verifique a string de autenticação entre os equipamentos envolvidos!</b><br>Altere as chaves ZRP e armazene-as somente se a string de autenticação coincidir.</html>
+
+service.gui.JANUARY=Jan
+service.gui.FEBRUARY=Fev
+service.gui.MARCH=Mar
+service.gui.APRIL=Abr
+service.gui.MAY=Mai
+service.gui.JUNE=Jun
+service.gui.JULY=Jul
+service.gui.AUGUST=Ago
+service.gui.SEPTEMBER=Set
+service.gui.OCTOBER=Out
+service.gui.NOVEMBER=Nov
+service.gui.DECEMBER=Dez
 
 service.gui.callinfo.TECHNICAL_CALL_INFO=Informação técnica da chamada
 service.gui.callinfo.CALL_INFORMATION=Informações da chamada
+service.gui.callinfo.CALL_IDENTITY=Identidade
+service.gui.callinfo.PEER_COUNT=Contador de participante
+service.gui.callinfo.IS_CONFERENCE_FOCUS=Foco na conferência
+service.gui.callinfo.CALL_TRANSPORT=Transporte da chamada de sinalização
+service.gui.callinfo.CALL_DURATION=Duração da chamada
+service.gui.callinfo.TLS_PROTOCOL=Protocolo TLS
+service.gui.callinfo.TLS_CIPHER_SUITE=Conjunto de cifras do TLS
+service.gui.callinfo.TLS_CERTIFICATE_CONTENT=O conteudo do certificado do servidor TLS é apresentado abaixo.
+service.gui.callinfo.VIEW_CERTIFICATE=Visualizar certificado
+service.gui.callinfo.CODEC=Codec / Frequencia
+service.gui.callinfo.NA=N.A.
+service.gui.callinfo.VIDEO_SIZE=Tamanho do vídeo
 service.gui.callinfo.AUDIO_INFO=Informações do áudio
 service.gui.callinfo.VIDEO_INFO=Informações do vídeo
-
+service.gui.callinfo.LOCAL_IP=IP / Porta Local
+service.gui.callinfo.REMOTE_IP=Porta / IP remoto
+service.gui.callinfo.BANDWITH=Largura de banda
+service.gui.callinfo.LOSS_RATE=Taxa de perda
+service.gui.callinfo.RTT=RTT
+service.gui.callinfo.JITTER=Jitter
+service.gui.callinfo.MEDIA_STREAM_TRANSPORT_PROTOCOL=Protocolo de transporte de streaming
+service.gui.callinfo.MEDIA_STREAM_RTP=RTP
+service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
+service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Protocolo de troca de chaves
+service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=Tipo extendido de candidato ICE
+service.gui.callinfo.ICE_STATE=Estado de Processamento ICE
+
+#enum values from IceProcessingState
+service.gui.callinfo.ICE_STATE.WAITING=Reunir candidatos
+service.gui.callinfo.ICE_STATE.RUNNING=Verificação de conectividade
+service.gui.callinfo.ICE_STATE.COMPLETED=Concluído
+service.gui.callinfo.ICE_STATE.FAILED=Falhou
+
+service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Computador local IP / Porta
+service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Porta / IP reflexiva local
+service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=IP / Porta local retransmitida
+service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=IP / Porta do hospedeiro remoto
+service.gui.callinfo.ICE_REMOTE_REFLEXIVE_ADDRESS=IP / Porta reflexiva remota
+service.gui.callinfo.ICE_REMOTE_RELAYED_ADDRESS=IP / Porta remota retransmitida
+service.gui.callinfo.TOTAL_HARVESTING_TIME=Tempo total de captação
+service.gui.callinfo.HARVESTING_TIME=Tempo de captação
+service.gui.callinfo.HARVESTING_MS_FOR=ms (para
+service.gui.callinfo.HARVESTS=captações)
+service.gui.callinfo.DECODED_WITH_FEC=Pacotes decodificados com FEC
+service.gui.callinfo.DISCARDED_PERCENT=Pacotes atualmente sendo descartados
+service.gui.callinfo.DISCARDED_TOTAL=Número de pacotes descartados
+service.gui.callinfo.ADAPTIVE_JITTER_BUFFER=Buffer do jitter adaptativo
+service.gui.callinfo.JITTER_BUFFER_DELAY=Buffer de jitter
+
+service.gui.ALWAYS_TRUST=Sempre confiar neste certificado
+service.gui.CERT_DIALOG_TITLE=Verificar Certificado
+service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} não pode verificar a identidade do servidor durante a conexão a<br><b>{1}</b>.<br><br> O certificado não é confiável, o que significa que a identidade do servidor não pode ser verificada automaticamente.<br><br> Deseja conectar mesmo assim?<br> Para mais informações, clique em "Exibir Certificado".</html>
+service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} não pode verificar a identidade do certificado do servidor.<br><br> O certificado não é confiável, o que significa que a identidade do servidor não pode<br> ser verificada automaticamente. Deseja continuar com a conexão?<br><br> Para mais informações clique em "Exibir Certificado".</html>
 service.gui.CONTINUE_ANYWAY=Continuar assim mesmo
+service.gui.CERT_INFO_CHAIN=Cadeia de certificados:
+service.gui.CERT_INFO_ISSUED_TO=Emitido Por
+
+#service.gui.CERT_INFO_ are combined from Rdn names
+service.gui.CERT_INFO_CN=Nome comum (CN):
+service.gui.CERT_INFO_O=Organização:
+service.gui.CERT_INFO_C=Nome do País:
+service.gui.CERT_INFO_ST=Nome do Estado ou Província:
+service.gui.CERT_INFO_L=Nome da Localidade:
+service.gui.CERT_INFO_ISSUED_BY=Emitido Por
+service.gui.CERT_INFO_OU=Unidade Organizacional:
+service.gui.CERT_INFO_VALIDITY=Validade
+service.gui.CERT_INFO_ISSUED_ON=Data de emissão:
+service.gui.CERT_INFO_EXPIRES_ON=Expira Em:
+service.gui.CERT_INFO_FINGERPRINTS=Impressões digitais
 service.gui.CERT_INFO_CERT_DETAILS=Informação do certificado
+service.gui.CERT_INFO_SER_NUM=Numero de Série:
+service.gui.CERT_INFO_VER=Versão:
+service.gui.CERT_INFO_SIGN_ALG=Algoritmo de assinatura:
 service.gui.CERT_INFO_PUB_KEY_INFO=Informações da chave pública
-service.gui.CONTINUE=Continuar
+service.gui.CERT_INFO_ALG=Algoritmo:
+service.gui.CERT_INFO_PUB_KEY=Chave pública:
+service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
+service.gui.CERT_INFO_EXP=Expoente:
+service.gui.CERT_INFO_KEY_SIZE=Tamanho da chave:
+service.gui.CERT_INFO_SIGN=Assinatura:
+service.gui.SHOW_CERT=Mostrar Certificado
 service.gui.HIDE_CERT=Ocultar certificado
 
 service.gui.AUTO_ANSWER=Atendimento automático e transferência de chamadas
 service.gui.AUTO_ANSWER_LABEL=Resposta automática
-
-service.gui.security.NO_VIDEO=Sem vídeo
+service.gui.AUTO_ANSWER_ALL_CALLS=Todas as chamadas
+service.gui.AUTO_ANSWER_ALERT_INFO_FIELDS=Somente chamadas que requeiram. (Aquelas contendo um campo "Informação-Alerta" definido para "Resposta Automática")
+service.gui.AUTO_ANSWER_CUSTOM_FIELDS=Chamadas com o seguinta campo e valor
+service.gui.AUTO_ANSWER_FIELD=Campo/Cabeçalho:
+service.gui.AUTO_ANSWER_VALUE=Valor:
+service.gui.AUTO_ANSWER_DESCR_VLUE=deixe vazio para qualquer
+service.gui.AUTO_ANSWER_FWD_CALLS=Encaminhar Chamadas
+service.gui.AUTO_ANSWER_FWD_CALLS_TO=Redirecionar todas as chamadas para o seguinte número ou URI:
+service.gui.AUTO_ANSWER_VIDEO=Vídeo
+service.gui.AUTO_ANSWER_VIDEO_CALLS_WITH_VIDEO=Responder chamadas de vídeo com vídeo
+service.gui.LOCAL_VIDEO_ERROR_TITLE=Erro no vídeo local
+service.gui.LOCAL_VIDEO_ERROR_MESSAGE=Não foi possível ativar/desativar o vídeo local.
+
+service.gui.security.SECURE_AUDIO=Áudio seguro
+service.gui.security.AUDIO_NOT_SECURED=Áudio inseguro
+service.gui.security.SECURE_VIDEO=Vídeo seguro
+service.gui.security.VIDEO_NOT_SECURED=Vídeo inseguro
 service.gui.security.CALL_SECURED_TOOLTIP=Chamada segura. Para mais informações clique aqui.
+service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Clique aqui para comparar o seu código de segurança com o do outro participante.
 # keep the following string short
-
+service.gui.security.COMPARE_WITH_PARTNER_SHORT=Comparar com o outro participante:
+service.gui.security.STRING_COMPARED=Código comparado!
+service.gui.security.SAS_INFO_TOOLTIP=<html>Para que tudo esteja seguro você<br/>precisa <b>comparar</b> verbalmente o pequeno <br/>código de autenticação exibido com o código<br/>do outro participante e clicar no botão confirmar quando o <br /> código for verificado.<br/><br/>Se você não confirmar, será solicitada a verificação<br/>na próxima vez que chamar este participante.</html>
+service.gui.security.SECURITY_ALERT=Tentanto uma chamada segura. Desconectará em
+
+service.gui.avatar.CHOOSE_ICON=Escolha uma imagem
+service.gui.avatar.REMOVE_ICON=Remover a imagem actual
+service.gui.avatar.CLEAR_RECENT=Limpar imagens recentes
+service.gui.avatar.RECENT_ICONS=Imagens recentes:
 # service.gui.avatar.imagepicker
 service.gui.avatar.imagepicker.CANCEL=Cancelar
+service.gui.avatar.imagepicker.CHOOSE_FILE=Escolher...
+service.gui.avatar.imagepicker.CLICK=Clique e Sorria
+service.gui.avatar.imagepicker.IMAGE_FILES=Arquivos de imagem
+service.gui.avatar.imagepicker.IMAGE_PICKER=Imagem
+service.gui.avatar.imagepicker.IMAGE_SIZE=Tamanho da imagem
+service.gui.avatar.imagepicker.RESET=Reiniciar
+service.gui.avatar.imagepicker.SET=Definir
+service.gui.avatar.imagepicker.TAKE_PHOTO=Tirar uma foto
 
+service.gui.security.encryption.required=Encriptação requerida!
 
+service.protocol.ICE_FAILED=Não foi possível estabelecer a conexão (ICE falhou e transmissão não encontrada)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
+service.systray.MODE=Característica de exibição na bandeja do sistema
+service.systray.mode.NATIVE=Padrão
+service.systray.mode.DISABLED=Desabilitado
+service.systray.CLI_NOTE=Se sua escolha não funcionar, você pode iniciar {0} com o argumento "--notray". Isto força o modo para "Desabilitado" e mostra a interface gráfica ao usuário. Alterar a característica de exibição na bandeja do sistema requer reinicialização.
 
+impl.protocol.sip.XCAP_ERROR_TITLE=Erro no arquivo da lista de contatos SIP
+impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=O recurso não pode ser lido {0}. Para {1}
+impl.protocol.sip.XCAP_ERROR_UNAUTHORIZED=Usuário ou senha errados usando xcap. Para {0}.
 
 # systray
+impl.systray.SET_STATUS=Definir estado
+impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=Falhou ao abrir janela "Adicionar Contato".
+impl.systray.POPUP_MESSAGE_HANDLER=Mensagens popup
+impl.swingnotification.POPUP_MESSAGE_HANDLER={0} popups
+impl.growlnotification.POPUP_MESSAGE_HANDLER=Notificações sonoras
+impl.galagonotification.POPUP_MESSAGE_HANDLER=Notificações do freedesktop.org no Ambiente de Trabalho
 
 # New Account Dialog
+impl.gui.main.account.DEFAULT_PAGE_TITLE=Selecionar Rede
+impl.gui.main.account.DEFAULT_PAGE_BODY=Você pode usar a lista acima para selecionar a rede que deseja adicionar uma conta.
+impl.gui.main.account.DUMMY_PROTOCOL_NAME=selecione a rede
+impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=selecione a rede
 
 # LDAP
+impl.ldap.CONFIG_FORM_TITLE=Configuração do LDAP
 impl.ldap.GENERAL=Geral
+impl.ldap.FIELDS=Campos
+impl.ldap.QUERY=Consulta
+impl.ldap.QUERY_DEFAULT=Criar automaticamente
+impl.ldap.QUERY_CUSTOM=Consulta personalizada
+impl.ldap.QUERY_CUSTOM_HINT=Use {0} como um espaço reservado para o termo de busca.
+impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Adicionar coringas automaticamente ao argumento de pesquisa
+impl.ldap.QUERY_PHOTO_INLINE=Trazer fotos junto com demais atributos
+impl.ldap.EDIT=editar
+impl.ldap.ENABLED=Habilitado
+impl.ldap.SERVER_NAME=Nome do servidor
+impl.ldap.SERVER_NAME_EXAMPLE=Meu servidor LDAP
+impl.ldap.SERVER_HOSTNAME=Nome da máquina
+impl.ldap.SERVER_EXIST=O servidor já existe, escolha um nome diferente
+impl.ldap.USE_SSL=Usar SSL
+impl.ldap.AUTH_NONE=Nenhum
+impl.ldap.AUTH_SIMPLE=Simples
+impl.ldap.SCOPE_SUB_TREE=Sub árvore
+impl.ldap.SCOPE_ONE=Um
+impl.ldap.SAVE=&Salvar
 impl.ldap.CANCEL=Cancelar
+impl.ldap.SERVER_PORT=Porta
+impl.ldap.PASSWORD=Senha
+impl.ldap.MAILSUFFIX_FIELD_NAME=Campo(s) de sufixo de e-mail
+impl.ldap.WORKPHONE_FIELD_NAME=Campo(s) do telefone do trabalho
+impl.ldap.MOBILEPHONE_FIELD_NAME=Campo(s) do celular
+impl.ldap.HOMEPHONE_FIELD_NAME=Campo(s) do telefone de casa
+impl.ldap.MAIL_FIELD_EXAMPLE=e-mail
+impl.ldap.MAILSUFFIX_FIELD_EXAMPLE=@domain.org (não se esqueça de adicionar '@')
+impl.ldap.WORKPHONE_FIELD_EXAMPLE=telefoneEmpresa
+impl.ldap.MOBILEPHONE_FIELD_EXAMPLE=celularEmpresa
+impl.ldap.HOMEPHONE_FIELD_EXAMPLE=telefoneCasa
+impl.ldap.PHONE_PREFIX=Prefixo do telefone:
+
+# SIP Protocol
+
+#Jabber Protocol
 
 # Address book plugin
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE=Erro ao acessar seus contatos do Microsoft Outlook.
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT={0} não é possível acessar os contatos do Microsoft Outlook neste momento porque o Outlook não está definido como a aplicação padrão de e-mail.
+plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Definir o Outlook como cliente de e-mail padrão
 
 # Google Contacts
+impl.googlecontacts.CONFIG_FORM_TITLE=Contatos do Google
+impl.googlecontacts.EDIT=editar
+impl.googlecontacts.ENABLED=Habilitado
+impl.googlecontacts.ACCOUNT_NAME=Nome da conta
+impl.googlecontacts.SAVE=&Salvar
 impl.googlecontacts.CANCEL=Cancelar
+impl.googlecontacts.USERNAME=Nome da conta
+impl.googlecontacts.PASSWORD=Senha
+impl.googlecontacts.PREFIX=Prefixo do telefone:
 
 # account info
 plugin.accountinfo.TITLE=Informações da conta
+plugin.accountinfo.DISPLAY_NAME=Exibir nome
+plugin.accountinfo.FIRST_NAME=Primeiro nome:
+plugin.accountinfo.MIDDLE_NAME=Nome do meio:
+plugin.accountinfo.LAST_NAME=Último nome:
+plugin.accountinfo.NICKNAME=Apelido:
+plugin.accountinfo.URL=URL:
+plugin.accountinfo.AGE=Idade:
+plugin.accountinfo.BDAY=Data de nascimento:
+plugin.accountinfo.BDAY_FORMAT=MMM dd, yyyy
+plugin.accountinfo.GENDER=Sexo:
 plugin.accountinfo.CITY=Cidade:
+plugin.accountinfo.POST=Código postal
+plugin.accountinfo.COUNTRY=País
+plugin.accountinfo.EMAIL=E-mail
+plugin.accountinfo.PHONE=Telefone
+plugin.accountinfo.MOBILE_PHONE=celularEmpresa
+plugin.accountinfo.ORGANIZATION=Nome da organização:
+plugin.accountinfo.JOB_TITLE=Função:
+plugin.accountinfo.ABOUT_ME=Sobre mim:
+plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
+plugin.accountinfo.GLOBAL_ICON=Usar icone global
+plugin.accountinfo.LOCAL_ICON=Usar este ícone:
 
 # connection info
 plugin.connectioninfo.TITLE=Informações da conexão
 
 # contact info
+plugin.contactinfo.USER_PICTURES=Imagens do usuário
 
 # aimaccregwizz
+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Nome do usuário e senha
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Registrar nova conta
 
 # branding
+plugin.branding.ABOUT_WINDOW_TITLE=Sobre {0}
+plugin.branding.LOGO_MESSAGE=VoIP de código aberto && Mensageiro Instantâneo
 plugin.branding.ABOUT_MENU_ENTRY=&Sobre
 
-# Dict protocol
-plugin.dictaccregwizz.SERVER_INFO=Informações do servidor
-
-# facebookaccregwizz
 
 # generalconfig
 plugin.generalconfig.GROUP_CHAT_MESSAGES=Agrupar conversas em uma janela
 plugin.generalconfig.LOG_HISTORY=Salvar histórico das conversas
+plugin.generalconfig.SHOW_HISTORY=Mostrar
 plugin.generalconfig.HISTORY_SIZE=mensagens recentes em novas janelas de conversação
 plugin.generalconfig.SEND_MESSAGES_WITH=Enviar mensagens utilizando:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Trazer a janela de conversação para a frente
@@ -389,13 +879,17 @@ plugin.generalconfig.LEAVE_CHATROOM_ON_WINDOW_CLOSE=Deixar salas de conversaçã
 plugin.generalconfig.SHOW_RECENT_MESSAGES=Mostrar conversas recentes (o histórico precisa estar habilitado)
 plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Remover caracteres especiais antes de chamar números telefônicos
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Converter letras em número telefônico
-plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=ex.: +1-800-CASA -> +1-800-123456
+plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=Exemplo: 0800-MEUNUMERO-> 0800-638686376
 
 # gibberish accregwizz
 
 # icqaccregwizz
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Registrar nova conta
 
 # irc accregwizz
+plugin.ircaccregwizz.USERNAME=Apelido
+plugin.ircaccregwizz.HOST=Nome da máquina
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} autenticação
 
 # jabber accregwizz
 plugin.jabberaccregwizz.NO_STUN_ADDRESS=Por favor insira um endereço de servidor STUN válido para poder continuar.
@@ -406,23 +900,24 @@ plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Seu servidor XMPP nã
 plugin.jabberaccregwizz.PASSWORD_NOT_STORED=A senha foi alterada no servidor, mas a configuração local não foi atualizada
 plugin.jabberaccregwizz.ENCODINGS=Codificadores
 plugin.jabberaccregwizz.AUDIO=Áudio
-
-# mailbox
-
-# msn accregwizz
+plugin.jabberaccregwizz.VIDEO=Vídeo
+plugin.jabberaccregwizz.RESET=Reiniciar
 
 # plugin manager
-plugin.pluginmanager.UPDATE=Atualizar
+plugin.pluginmanager.UNINSTALL=Desinstalar
+plugin.pluginmanager.NEW=Novo
 
 # simple accregwizz
 
 # sipaccregwizz
+plugin.sipaccregwizz.PROXY_PORT=Porta do servidor proxy
+plugin.sipaccregwizz.DISPLAY_NAME=Exibir nome
+plugin.sipaccregwizz.CLIST_TYPE=Tipo
+plugin.sipaccregwizz.XCAP_PASSWORD=Senha
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-plugin.sshaccregwizz.OPTIONAL=Opcional
-
 # status update
 plugin.autoaway.ENABLE_CHANGE_STATUS=Mudar o estado quando ausente
 plugin.autoaway.AWAY_MINUTES=Minutos antes de mudar estado para ausente:
@@ -431,6 +926,7 @@ plugin.autoaway.AWAY_MINUTES=Minutos antes de mudar estado para ausente:
 plugin.updatechecker.DIALOG_TITLE=Instalar atualizações
 plugin.updatechecker.DIALOG_MESSAGE=<html>Uma nova versão do {0} está disponível.
 plugin.updatechecker.BUTTON_DOWNLOAD=Transferir
+plugin.updatechecker.BUTTON_CLOSE=F&echar
 plugin.updatechecker.UPDATE_MENU_ENTRY=Procurar por atualizações
 plugin.updatechecker.DIALOG_NOUPDATE=Sua versão está atualizada.
 plugin.updatechecker.DIALOG_MISSING_UPDATE=O instalador da atualização não foi encontrado.
@@ -438,33 +934,44 @@ plugin.updatechecker.DIALOG_MISSING_UPDATE=O instalador da atualização não fo
 # usersearch
 
 # whiteboard
-
-# yahoo accregwizz
-
-# zero accregwizz
+plugin.whiteboard.OPEN=Abrir
+plugin.whiteboard.COLOR=Cor
+plugin.whiteboard.DELETE=Excluir
 
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+plugin.keybindings.CHAT_COPY=&Copiar
+plugin.keybindings.CHAT_CUT=&Recortar
+plugin.keybindings.CHAT_PASTE=&Colar
+plugin.keybindings.MAIN_RENAME=Re&nomear contato
+plugin.keybindings.globalchooser.SHORTCUT_NAME=Nome
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Conversação
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=Habilitar
 plugin.notificationconfig.DISPLAY_POPUP=Mostrar uma mensagem em uma janela flutuante
 plugin.notificationconfig.POPUP_NOTIF_HANDLER=Tipo de notificação flutuante
 plugin.notificationconfig.tableheader.SOUND=Tocar um som usando o dispositivo de notificação
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Tocar um som usando o dispositivo de reprodução de áudio
+plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Tocar um som usando o dispositivo de reprodução de áudio
+#NotificationsTable constants
+plugin.notificationconfig.event.IncomingCall=Recebendo chamada
+plugin.notificationconfig.event.IncomingFile=Recebendo chamada
 plugin.notificationconfig.event.HangUp=Desligar
 
 # ZRTP Securing
 
 # ZRTP Configuration
+impl.media.security.zrtp.CONFIG=Configuração do LDAP
 impl.media.security.zrtp.TITLE=Chamar
+impl.media.security.zrtp.PUB_KEYS=Chave pública:
 impl.media.security.zrtp.DESCRIPTION=O {0} tentará garantir automaticamente a segurança de suas chamadas. Você receberá um notificação audiovisual quando uma chamada segura for estabelecida. O botão abaixo permite alterar de forma avançada como o {0} se comportará durante negociações ZRTP. Nenhuma alteração é necessária para poder fazer chamadas seguras. Você deverá somente alterar essas configurações se você possuir conhecimento de como ZRTP e encriptação em geral funcionam.
 
 
@@ -481,54 +988,199 @@ impl.media.configform.ECHOCANCEL=Habilitar cancelamento de eco
 impl.media.configform.ENCODINGS=Codificadores
 impl.media.configform.UP=&Subir
 impl.media.configform.VIDEO=Mais configurações
+impl.media.configform.VIDEO_MORE_SETTINGS=Mais configurações
 impl.media.configform.VIDEO_RESOLUTION=Resolução de vídeo
 
 impl.neomedia.configform.AUDIO=Áudio
+impl.neomedia.configform.VIDEO=Vídeo
 
+#in JNIEncoder
+impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTP
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
 
 # Security configuration form title
 plugin.securityconfig.TITLE=Segurança
+plugin.securityconfig.masterpassword.TITLE=Senha
+plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Senha atual:
+plugin.securityconfig.masterpassword.ENTER_PASSWORD=Informe sua senha:
+plugin.securityconfig.masterpassword.REENTER_PASSWORD=Repita sua senha:
+plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Mudança de Senha Falhou
+plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS=Senha Alterada
+plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS_MSG=Senha Master alterada
+plugin.securityconfig.masterpassword.MP_REMOVE_SUCCESS_MSG=Senha Master alterada
+plugin.securityconfig.masterpassword.COL_TYPE=Tipo
+plugin.securityconfig.masterpassword.COL_NAME=Nome
+plugin.securityconfig.masterpassword.COL_PASSWORD=Senha
+plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=Desconhecido
+plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(não é possível decifrar)
+plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Senhas armazenadas
 plugin.securityconfig.masterpassword.HIDE_PASSWORDS_BUTTON=Ocultar senhas
 
 # otr plugin
+plugin.otr.menu.TITLE=Chat seguro
+plugin.otr.menu.START_OTR=Iniciar conversa privada
+plugin.otr.menu.END_OTR=Encerrar conversa privada
+plugin.otr.menu.LOADING_OTR=Iniciar conversa privada
+plugin.otr.menu.TIMED_OUT=Iniciar conversa privada
+plugin.otr.menu.REFRESH_OTR=Iniciar conversa privada
 plugin.otr.menu.WHATS_THIS=O que é isso
+plugin.otr.menu.CB_AUTO=Iniciar mensagens privadas automaticamente
+plugin.otr.menu.CB_AUTO_ALL=Iniciar mensagens privadas automaticamente
+plugin.otr.menu.CB_ENABLE=Habilitar mensagens privadas
+plugin.otr.menu.CB_REQUIRE=Exigir mensagens privadas
+plugin.otr.menu.CB_RESET=Reiniciar
 plugin.otr.authbuddydialog.CANCEL=Cancelar
 plugin.otr.authbuddydialog.HELP=Aj&uda
+plugin.otr.smpprogressdialog.AUTHENTICATION_SUCCESS=Autenticação bem sucedida!
+plugin.otr.smpprogressdialog.AUTHENTICATION_FAIL=Autenticação falhou!
 plugin.otr.configform.MY_PRIVATE_KEYS=Minhas Chaves Privadas
+plugin.otr.configform.KNOWN_FINGERPRINTS=Impressões Digitais Conhecidas
+plugin.otr.configform.CB_AUTO=Iniciar mensagens privadas automaticamente
+plugin.otr.configform.CB_ENABLE=Habilitar mensagens privadas
+plugin.otr.configform.CB_REQUIRE=Exigir mensagens privadas
 plugin.otr.configform.GENERATE=Gerar
+plugin.otr.configform.FINGERPRINT=Impressão Digital
+plugin.otr.configform.VERIFY_FINGERPRINT=Verificar Impressão Digital
 plugin.otr.configform.COLUMN_NAME_CONTACT=Contato
+plugin.otr.configform.COLUMN_NAME_VERIFIED_STATUS=Verificada
+plugin.otr.configform.COLUMN_VALUE_VERIFIED_TRUE=Sim
+plugin.otr.configform.COLUMN_VALUE_VERIFIED_FALSE=Não
+plugin.otr.activator.sessionstared=Conversa privada com {0} iniciada.
+plugin.otr.activator.sessionlost=Conversa privada com {0} iniciada.
+plugin.otr.activator.smpaborted={0} interrompeu o processo de autenticação.
+plugin.otr.activator.smperror=Ocorreu um erro no processo de autenticação.
+plugin.otr.activator.unencryptedmsgreceived=A mensagem foi recebida não criptografada
+plugin.otr.activator.unreadablemsgreceived={0} enviou uma mensagem criptografada ilegível.
 
 # global proxy plugin
+plugin.globalproxy.GLOBAL_PROXY_CONFIG=Proxy Global
+plugin.globalproxy.PROXY_TYPE=Tipo de Servidor Proxy
+plugin.globalproxy.PROXY_ADDRESS=Servidor Proxy
+plugin.globalproxy.PROXY_PORT=Porta do servidor proxy
+plugin.globalproxy.PROXY_USERNAME=Usuário do servidor proxy
+plugin.globalproxy.PROXY_PASSWORD=Senha do servidor proxy
 #plugin.globalproxy.PROTOCOL_SUPPORT
+plugin.globalproxy.FWD_DNS_ADDR=Endereço do Proxy DNS
+plugin.globalproxy.FWD_DNS_PORT=Porta do DNS Proxy
 
 # plugin reconnect
+plugin.reconnectplugin.NETWORK_DOWN=Conectividade de rede perdida
 
 
 #plugin chat config
 
 plugin.chatconfig.TITLE=Conversação
+plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Habilitar substituição de smiley
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Habilitar
+plugin.chatconfig.replacement.DISABLE_REPLACEMENT=Desabilitar
+plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Fontes:
+plugin.chatconfig.spellcheck.TITLE=Corretor Ortográfico
 
 #provisioning plugin
+plugin.provisioning.PROVISIONING=Provisionamento
+plugin.provisioning.ENABLE_DISABLE=Habilitar provisionamento
+plugin.provisioning.AUTO=Descobrir automaticamente um URI de provisionamento
+plugin.provisioning.DHCP=DHCP
+plugin.provisioning.DNS=DNS
+plugin.provisioning.URI=URI
 plugin.provisioning.RESTART_WARNING=Note que suas alterações só terão efeito na próxima vez em que você iniciar o {0}!
+plugin.provisioning.UUID=UUID
+plugin.provisioning.COPYTOCLIPBOARD=Copiar UUID para área de transferência
+plugin.provisioning.CLIPBOARD_FAILED=Falhou ao copiar UUID para área de transferência
+plugin.provisioning.FORGET_PASSWORD=Esquecer senha
 
 # packet logging service
+plugin.loggingutils.PACKET_LOGGING_CONFIG=Log
+plugin.loggingutils.ENABLE_DISABLE=Habilitar log de pacotes
+plugin.loggingutils.PACKET_LOGGING_RTP=RTP
+plugin.loggingutils.PACKET_LOGGING_RTP_DESCRIPTION=(guarda 1 pacote de cada 5000)
+plugin.loggingutils.PACKET_LOGGING_ICE4J=ice4j.org
+plugin.loggingutils.PACKET_LOGGING_FILE_COUNT=Número de arquivos de log
+plugin.loggingutils.PACKET_LOGGING_FILE_SIZE=Tamanho máximo do arquivo (em KB)
+plugin.loggingutils.ARCHIVE_BUTTON=Arquivar Logs
 plugin.loggingutils.UPLOAD_LOGS_BUTTON=Enviar relatórios
 plugin.loggingutils.UPLOAD_BUTTON=Enviar
+plugin.loggingutils.ARCHIVE_FILECHOOSE_TITLE=Escolher arquivo
+plugin.loggingutils.ARCHIVE_UPREPORT_EMAIL=johnsmith@email.com
+plugin.loggingutils.ARCHIVE_MESSAGE_NOTOK=Erro archivando logs \n{0}
 
 # dns config plugin
+plugin.dnsconfig.TITLE=DNS
+plugin.dnsconfig.DNSSEC=DNS Security (DNSSEC)
+plugin.dnsconfig.border.TITLE=Resolvedor backup
+plugin.dnsconfig.lblBackupResolver.text=Nome da máquina
+plugin.dnsconfig.lblBackupPort.text=Porta
+plugin.dnsconfig.lblRedemption.text=Voltar para resolvedor primário
+plugin.dnsconfig.dnssec.chkEnabled=Habilitar resolvedor DNSSEC
+plugin.dnsconfig.dnssec.lblDefault=Comportamento padrão
+plugin.dnsconfig.dnssec.chkAbsolute=Tratar todos os nomes de domínio como absolutos
+plugin.dnsconfig.dnssec.lblNameservers=Servidores de nome customizados
+plugin.dnsconfig.dnssec.DOMAIN_NAME=Domínio
+plugin.dnsconfig.dnssec.MODE=Comportamento
+plugin.dnsconfig.dnssec.ENABLE_FAILED=Mudança de estado falhou
+plugin.dnsconfig.dnssec.ENABLE_FAILED_MSG=Mudança de estado do DNSSEC falhou.
+net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=Ignorar
+net.java.sip.communicator.util.dns.SecureResolveMode.SecureOnly=Obrigatório
+net.java.sip.communicator.util.dns.SecureResolveMode.SecureOrUnsigned=Obrigatório para zonas assinadas
+util.dns.INSECURE_ANSWER_TITLE=Falha de DNSSEC
+util.dns.INSECURE_ANSWER_MESSAGE_NO_REASON=Resposta do DNS para {0} é insegura.
+util.dns.DNSSEC_ADVANCED_OPTIONS=Mostrar opções avançadas
+util.dns.DNSSEC_ADVANCED_REASON_UNSIGNED={0} pesquisa por {1} não foi assinada.
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Accept=Aceitar mesmo assim
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.AlwaysAccept=Aceitar sempre
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=&Negar
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.AlwaysDeny=Negar sempre
 
 #plugin spellcheck
+plugin.spellcheck.TITLE=Ortografia e Gramática
+plugin.spellcheck.MENU=Mostrar Ortografia e Gramática
+plugin.spellcheck.ENABLE_SPELL_CHECK=Habilitar corretor ortográfico
+plugin.spellcheck.dialog.FIND=Localizar Próxima
+plugin.spellcheck.dialog.REPLACE=Substituir   
+plugin.spellcheck.dialog.ADD=Acrescentar Palavra
+plugin.spellcheck.DICT_ERROR_TITLE=Erro alterando dicionário
+plugin.spellcheck.DICT_ERROR=Não é possível alterar dicionário
+plugin.spellcheck.DICT_RETRIEVE_ERROR=Dicionário não pode ser obtido de 
+plugin.spellcheck.UNINSTALL_DICTIONARY=Desinstalar
+plugin.spellcheck.DICT_ERROR_DELETE_TITLE=Erro desinstalando dicionário
+plugin.spellcheck.DICT_ERROR_DELETE=Não é possível desinstalar dicionário
+plugin.spellcheck.SPELLCHECK=Corretor ortográfico
 
 
 #Certificate configuration plugin
+plugin.certconfig.TITLE=Configuração TLS
+plugin.certconfig.TRUSTSTORE_CONFIG=Fonte de certificados raiz confiáveis
+plugin.certconfig.JAVA_TRUSTSTORE=Java
+plugin.certconfig.WINDOWS_TRUSTSTORE=Windows
+plugin.certconfig.CERT_LIST_TITLE=Configurações de autenticação de cliente TLS
+plugin.certconfig.CERT_LIST_DESCRIPTION=<html><body>As configurações aqui gerenciadas podem ser escolhidas como  certificados de cliente TLS nas configurações de conta (ex.: para logar com um certificado em seu provedor SIP em vez de usuário e senha).</body></html>
+plugin.certconfig.ALIAS=Nome do identificador no KeyStore
+plugin.certconfig.KEYSTORE_TYPE=Tipo
+plugin.certconfig.EDIT_ENTRY=Editar configuração do certificado do cliente TLS
 plugin.certconfig.KEYSTORE=Arquivo
+plugin.certconfig.KEYSTORE_PASSWORD=Senha
+plugin.certconfig.INCOMPLETE=Por favor preencha todos os campos
+plugin.certconfig.SHOW_CERT_EXCEPTION=Não foi possível mostrar o certificado ({0}).
+plugin.certconfig.KEYSTORE_EXCEPTION=Não foi possível carregar o keystore ({0}).
+plugin.certconfig.ALIAS_LOAD_EXCEPTION=Não foi possível obter identificadores do keystore ({0}).
+plugin.certconfig.INVALID_KEYSTORE_TYPE=O tipo de KeyStore selecionado parece ser inválido ({0}).
+plugin.certconfig.BROWSE_KEYSTORE=Abrir KeyStore
+plugin.certconfig.REVOCATION_TITLE=Opções de revogação de certificado
 
 # Phone number contact source plugin
+plugin.phonenumbercontactsource.DISPLAY_NAME=Números telefônicos
 
 # properties editor
+plugin.propertieseditor.TITLE=Editor de propriedades
+plugin.propertieseditor.NEW_PROPERTY_TITLE=Adicionar nova propriedade
+plugin.propertieseditor.CHECK_BOX=Mostre este alerta na próxima vez
 plugin.propertieseditor.DESCRIPTION=O botão abaixo permite alterar as propriedades de configuração do Jitsi. Alterar estas configurações avançadas pode comprometer a estabilidade, segurança e performance deste aplicativo. Você deve continuar apenas se tiver certeza do que está fazendo.
+plugin.propertieseditor.IM_AWARE=Estou ciente dos riscos
+plugin.propertieseditor.NEED_RESTART=Nota: algumas propriedades exigem reinício antes que as alterações façam efeito.
 
 #Thunderbird address book plugin
+plugin.thunderbird.CONFIG_FORM_TITLE=Thunderbird
+plugin.thunderbird.ENABLED=Habilitado
+plugin.thunderbird.PHONE_PREFIX=Prefixo do telefone:
diff --git a/resources/languages/resources_ro.properties b/resources/languages/resources_ro.properties
index 872eb64..3b7168e 100644
--- a/resources/languages/resources_ro.properties
+++ b/resources/languages/resources_ro.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,26 +43,20 @@ service.gui.ACCOUNT_ME=Eu
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Asistent de înregistrare a contului
 service.gui.ACCOUNTS=Conturi
 service.gui.ADD=&Adaugă
-service.gui.ADD_ACCOUNT=Adaugă cont
 service.gui.ADD_CONTACT=&Adaugă contact
 service.gui.ADD_AUTHORIZED_CONTACT=Adaugă {0} în lista ta de contacte
 service.gui.ADD_CONTACT_TO=&Adaugă contact la
 service.gui.ADD_CONTACT_ERROR=Nu s-a putut adăuga contactul cu identificatorul: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Eroare la adăugarea contactului
 service.gui.ADD_CONTACT_EXIST_ERROR=Contactul {0} deja există î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 a contactului
 service.gui.ADD_GROUP_LOCAL_ERROR=A eșuat adăugarea grupului cu numele: {0}. Problema a intervenit în timpul unei operații locale IO.
 service.gui.ADD_GROUP_EXIST_ERROR=Grupul {0} deja există în lista dvs de contacte. Vă rugăm să alegeți un alt nume.
 service.gui.ADD_GROUP_NET_ERROR=A eșuat adăugarea grupului 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_EMPTY_NAME=Numele grupului trebuie să nu fie gol.
-service.gui.ADD_GROUP=Creează grup
-service.gui.ADD_SUBCONTACT=&Adaugă subcontact
 service.gui.ADDRESS=Adresă
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=&Avansat
-service.gui.ALL=&Toate
 service.gui.ALL_CONTACTS=&Toate contactele
 service.gui.APPLY=&Aplică
 service.gui.ARE_CALLING=sună...
@@ -60,7 +65,6 @@ service.gui.AT=la
 service.gui.AUTHORIZE=&Autorizează
 service.gui.AUTHORIZATION_ACCEPTED=contactul a acceptat cererea dvs de autorizare.
 service.gui.AUTHENTICATION_FAILED=Autentificarea a eșuat pentru {0}. Parola introdusă nu este validă.
-service.gui.AUTHENTICATION_REQUESTED=Este necesară autentificare
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Serverul {0} solicită autentificarea dvs.
 service.gui.AUTHENTICATION_REJECTED=contactul a refuzat cererea dvs de autorizare.
 service.gui.AUTHENTICATION_WINDOW_TITLE=autentificarea {0}
@@ -103,13 +107,11 @@ 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.ROOM_NAME=Conferință
-service.gui.AUTOJOIN=Intră automatic
 service.gui.CHANGE_PASSWORD=Schimbă parola
 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 găsită pe serverul {1}. Verificați corectitudinea numelui introdus.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Este necesar să fiți conectat(ă) pentru a vă putea înscrie la conferință {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Trebuie să fiți conectat(ă) pentru a vă putea deconecta de la o conferință.
-service.gui.CHAT_ROOM_NOT_JOINED=Trebuie să fiți înscris(ă) la conferință pentru a avea posibilitatea de a efectua diverse operații în cadrul acesteia.
 service.gui.CHAT_ROOM_OPTIONS=Setările conferinței
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Conferința {0} necesită să fiți înregistrat(ă) pentru a vă înscrie la ea.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Conferința {0} necesită parolă.
@@ -123,21 +125,17 @@ service.gui.CLEAR=Șterge
 service.gui.CLOSE=În&chide
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Ați primit un mesaj acum 2 secunde. Sunteți sigur(ă) ca vreți să terminați conversația dată?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Are loc transfer de fișiere. Sunteți sigur(ă) că doriți să-l amânați?
-service.gui.CONFIRM=Confirmă
 service.gui.CONNECTED_STATUS=Conectat
 service.gui.CONNECTING=Se conectează...
 service.gui.CONNECTING_STATUS=Conexiunea
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Se conectează...
 service.gui.CONNECTION=Conexiunea
-service.gui.CONNECTION_FAILED_MSG=Eroare de conexiune pentru următorul cont: Nume utilizator: {0}, Nume server: {1}. Vă rugăm să verificați conexiunea la rețea sau să contactați administratorul rețelei dvs pentru mai multă informație.
 service.gui.CONNECTION_EXPIRED_MSG=La momentan sunteți deconectat(ă) de la serverul {0}.
 service.gui.CONTACT_NAME=ID sau număr
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Contactul {0} nu suportă telefonie.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Contactul {0} nu suportă discuții în grup.
 service.gui.CONTACT_PAUSED_TYPING={0} s-a oprit din scrierea mesajului
 service.gui.CONTACT_TYPING={0} scrie un mesaj
 service.gui.CONTACT_INFO=&Informația de contact
-service.gui.CONTACTLIST=Listă de contacte
 service.gui.CONTACTS=Contacte
 service.gui.COPY=&Copiază
 service.gui.COPY_LINK=Copiază &legătura
@@ -147,13 +145,10 @@ service.gui.CREATE_CHAT_ROOM=&Creează 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 a conferinței
 service.gui.CREATE_CONFERENCE_CALL=&Creează un apel în grup...
-service.gui.CREATE_CONFERENCE_CHAT=&Creează o discuție în grup...
 service.gui.CREATE_GROUP=&Creează 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/Creează grup).
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Acest contact nu suportă informații de contact pe web
 service.gui.CUT=T&aie
-service.gui.DATE=Data
 service.gui.DELETE=Șterge
 service.gui.DENY=&Refuză
 service.gui.DESKTOP_SHARING_WARNING=<b>Sunteți sigur că doriți să distribuiți public ecranul?</b> <br> Apăsând OK veți lăsa alți oameni să vă vadă ecranul.
@@ -163,7 +158,6 @@ service.gui.DISCONNECTED_STATUS=Deconectat
 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 afișa mesajul din nou
-service.gui.DOWNLOAD_NOW=&Descarcă acum
 service.gui.DURATION=durata
 service.gui.EDIT=&Editare
 service.gui.EDITED_AT=editat la {0}
@@ -179,7 +173,6 @@ service.gui.ERROR_RECEIVED_FROM=S-a recepționat o eroare de la
 service.gui.ESTIMATED_TIME=Timpul aproximativ:
 service.gui.EVENTS=Evenimente
 service.gui.EXIT=Term&ină
-service.gui.EXTENDED_CRITERIA=Criteriu extins
 service.gui.GENERAL=General
 service.gui.GENERAL_ERROR=Eroare generală
 service.gui.GROUP_NAME=Numele grupului
@@ -237,12 +230,12 @@ service.gui.HISTORY=&Istoria
 service.gui.HISTORY_CONTACT=Istoria - {0}
 service.gui.HOME=Acasă
 service.gui.HOME_PAGE=Pagina de pornire
-service.gui.HOUR=Ora
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identificatorul
 service.gui.IGNORE=&Ignoră
 service.gui.INSERT_SMILEY=Inserează smile
 service.gui.INCOMING_CALL=Apelul de intrare recepționat de la: {0}
+service.gui.INCOMING_SCREEN_SHARE=Apelul de intrare recepționat de la: {0}
 service.gui.INCOMING_CALL_STATUS=Apel primit
 service.gui.INSTANT_MESSAGINGS=MI
 service.gui.INITIATING_CALL_STATUS=Se inițiază apelul
@@ -258,7 +251,6 @@ service.gui.IS_CALLING=sună...
 service.gui.IS_NOW={0} acuma e {1}
 service.gui.JOIN=&Înscriere
 service.gui.JOIN_AS=Î&nscriere ca
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Î&nchide
 service.gui.JOB_TITLE=Funcție
 service.gui.JOIN_CHAT_ROOM=&Înscriere la conferință...
 service.gui.JOIN_CHAT_ROOM_TITLE=Înscriere la conferință
@@ -269,7 +261,6 @@ service.gui.KICK_FAILED=Excluderea a eșuat
 service.gui.KICK_FAILED_GENERAL_ERROR=A eșuat excluderea {0}. A intervenit o eroare generală la server.
 service.gui.KICK_FAILED_NOT_ALLOWED=A eșuat excluderea {0}. Proprietarul sau administratorul conferinței nu poate fi exclus.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=A eșuat excluderea {0}. Nu dispuneți de suficiente privilegii pentru această operație.
-service.gui.LAST=Ultimul
 service.gui.LAST_NAME=Prenume:
 service.gui.LEAVE=&Părăsește
 service.gui.LIMIT_REACHED_FOR_IP=Dvs aveți prea multe registrări curente de pe adresa IP locală și serverul {0} nu mai permite alte înregistrări.
@@ -288,7 +279,6 @@ service.gui.MESSAGE=Mesaj:
 service.gui.MISSED_CALLS_TOOL_TIP=Apeluri pierdute de la:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= și {0} mai mult(e)
 service.gui.MODERATOR=moderator
-service.gui.MORE=Vizualizați mai mult
 service.gui.MORE_LABEL=Mută
 service.gui.MOVE=Mută
 service.gui.MOVE_SUBCONTACT=M&ută subcontactul
@@ -297,7 +287,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Contactul selectat este același ca și \n co
 service.gui.MOVE_SUBCONTACT_QUESTION=Sunteți sigur(ă) că doriți să mutați {0} în {1}?
 service.gui.MOVE_TO_GROUP=&Mută în grup
 service.gui.MOVE_CONTACT=Mută contactul
-service.gui.MOVE_CONTACT_ERROR=&Contactul nu poate fi mutat
 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 trimiterea mesajelor în mod deconectat. Puteţi încerca să accesaţi acest contact prin intermediul altui protocol sau aşteptaţi până când el/ea se va conecta.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=A intervenit o eroare internă. Cel mai posibil că aceasta este o dificultate neprevăzută. Vă rugăm să o raportaţi aici: http://www.sip-communicator.org/index.php/Development/BugsAndIssues.
@@ -308,7 +297,6 @@ service.gui.MSG_NOT_POSSIBLE=Discuții cu acest contact nu sunt posibile (nu est
 service.gui.MSG_RECEIVED={0} a scris
 service.gui.MSG_SEND_CONNECTION_PROBLEM=Trebuie să fiți conectat(ă) pentru a putea trimite mesaje.
 service.gui.MULTIPLE_LOGINS=Sunteți autentificat(ă) de mai multe ori cu același cont. Următorul cont: Nume utilizator: {0}, Nume server: {1} este la moment deconectat.
-service.gui.MUTE=Mut
 service.gui.NAME=Nume
 service.gui.NETWORK=Rețea
 service.gui.NETWORK_FAILURE=Eroare de rețea
@@ -317,6 +305,7 @@ service.gui.NEW_ACCOUNT=Adaugă un &cont nou
 service.gui.NEW_MESSAGE=Mesaj nou
 service.gui.NEW_NAME=Nume nou
 service.gui.NEW_STATUS_MESSAGE=Mesaj nou de statut
+service.gui.NICKNAME=Porecla:
 service.gui.NO=Nu
 service.gui.NONE=Nimic
 service.gui.NO_CAMERA_AVAILABLE=Nicio cameră video disponibilă
@@ -331,7 +320,6 @@ service.gui.NON_EXISTING_USER_ID=Serverul {0} nu recunoaște identificatorul uti
 service.gui.SD_QUALITY=Calitate standard
 service.gui.OFFLINE=Deconectat(ă)
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Apeluri anterioare
 service.gui.ONLINE=Conectat(ă)
 service.gui.OPEN=Deschide
 service.gui.OPEN_FILE_FROM_IMAGE=Apăsați dublu-click pentru a deschide fișierul.
@@ -339,8 +327,11 @@ service.gui.OPEN_FOLDER=Deschide mapa
 service.gui.OPEN_IN_BROWSER=Deschide în &navigator
 service.gui.OPTIONS=Setări
 service.gui.OR=sau
-service.gui.OR_ENTER_PHONE_NUMBER=Sau introduceți număr de telefon aici...
 service.gui.ORGANIZATION=Organizaţia:
+service.gui.chat.role.ADMINISTRATOR=administrator
+service.gui.chat.role.MODERATOR=moderator
+service.gui.chat.role.MEMBER=membru
+service.gui.chat.role.SILENT_MEMBER=membru tăcut
 service.gui.OWNER=proprietarul conferinței
 service.gui.PASSWORD=Parola
 service.gui.PASSWORD_CHANGE_FAILURE=Schimbarea parolei a eşuat
@@ -355,7 +346,6 @@ service.gui.PRESENCE=Prezența
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' pentru sugestii
 service.gui.PRESS_FOR_CALL_INFO=Apasă pentru infoormații despre apel
 service.gui.PREVIOUS=Anterior
-service.gui.PREVIOUS_TOOLTIP=Răsfoiește conversațiile anterioare
 service.gui.PRINT=&Imprimă
 service.gui.PROACTIVE_NOTIFICATION=scrie un mesaj
 service.gui.PROBLEMS_ENCOUNTERED=Probleme întâmpinate
@@ -368,7 +358,6 @@ service.gui.REASON=Motiv
 service.gui.RECONNECTION_LIMIT_EXCEEDED=Ați fost deconectat(ă) și reconectat(ă) la server prea rapid. Următorul cont : Nume utilizator: {0}, Nume server: {1} este blocat la moment și este nevoie să așteptați un pic înainte de a încerca să vă reconectați.
 service.gui.RE_REQUEST_AUTHORIZATION=&Cerere de autorizare
 service.gui.REJECT=&Respinge
-service.gui.REMIND_ME_LATER=Amintește-mi mai târziu
 service.gui.REMEMBER_PASSWORD=Reține parola
 service.gui.REMOVE=&Șterge
 service.gui.REMOVE_ACCOUNT=&Șterge contul
@@ -391,26 +380,17 @@ service.gui.REVOKE_ADMIN=Recheamă statutul de administrator
 service.gui.REVOKE_MODERATOR=Recheamă statutul de moderator
 service.gui.REVOKE_MEMBERSHIP=Recheamă statutul de membru
 service.gui.REVOKE_VOICE=Recheamă dreptul la voce
-service.gui.ROOT_GROUP=Grupul de bază
 service.gui.SAVE=&Salvează
-service.gui.SAVE_AS_DEFAULT=Salvează ca implicit
 service.gui.SEARCH=&Caută
 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ă înscrieți și apăsați butonul de înscriere.
 service.gui.SECURITY=Securitatea
-service.gui.SELECT_ACCOUNT=Selectați contul
 service.gui.SELECT_COLOR=Selectați culoarea
 service.gui.SELECT_GROUP=Selectați grupul
-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_NO_GROUP=Nici un grup
-service.gui.SELECT_GROUP_WIZARD=Specificați grupul
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Lista de mai jos conține toate conturile ce permit participarea la conferințe. 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-l pe acela pe care doriți să-l utilizați în conversațiile cu noul contact.
-service.gui.SELECT_PROVIDERS_WIZARD=Selectați contul
 service.gui.SEND=&Trimite
 service.gui.SEND_FILE=Trimite &fișier
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Nu există informații despre acest contact.
 service.gui.SEND_MESSAGE=&Trimite un mesaj
-service.gui.SEND_AS_SMS=Trimite ca SMS
 service.gui.SEND_SMS=T&rimite SMS
 service.gui.SEND_SMS_DETAILS=Nu uitați că dvs trebuie să introduceți numărul în formatul internațional, de ex. începând cu +44 pentru Marea Britanie, +447777000000
 service.gui.SEND_SMS_NOT_SUPPORTED=Protocolul selectat nu suportă trimiterea de mesaje SMS.
@@ -439,7 +419,6 @@ service.gui.STATUS_MESSAGE_INFO=În câmpul de mai jos puteți specifica noul me
 service.gui.STREET=Stradă
 service.gui.SUBJECT=Subiectul
 service.gui.SUMMARY=Sumarul
-service.gui.TODAY=Astăzi
 service.gui.TOOLS=&Unelte
 service.gui.TRANSFER=Trans&feră
 service.gui.TO=&Spre:
@@ -448,7 +427,6 @@ service.gui.TRANSFER_CALL_TITLE=Transferați apelul
 service.gui.TRANSFER_CALL_TO=Transferați la:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparența nu este suportată de configurația dvs curentă.
 service.gui.TYPE_YOUR_REQUEST=Introduceți aici cererea dvs
-service.gui.UNMUTE=Activează
 service.gui.USER_IDENTIFIER=Identificatorul utilizatorului:
 service.gui.USER_EXISTS_ERROR=Acest utilizator deja există în rețeaua selectată. Vă rugăm să alegeți alt(ă) utilizator sau rețea.
 service.gui.ACCOUNT_CREATION_FAILED=Noi am eșuat să creăm contul dvs din cauza următoarei erori: {0}
@@ -457,7 +435,6 @@ service.gui.UNKNOWN_STATUS=Stare necunoscută
 service.gui.UNREGISTERED_MESSAGE=A eșuat conexiunea la următorul cont: Nume utilizator: {0}, Nume Server: {1}. La momentan sunteți deconectat(ă).
 service.gui.VIDEO_CALL=&Apel video
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&Vizualizare
 service.gui.VIEW_HISTORY=Vizualizează &istoria
 service.gui.VIEW_SMILEYS=Vizualizează &smilе-urile
@@ -471,9 +448,6 @@ service.gui.VOICEMAIL_TOOLTIP=Mesaje vocale pentru:
 service.gui.VOLUME_CONTROL_TOOL_TIP=Ajustează volum
 service.gui.WARNING=Avertisment
 service.gui.YES=Da
-service.gui.YESTERDAY=Ieri
-service.gui.EXISTING_ACCOUNT_ERROR=Contul introdus de dvs este deja instalat.
-service.gui.NEW_MAIL=<b>Dvs aveți un mesaj electronic nou!</b><br/><b>De la:</b> {0} {1} <br/><b>Subiect:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Dvs ați recepționat un nou mesaj electronic în <a href="{1}">cutia dvs {0}</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Dvs ați recepționat {2} mesaje electronice noi în <a href="{1}">cutia dvs {0}</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=o discuție necitită în plus în cutia <a href="{0}">dvs</a>.<br/>
@@ -494,7 +468,6 @@ service.gui.SECURITY_WARNING=Avertisment de securitate
 service.gui.SECURITY_ERROR=Eroare de securitate
 service.gui.SPEED=Viteza:
 service.gui.SILENT_MEMBER=membru tăcut
-service.gui.UPDATE=Actualizează
 service.gui.MOBILE_PHONE=Mobil
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Serviciu
@@ -523,12 +496,16 @@ service.gui.callinfo.AUDIO_INFO=Info audio
 service.gui.callinfo.MEDIA_STREAM_RTP=ZRTP
 service.gui.callinfo.MEDIA_STREAM_SRTP=ZRTP
 
+#enum values from IceProcessingState
+
+
 service.gui.ALWAYS_TRUST=Încredere permanentă acestui certificat
 service.gui.CERT_DIALOG_TITLE=Verifică certificatul
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} nu putem verifica identitatea serverului când ne conectăm <br>la {1}:{2}.<br><br> Certificatul nu este de încredere, ceea ce înseamnă că identitatea serverului nu poate<br> fi automatic verificată. Doriţi să continuăm conectarea?<br><br> Pentru mai multă informaţie apăsaţi "Vizualizaţi certificatul".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} nu putem verifica identitatea serverului când ne conectăm <br>la {1}:{2}.<br><br> Certificatul nu este de încredere, ceea ce înseamnă că identitatea serverului nu poate<br> fi automatic verificată. Doriţi să continuăm conectarea?<br><br> Pentru mai multă informaţie apăsaţi "Vizualizaţi certificatul".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} nu putem verifica identitatea serverului când ne conectăm <br>la {1}:{2}.<br><br> Certificatul nu este de încredere, ceea ce înseamnă că identitatea serverului nu poate<br> fi automatic verificată. Doriţi să continuăm conectarea?<br><br> Pentru mai multă informaţie apăsaţi "Vizualizaţi certificatul".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} nu putem verifica identitatea serverului când ne conectăm <br>la {1}:{2}.<br><br> Certificatul nu este de încredere, ceea ce înseamnă că identitatea serverului nu poate<br> fi automatic verificată. Doriţi să continuăm conectarea?<br><br> Pentru mai multă informaţie apăsaţi "Vizualizaţi certificatul".</html>
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nume general:
 service.gui.CERT_INFO_O=Organizația:
 service.gui.CERT_INFO_C=Denumirea țării:
@@ -537,24 +514,21 @@ service.gui.CERT_INFO_L=Denumirea localității:
 service.gui.CERT_INFO_OU=Unitatea organizațională:
 service.gui.CERT_INFO_ISSUED_ON=Eliberat pe:
 service.gui.CERT_INFO_EXPIRES_ON=Expiră pe:
+service.gui.CERT_INFO_FINGERPRINTS=Amprenta
 service.gui.CERT_INFO_SER_NUM=Numărul de serie:
 service.gui.CERT_INFO_VER=Versiunea:
 service.gui.CERT_INFO_SIGN_ALG=Algoritmul semnăturii:
 service.gui.CERT_INFO_ALG=Algoritmul:
 service.gui.CERT_INFO_PUB_KEY=Cheia publică:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} octeți: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} biți
 service.gui.CERT_INFO_EXP=Exponentul:
 service.gui.CERT_INFO_KEY_SIZE=Mărimea cheii:
 service.gui.CERT_INFO_SIGN=Semnătura:
-service.gui.CONTINUE=Continuă
 service.gui.SHOW_CERT=Vizualizează certificatul
 service.gui.HIDE_CERT=Ascunde certificatul
 
 service.gui.AUTO_ANSWER_VIDEO=Video
 
-service.gui.security.NO_VIDEO=Video HD
-service.gui.security.COMPARE_WITH_PARTNER=Comparați cu partenerul și apăsați lăcata pentru a confirma.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Comparaţi cu partenerul: {0}
 
@@ -568,18 +542,12 @@ service.gui.avatar.imagepicker.CLICK=Apasă și Zâmbește
 service.gui.avatar.imagepicker.IMAGE_FILES=Fișierele imaginilor
 service.gui.avatar.imagepicker.IMAGE_PICKER=Poză
 service.gui.avatar.imagepicker.IMAGE_SIZE=Dimensiunile imaginii
-service.gui.avatar.imagepicker.INITIALIZING=Inițializare
 service.gui.avatar.imagepicker.RESET=Resetează
 service.gui.avatar.imagepicker.SET=Setează
 service.gui.avatar.imagepicker.TAKE_PHOTO=Ia-o fotografie
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Eroarea webcamerei
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 
 # systray
@@ -598,9 +566,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=selectați rețea
 
 # LDAP
 impl.ldap.GENERAL=General
-impl.ldap.NEW=Nou
 impl.ldap.EDIT=&Editare
-impl.ldap.REMOVE=Şterge
 impl.ldap.ENABLED=Activează
 impl.ldap.SERVER_HOSTNAME=Nume gazdă:
 impl.ldap.AUTH_NONE=Nimic
@@ -610,12 +576,14 @@ impl.ldap.SERVER_PORT=Portul
 impl.ldap.PASSWORD=Parola
 impl.ldap.MAIL_FIELD_EXAMPLE=Poşta electronică:
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
-impl.googlecontacts.NEW=Nou
 impl.googlecontacts.EDIT=&Editare
-impl.googlecontacts.REMOVE=Şterge
 impl.googlecontacts.ENABLED=Activează
 impl.googlecontacts.SAVE=&Salvează
 impl.googlecontacts.CANCEL=Renunță
@@ -639,9 +607,6 @@ plugin.accountinfo.COUNTRY=Țară
 plugin.accountinfo.EMAIL=Email:
 plugin.accountinfo.PHONE=Numărul de telefon:
 plugin.accountinfo.JOB_TITLE=Funcție
-plugin.accountinfo.USER_PICTURES=Imagini de utilizator
-plugin.accountinfo.CHANGE=Modifică
-plugin.accountinfo.ONLY_MESSAGE=Numai mesaje
 
 # connection info
 
@@ -659,49 +624,12 @@ plugin.aimaccregwizz.USERNAME=Pseudonimul AIM:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Pseudonimul și parola
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Înregistrează un cont nou
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=În cazul în care nu aveți un cont AIM apăsați acest buton pentru a crea unul nou.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Rescrie setările standarde ale serverului
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Despre {0}
 plugin.branding.LOGO_MESSAGE=Open Source VoIP && Mesagerie Instantanee
-plugin.branding.LOADING=Încărcăm
 plugin.branding.ABOUT_MENU_ENTRY=&Despre
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} la moment curent se află în activă dezvoltare. Versiunea pe care o folosiți este una experimentală și POATE SĂ NU lucreze cum se așteaptă. Vă rugăm să vă referiți la {2} pentru mai multă informație.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2009 Copyright <b>sip-communicator.org</b>. Toate drepturile sunt rezervate. Vizitaţi <a href="http://sip-communicator.org">http://sip-communicator.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>SIP Communicator</b> este distribuit sub termenii LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Dicționare
-plugin.dictaccregwizz.ANY_DICTIONARY=Orice dicționar
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Orice dicționar din {0}
-plugin.dictaccregwizz.FIRST_MATCH=Prima coincidență
-plugin.dictaccregwizz.NO_MATCH=Nici o coincidență
-plugin.dictaccregwizz.MATCH_RESULT=Nici o definiție pentru "{0}" nu a fost găsită, posibil că aveți în vedere:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Dicționarul curent "{0}" nu mai există pe serverul dat.
-plugin.dictaccregwizz.INVALID_STRATEGY=Strategia curentă nu este disponibilă pe server.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Protocolul de serviciu Dict
-plugin.dictaccregwizz.HOST=Gazdă
-plugin.dictaccregwizz.SERVER_INFO=Informații despre server
-plugin.dictaccregwizz.STRATEGY_SELECTION=Selectarea strategiei
-plugin.dictaccregwizz.STRATEGY_LIST=Lista strategiilor:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Caută strategii
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategia este folosită pentru a căuta cuvinte asemănătoare în caz dacă traducerea nu a fost găsită, mulțumesc diferitelor abordări. Spre exemplu, strategia Prefix va căuta cuvinte care încep asemenea cuvântului pe care îl dorim să traducem.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informație despre contul Dict
-plugin.dictaccregwizz.FIRST_ACCOUNT=Acest asistent va crea pentru dvs primul vostru cont Dict pentru dict.org.\n\nDvs puteți adăuga un dicționar nou recurgând la Asistent de înregistrare a contului. Completați câmpul Gazdă cu dicționarul pe care l-ați dori să adăugați.
-plugin.dictaccregwizz.THREAD_CONNECT=Încercăm să ne conectăm la server
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Încercare de conexiune a eșuat, acesta nu este server dict sau serverul este deconectat
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Recepționăm strategiile
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Nici o strategie nu a fost găsită pe server
-plugin.dictaccregwizz.POPULATE_LIST=Completăm lista
-plugin.dictaccregwizz.CLOSING_CONNECTION=Închidem conexiunea
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Pentru a folosi Facebook discuții dvs trebuie să creați un "Nume utilizator" <br>din pagina dvs "Setările contului" pe Facebook.</a><br><br>Notă: Când creați numele vostru de utilizator, dvs trebuie să vă deconectați de la web-pagină <br>și posibil să fie nevoie de timp anumit înainte ca dvs să aveți posibilitatea de a vă conecta cu numele vostru nou de utilizator!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Protocolul de discuții Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Nume utilizator:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Nume utilizator și Parola
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Porneşte automat {0} când calculatorul restartează
@@ -711,9 +639,6 @@ plugin.generalconfig.SHOW_HISTORY=Vizualizează
 plugin.generalconfig.HISTORY_SIZE=mesaje recente în discuțiile noi
 plugin.generalconfig.SEND_MESSAGES_WITH=Trimite mesaje cu:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Adu fereastra cu discuții în față
-plugin.generalconfig.ERROR_PERMISSION=Dvs nu aveți privilegii necesare pentru a elimina pornirea automatică
-plugin.generalconfig.TRANSPARENCY=Transparența
-plugin.generalconfig.ENABLE_TRANSPARENCY=Activează transparența
 plugin.generalconfig.DEFAULT_LANGUAGE=Limbajul interfeței
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Modificările dvs vor acționa după următoare restartare.
 plugin.generalconfig.SIP_CLIENT_PORT=Portul clientului SIP
@@ -741,6 +666,7 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Înregistrează un cont nou
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=Protocolul IRC.
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN și parola
+plugin.ircaccregwizz.USERNAME=Porecla:
 plugin.ircaccregwizz.INFO_PASSWORD=Majoritatea serverelor IRC nu necesită parola.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=Schimbă porecla automatic dacă este deja utilizată
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Folosește portul standard
@@ -751,7 +677,6 @@ plugin.ircaccregwizz.IRC_SERVER=Serverul
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=Protocolul SIP
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Confirmați parola
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=Identificatorul și Parola
 plugin.jabberaccregwizz.CSERVER=Serverul
 plugin.jabberaccregwizz.SERVER=Serverul de conexiune
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Activează păstrarea în "activ"
@@ -765,10 +690,7 @@ plugin.jabberaccregwizz.SERVER_COLUMN=Serverul
 plugin.jabberaccregwizz.COMMENT_COLUMN=Comentariul
 plugin.jabberaccregwizz.RESOURCE=Resursa
 plugin.jabberaccregwizz.PRIORITY=Prioritatea
-plugin.jabberaccregwizz.XMPP_ERROR=Eroarea XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Eroarea XMPP necunoscută. Verificați dacă numele serverului este corect.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Rescrie setările standard a serverului
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Setările avansate
 plugin.jabberaccregwizz.USE_ICE=Folosește ICE
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Detectează serverele STUN/TURN automatic
 plugin.jabberaccregwizz.SUPPORT_TURN=Suportă TURN
@@ -781,31 +703,14 @@ plugin.jabberaccregwizz.NO_STUN_USERNAME=Vă rugăm să introduceți o adresă v
 plugin.jabberaccregwizz.STUN_ALREADY_EXIST=Serverul STUN specificat deja există.
 plugin.jabberaccregwizz.JID_ADDRESS=Adresa IP
 plugin.jabberaccregwizz.EXISTING_ACCOUNT=Cont SIP existent
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Confirmaţi parola
 plugin.jabberaccregwizz.ENCODINGS=&Codificări:
 plugin.jabberaccregwizz.AUDIO=Audio
 plugin.jabberaccregwizz.VIDEO=Video
 plugin.jabberaccregwizz.RESET=Resetează
 
-# mailbox
-plugin.mailbox.OUTGOING=Mesajul de trimis:
-plugin.mailbox.INCOMING=Mesajele de intrare:
-plugin.mailbox.WAIT_TIME=Întârziere până apelul este trimis la poșta vocală
-plugin.mailbox.MAX_MESSAGE_TIME=Durata maximă a mesajului de intrare
-plugin.mailbox.CONFIRM=Confirmă
-plugin.mailbox.DEFAULTS=Standarde
-plugin.mailbox.MAILBOX=Cutia poștală
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Protocol pentru conectare și discutare în serviciul MSN.
-plugin.msnaccregwizz.USERNAME=Poșta electronică:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Identificatorul și Parola
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Instalează
 plugin.pluginmanager.UNINSTALL=Dezinstalează
-plugin.pluginmanager.UPDATE=Actualizează
 plugin.pluginmanager.PLUGINS=Plug-in-urile
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.CHOOSE_FILE=Selectați fișier
@@ -829,7 +734,6 @@ plugin.sipaccregwizz.SERVER_PORT=Portul serverului
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Portul proxy
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Transportul preferat
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Setări avansate
 plugin.sipaccregwizz.PROXY_OPTIONS=Opțiuni proxy
 plugin.sipaccregwizz.PROXY_AUTO=Configurare automată proxy
 plugin.sipaccregwizz.ENABLE_PRESENCE=Activează prezența (SIMPLE)
@@ -841,8 +745,6 @@ plugin.sipaccregwizz.KEEP_ALIVE=Păstrează "activ"
 plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Metoda de păstrare în "activ"
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Intervalul de păstrare în "activ"
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Între 1 și 3600 secunde
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Rescrie setările standarde a serverului
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Activează suportul apelurilor criptate
 plugin.sipaccregwizz.AUTH_NAME=Nume de autorizare
 plugin.sipaccregwizz.DISPLAY_NAME=Nume de afişare
@@ -853,6 +755,7 @@ plugin.sipaccregwizz.CLIST_TYPE=Tipul
 plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS=Folosește acreditive SIP
 plugin.sipaccregwizz.XCAP_USER=Utilizatorul
 plugin.sipaccregwizz.XCAP_PASSWORD=Parola
+#used from SecurityPanel
 
 # skin manager
 plugin.skinmanager.SKINS=Skinuri
@@ -860,15 +763,6 @@ plugin.skinmanager.DEFAULT_SKIN=Skin principal
 plugin.skinmanager.ADD_NEW_SKIN=Adaugă skin...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Skinul principal al aplicației.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Protocolul pentru conectare la calculatoare prin SSH.
-plugin.sshaccregwizz.USERNAME=Identificatorul contului:
-plugin.sshaccregwizz.IDENTITY_FILE=Fișierul de identitate:
-plugin.sshaccregwizz.KNOWN_HOSTS=Gazde cunoscute:
-plugin.sshaccregwizz.OPTIONAL=Opțional
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Detaliile contului
-
 # status update
 plugin.autoaway.AUTO_STATUS=Absent automatic
 plugin.autoaway.ENABLE_CHANGE_STATUS=Schimbă statutul în timpul absenței
@@ -913,21 +807,6 @@ plugin.whiteboard.DESELECT=Deselectează
 plugin.whiteboard.DELETE=Șterge
 plugin.whiteboard.PROPERTIES=Proprietăți
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Protocol pentru conectare şi discuţii pe serviciul Yahoo.
-plugin.yahooaccregwizz.USERNAME=Nume utilizator:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Identificatorul și Parola
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Protocolul de serviciu Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Nume:
-plugin.zeroaccregwizz.LAST_NAME=Prenume:
-plugin.zeroaccregwizz.EMAIL=Poșta electronică:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Să țin minte contactele Bonjour?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=Identificatorul și Parola
-plugin.zeroaccregwizz.USERID=Identificatorul utilizatorului
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Protocolul Google Talk
 plugin.googletalkaccregwizz.USERNAME=Nume utilizator Google Talk
@@ -940,25 +819,18 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, portalul IP telecomunica�
 plugin.iptelaccregwizz.USERNAME=Nume utilizator
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Subscrie la iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP și discuții
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Nume de utilizator
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Repetați parola
 plugin.sip2sipaccregwizz.EMAIL=Poșta electronică
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Pentru ajutor despre acest serviciu vizitați<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Poșta electronică se folosește pentru a trimite mesaje vocale, <br>notificări despre apeluri ratate și pentru a recupera parola pierdută</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Pentru ajutor despre acest serviciu vizitați <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Cont sip2sip.info existent
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Creează un cont sip2sip.info gratis
-
-# ippi accregwizz
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Pentru ajutor despre acest serviciu vizitați<br>http://ippi.fr
 plugin.ippiaccregwizz.INFO_NOTE=<html>Pentru ajutor despre acest serviciu vizitaţi <a href=''>http://wiki.sip2sip.info</a></html>
 plugin.ippiaccregwizz.EXISTING_ACCOUNT=Cont SIP existent
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Creează un cont SIP gratis
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Închide fereastra de discuții
 plugin.keybindings.CHAT_COPY=Copiază
 plugin.keybindings.CHAT_CUT=Taie
@@ -974,9 +846,11 @@ plugin.keybindings.OPEN_HISTORY=Vizualizează istoria
 plugin.keybindings.OPEN_SMILIES=Vizualizează smile-urile
 plugin.keybindings.globalchooser.SHORTCUT_NAME=Nume
 plugin.keybindings.PLUGIN_NAME=Taste pentru acces rapid
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Discuţie
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=Activează
 plugin.notificationconfig.DESCRIPTION=Descriere
 plugin.notificationconfig.TURN_ON_ALL=Activează toate
 plugin.notificationconfig.TURN_OFF_ALL=Dezactivează toate
@@ -988,6 +862,7 @@ plugin.notificationconfig.EXEC_PROG=Îndeplinește o aplicație:
 plugin.notificationconfig.DISPLAY_POPUP=Vizualizează un mesaj în pop-up fereastră
 plugin.notificationconfig.POPUP_NOTIF_HANDLER=Tipul notificărilor pop-up:
 plugin.notificationconfig.tableheader.EXECUTE=Îndeplineşte o aplicaţie:
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Apel primit
 plugin.notificationconfig.event.IncomingFile=Apel primit
 plugin.notificationconfig.event.IncomingMessage=Mesajele de intrare:
@@ -1040,6 +915,7 @@ impl.media.configform.VIDEO_RESET=Restabileşte standarde
 impl.neomedia.configform.AUDIO=Audio
 impl.neomedia.configform.VIDEO=Video
 
+#in JNIEncoder
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=ZRTP
 
 # The callrecordingconfig plugin was never really committed into trunk and its
@@ -1063,7 +939,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Parola curentă:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Introduceți noua parolă:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Reintroduceţi parola: 
 plugin.securityconfig.masterpassword.MP_TITLE=Parola principală
-plugin.securityconfig.masterpassword.MP_NOT_SET=(nu este setat)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Dvs nu ați introdus Parola principală curentă corect. Vă rugăm să încercați din nou.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Parola principală nu este corectă!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Schimbarea parolei a eșuat
@@ -1078,7 +953,6 @@ plugin.securityconfig.masterpassword.COL_NAME=Nume
 plugin.securityconfig.masterpassword.COL_PASSWORD=Parola
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(necunoscut)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(nu pot decripta)
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Şterge
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Șterge toate
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Sunteți sigur(ă) că doriți să ștergeți toate parole?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Șterge toate parole
@@ -1137,7 +1011,6 @@ plugin.globalproxy.PROXY_PORT=Portul proxy
 plugin.globalproxy.PROXY_USERNAME=Nume utilizator proxy
 plugin.globalproxy.PROXY_PASSWORD=Parola proxy
 plugin.globalproxy.DESCRIPTION={0} din acest moment va folosi setările proxy de mai jos pentru toate rețelele pe care dvs le conectați sau reconectați. \nSuportul proxy este la moment experimental și lucrează doar cu unele protocoale. Verificați tabela de mai jos pentru mai multe detalii:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -1150,6 +1023,8 @@ plugin.reconnectplugin.NETWORK_DOWN=Conectivitatea la rețea este pierdută!
 plugin.chatconfig.TITLE=Discuție
 plugin.chatconfig.replacement.TITLE=Imagine/Video:
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Activează înlocuirea smile-urilor
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=Activează înlocuirea Imagine/Video
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Activează
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Surse:
 
 #provisioning plugin
@@ -1173,7 +1048,6 @@ net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=&Ignoră
 net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=&Refuză
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=&Editare
 plugin.spellcheck.UNINSTALL_DICTIONARY=Dezinstalează
 
 
diff --git a/resources/languages/resources_ru.properties b/resources/languages/resources_ru.properties
index 0e67e5b..d58bc13 100644
--- a/resources/languages/resources_ru.properties
+++ b/resources/languages/resources_ru.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -29,10 +40,9 @@ service.gui.ABOUT=&О программе
 service.gui.ACCEPT=&Принять
 service.gui.ACCOUNT=Аккаунт
 service.gui.ACCOUNT_ME=Я
-service.gui.ACCOUNT_REGISTRATION_WIZARD=Мастер регистрации учетных записей
-service.gui.ACCOUNTS=Аккаунты
+service.gui.ACCOUNT_REGISTRATION_WIZARD=Мастер регистрации учётных записей
+service.gui.ACCOUNTS=Учётные записи
 service.gui.ADD=&Добавить
-service.gui.ADD_ACCOUNT=Добавить аккаунт
 service.gui.ADD_CONTACT=&Добавить контакт
 service.gui.ADD_AUTHORIZED_CONTACT=Добавить {0} в ваш список контактов
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Добавить контакт в ваш список контактов
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Ошибка при добавлении к�
 service.gui.ADD_CONTACT_EXIST_ERROR=Контакт {0} уже существует в списке контактов.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Сервер не ответил на запрос добавления контакта: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Не удалось добавить контакт с идентификатором: {0}. Операция не поддерживается.
-service.gui.ADD_CONTACT_IDENTIFIER=В поле ниже введите идентификатор контакта который вы желаете добавить.
-service.gui.ADD_CONTACT_WIZARD=Мастер добавления контактов
 service.gui.ADD_CONTACT_NOT_CONNECTED=Вы должны быть подключены для того, чтобы добавить контакт. Пожалуйста, выполните вход и попробуйте снова.
-service.gui.ADD_GROUP_LOCAL_ERROR=Не удалось добавить группу с именем: {0}. Сбой произошёл во время операции ввода-вывода.
+service.gui.ADD_GROUP_LOCAL_ERROR=Не удалось добавить группу с именем: {0}. Произошёл сбой во время операции ввода-вывода.
 service.gui.ADD_GROUP_EXIST_ERROR=Группа {0} уже существует в списке контактов. Пожалуйста, выберите другое имя.
 service.gui.ADD_GROUP_NET_ERROR=Не удалось добавить группу с именем: {0}. Сбой произошёл по причине отказа сети. Пожалуйста, проверьте ваше сетевое подключение и попробуйте снова.
 service.gui.ADD_GROUP_ERROR=Не удалось добавить группу: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Имя группы не может быть пустым.
-service.gui.ADD_GROUP=Создать группу
-service.gui.ADD_SUBCONTACT=&Добавить дополнительный контакт
 service.gui.ADDRESS=Адрес
 service.gui.ADMINISTRATOR=администратор
 service.gui.ADVANCED=&Расширенные
-service.gui.ALL=&Все
 service.gui.ALL_CONTACTS=&Все контакты
 service.gui.ALTERNATE_ADDRESS=Альтернативный адрес
 service.gui.APPLY=&Применить
@@ -64,8 +69,7 @@ service.gui.ARE_NOW=Вы сейчас {0}
 service.gui.AT=время
 service.gui.AUTHORIZE=&Авторизовать
 service.gui.AUTHORIZATION_ACCEPTED={0} собеседник принял запрос на авторизацию.
-service.gui.AUTHENTICATION_FAILED=Проверка подлинности для {0} не удалась. Введённый пароль неверен.
-service.gui.AUTHENTICATION_REQUESTED=Запрошена проверка подлинности
+service.gui.AUTHENTICATION_FAILED=Проверка подлинности для {0} не удалась. Введённый вами пароль неверен.
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Сервер {0} запросил проверку подлинности.
 service.gui.AUTHENTICATION_REJECTED={0} собеседник отверг запрос на авторизацию.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} авторизация
@@ -92,7 +96,7 @@ service.gui.CALL_HISTORY_GROUP_NAME=История вызовов
 service.gui.CALL_VIA=Позвонить через:
 service.gui.CALL_NAME_OR_NUMBER=Введите имя или номер
 service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=Этот звонок поддерживает только участников из сети {0} и вашего {1} аккаунта. {2} не содержит адресов для этой сети или аккаунта.
-service.gui.CALL_WITH=Абонент
+service.gui.CALL_WITH=Вызов с помощью
 service.gui.CALL_NO_AUDIO_DEVICE=Вы не выбрали ни одного аудиоустройства.
 service.gui.CALL_NO_AUDIO_CODEC=У вас не установлены аудиокодеки.
 service.gui.CALL_NO_DEVICE_CODECS_Q=Хотите продолжить вызов?
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=В поле ниже вы можете вве�
 service.gui.CHANGE_NICKNAME_ERROR=Не удалось изменить ник
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Такое имя уже существует
 service.gui.CHANGE_VIDEO_QUALITY=Изменить качество передаваемого видео
-service.gui.CHAT_CONFERENCE_LABEL=Конференция
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0} конференция
 service.gui.CHAT_ROOM_ALREADY_JOINED=Конференция {0} уже подключена.
 service.gui.CHAT_ROOM_CONFIGURATION=Конфигурация комнаты {0}
@@ -115,27 +118,28 @@ service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Не удалось открыть н
 service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Не удалось отобразить конфигурацию комнаты {0}. Только владелец комнаты может увидеть или изменить конфигурацию.
 service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Произошла ошибка во время применения конфигурации конференции {0}.
 service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_TITLE=Редактировать список участников
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_DESCRIPTION=Список справа содержит пользователей, имеющих членство в этой комнате. Когда чат-комната 'Только для участников', в комнате будут лишь те, кто допущен к подключению.
 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_REMOVE_BUTTON_TOOLTIP=Удалить выбранную комнату из списка сохранённых
+service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Отправка сообщения запрещена (голос отозван)
 service.gui.CHAT_ROOM_NAME=Имя конференции
 service.gui.CLEAR_CUSTOM_MESSAGES=Очистка пользовательских сообщений
 service.gui.ROOM_NAME=Конференция
-service.gui.AUTOJOIN=Автоматический вход
 service.gui.CHANGE_PASSWORD=Сменить пароль
 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_LEAVE_NOT_CONNECTED=Вы должны быть подключены чтобы иметь возможность выйти из конференции.
-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=Комната
 service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} изменил тему на {1}
+service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=Вы можете продолжать разговор в следующей чат-комнате: {0}
+service.gui.CHAT_NICKNAME_CHANGE={0} теперь известен как {1}
 service.gui.CHOOSE_CONTACT=Выберите контакт
 service.gui.CHOOSE_NUMBER=Выберите номер
 service.gui.CHOOSE_ACCOUNT=Пожалуйста, выберите один из указанных контактов.
@@ -144,7 +148,7 @@ service.gui.COUNTRY=Страна
 service.gui.SHOW_MORE_TOOLTIP=Нажмите для подробностей
 service.gui.CLEAR=Очистить
 service.gui.CLOSE=За&крыть
-service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Вы получили новое сообщение меньше, чем 2 секунды назад. Вы уверены, что желаете закрыть этот чат?
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Вы получили новое сообщение менее, чем 2 секунды назад. Вы уверены, что желаете закрыть этот чат?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=У вас имеются активные передачи файлов. Вы уверенны, что желаете прервать их?
 service.gui.CONFIRM=Подтвердить
 service.gui.CONNECTED_STATUS=Подключен
@@ -152,16 +156,15 @@ service.gui.CONNECTING=Подключение...
 service.gui.CONNECTING_STATUS=Подключение
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Подключение*
 service.gui.CONNECTION=Соединение
-service.gui.CONNECTION_FAILED_MSG=Не удалось соединение для следующего аккаунта: Имя пользователя: {0}, Имя сервера: {1}. Пожалуйста проверьте ваше сетевое подключение или свяжитесь с вашим сетевым администратором для дополнительной информации.
 service.gui.CONNECTION_EXPIRED_MSG=В данный момент вы отключены от сервера {0}.
 service.gui.CONTACT_NAME=ID или номер
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Выбранный контакт {0} не поддерживает голосовую связь.
+service.gui.CONTACT_NAME_PROMPT=jane.doe@example.com
+service.gui.CONTACT_NAME_INFO=Добавить адрес для мгновенных сообщений (например: jane.doe@example.com) или номер IP-телефонии
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Выбранный контакт {0} не поддерживает чат в конференции.
 service.gui.CONTACT_PAUSED_TYPING={0} перестал печатать сообщение
 service.gui.CONTACT_TYPING={0} печатает сообщение
-service.gui.CONTACT_TYPING_SEND_FAILED=собеседник {0} не увидит процесс создания сообщения
+service.gui.CONTACT_TYPING_SEND_FAILED=ой-ой... мы не смогли сообщить {0} , что вы печатаете
 service.gui.CONTACT_INFO=&Контактная информация
-service.gui.CONTACTLIST=Список контактов
 service.gui.CONTACTS=Контакты
 service.gui.COPY=&Копировать
 service.gui.COPY_LINK=Копировать &ссылку
@@ -171,27 +174,26 @@ service.gui.CREATE_CHAT_ROOM=&Создать конференцию...
 service.gui.CREATE_CHAT_ROOM_ERROR=Не удалось создать конференцию {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Мастер создания конференций
 service.gui.CREATE_CONFERENCE_CALL=&Создать многопользовательский звонок...
-service.gui.CREATE_CONFERENCE_CHAT=&Создать многопользовательский чат...
 service.gui.CREATE_GROUP=&Создать группу...
 service.gui.CREATE_GROUP_NAME=В поле ниже введите имя группы, которую вы хотите создать.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Ваш список контактов не содержит ни одной группы. Пожалуйста, сначала создайте группу (Файл/Создать группу).
 service.gui.CREATE_VIDEO_BRIDGE=Создать &видео-мост...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Создать &видеомост
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Создать/Присоединиться к видео конференции
 service.gui.CREATE_VIDEO_CONFERENCE=Создать новую видео конференцию для этой комнаты
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Данный контакт не поддерживает сетевую контактную информацию
 service.gui.CUT=В&ырезать
-service.gui.DATE=Дата
 service.gui.DELETE=Удалить
 service.gui.DENY=&Отклонить
 service.gui.DESKTOP_SHARING_WARNING=<b>Вы уверены, что хотите предоставить доступ к вашему экрану?</b> <br> Нажатие OK позволит абонентам, участвующим в разговоре, видеть содержимое вашего экрана.
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Вы показыаете свой экран
 service.gui.DIALPAD=Номеронабиратель
 service.gui.DISPLAY_NAME=Отображаемое имя
+service.gui.DISPLAY_NAME_PROMPT=Jane Doe
+service.gui.DISPLAY_NAME_INFO=Добавить имя для этого контакта. Если оставить пустым, будет использован адрес IM или номер VoIP. (Необязательно)
 service.gui.DISCONNECTED_STATUS=Отключено
 service.gui.DND_STATUS=Не беспокоить
 service.gui.DO_NOT_ASK_AGAIN=Не спрашивать снова
 service.gui.DO_NOT_SHOW_AGAIN=Не показывать это сообщение снова
-service.gui.DOWNLOAD_NOW=&Загрузить сейчас
 service.gui.DRAG_FOR_SHARING=Переместите сюда для предоставления общего доступа...
 service.gui.DURATION=длительность
 service.gui.DESTROY_CHATROOM=Удалить комнату
@@ -208,10 +210,10 @@ service.gui.ENTER_PHONE_NUMBER=Введите номер телефона
 service.gui.ENTER_NAME_OR_NUMBER=Введите имя или номер
 service.gui.ERROR=Ошибка
 service.gui.ERROR_WAS=Ошибка была: {0}
+service.gui.ERROR_RECEIVED_FROM=От {0} получено сообщение об ошибке
 service.gui.ESTIMATED_TIME=Приблизительное время:
 service.gui.EVENTS=События
 service.gui.EXIT=В&ыйти
-service.gui.EXTENDED_CRITERIA=Расширенный критерий
 service.gui.GENERAL=Общие
 service.gui.GENERAL_ERROR=Общая ошибка
 service.gui.GROUP_NAME=Имя группы
@@ -253,7 +255,6 @@ service.gui.FONT_ITALIC=Курсив
 service.gui.FONT_SIZE=Размер
 service.gui.FONT_STYLE=Стиль
 service.gui.FONT_UNDERLINE=Подчеркивание
-service.gui.FROM={0} из {1}
 service.gui.GRANT_OWNERSHIP=Добавить к владельцам...
 service.gui.GRANT_ADMIN=Добавить к администраторам...
 service.gui.GRANT_MODERATOR=Добавить к модераторам
@@ -269,61 +270,62 @@ service.gui.HIDE_MAIN_WINDOW=<DIV>Нажатие крестика в углу о
 service.gui.HISTORY=&История
 service.gui.HISTORY_CONTACT=История - {0}
 service.gui.HISTORY_TOGGLE_PER_CONTACT=Выключить историю для этого контакта
-service.gui.HISTORY_TOGGLE_PER_CHATROOM=Выключить историю для этого контакта
-service.gui.HISTORY_ERASE_PER_CONTACT=Стереть всю историю контакта
-service.gui.HISTORY_ERASE_PER_CHATROOM=Стереть всю историю комнаты
+service.gui.HISTORY_TOGGLE_PER_CHATROOM=Выключить историю для этой комнаты
+service.gui.HISTORY_TOGGLE_ALL=Выключить историю для всех бесед и контактов
+service.gui.HISTORY_ERASE_PER_CONTACT=Стереть всю историю для этого контакта
+service.gui.HISTORY_ERASE_PER_CHATROOM=Стереть всю историю этой комнаты
 service.gui.HISTORY_ERASE_ALL=Стереть всю историю в {0}
 service.gui.HISTORY_REMOVE_PER_CONTACT_WARNING=Действительно окончательно уничтожить все локально сохраненные сообщения {0}?
 service.gui.HISTORY_REMOVE_ALL_WARNING=Действительно окончательно уничтожить все локально сохраненные сообщения?
 service.gui.HISTORY_REMOVE_ERROR=Ошибка удаления локально сохраненных сообщений.
-service.gui.HOME=Домой
+service.gui.HOME=На главную
 service.gui.HOME_PAGE=Домашняя страница
-service.gui.HOUR=Время
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Идентификатор
 service.gui.IGNORE=&Игнорировать
 service.gui.INSERT_SMILEY=Вставить смайлик
 service.gui.INCOMING_CALL=Входящий звонок от: {0}
+service.gui.INCOMING_SCREEN_SHARE=Входящее предложение показать экран от: {0}
 service.gui.INCOMING_CALL_STATUS=Входящий звонок
+service.gui.INCOMING_SCREEN_SHARE_STATUS=Входящее предложение показать экран
 service.gui.INSTANT_MESSAGINGS=IMs
 service.gui.IM=IM
 service.gui.INITIATING_CALL_STATUS=Осуществление вызова
 service.gui.INVITATION=Текст приглашения
 service.gui.INVITATION_RECEIVED=Приглашение принято
-service.gui.INVITATION_RECEIVED_MSG={0} пригласил Вас в конференцию {1}. Вы можете принять, отклонить или игнорировать приглашение.
-service.gui.INVITATION_REJECTED={0} отклонил Ваше приглашение в конференцию. Причина: {1}.
+service.gui.INVITATION_RECEIVED_MSG={0} пригласил вас в конференцию {1}. Вы можете принять, отклонить или игнорировать приглашение.
+service.gui.INVITATION_REJECTED={0} отклонил ваше приглашение в конференцию. Причина: {1}.
 service.gui.INVITE=&Пригласить
-service.gui.INVITE_CONTACT_MSG=Выберите имена контактов, которые хотите добавить к этому обсуждению и нажмите Пригласить.
+service.gui.INVITE_CONTACT_MSG=Выберите имена контактов, которые вы хотите добавить к этой конференции и нажмите Пригласить.
 service.gui.INVITE_CONTACT_TO_CHAT=Пригласить контакты в чат
 service.gui.INVITE_CONTACT_TO_CALL=Пригласить контакты к звонку
 service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Пригласить контакты в видеомост
 service.gui.INVITE_REASON=Причина приглашения
 service.gui.IS_CALLING={0} звонит...
 service.gui.IS_NOW={0} теперь {1}
-service.gui.JITSI_WARNING=SIP Communicator был переименован в Jitsi.<br/>Если Вы хотите использовать новую версию программы, пожалуйста загружайте Jitsi.<br/><br/>Приносим свои извинения за возможные причиненные неудобства.<br/><br/>Команда разработчиков Jitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator теперь стал Jitsi
 service.gui.JOIN=&Войти
 service.gui.JOIN_AS=В&ойти как
-service.gui.CLOSE_CHAT_ROOM_DIALOG=З&акрыть
+service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Подключиться к существующей видеоконференции
+service.gui.JOIN_VIDEO=Подключиться к видео
 service.gui.JOB_TITLE=Должность
 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.JOIN_AUTOMATICALLY=Присоединяться автоматически
+service.gui.DONT_JOIN_AUTOMATICALLY=Не подключаться автоматически
 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.LAST_NAME=Фамилия
 service.gui.LEAVE=&Покинуть
-service.gui.LIMIT_REACHED_FOR_IP=У вас слишком много регистраций с локального IP адреса и сервер {0} не позволяет больше регистраций.
-service.gui.LIST=Последний
+service.gui.LIMIT_REACHED_FOR_IP=У вас слишком много регистраций с локального IP адреса. Сервер {0} не позволяет больше регистраций.
+service.gui.LIST=Список
 service.gui.LOADING_ROOMS=Загружаю конференции...
 service.gui.LOADING=Загрузка...
-service.gui.LOCALLY_ON_HOLD_STATUS=В ожидании
+service.gui.LOCALLY_ON_HOLD_STATUS=Удерживается на линии
 service.gui.LOGIN_NETWORK_ERROR=Не удаётся подключить аккаунт: Имя пользователя: {0}, Имя сервера: {1}, в связи со сбоем сети. Пожалуйста, проверьте ваше сетевое подключение.
 service.gui.LOGIN_GENERAL_ERROR=Произошла ошибка во время подключения аккаунта: Имя пользователя: {0}, Имя сервера: {1}:{2}.
 service.gui.LOGIN_INTERNAL_ERROR=Произошла ошибка во время подключения аккаунта: Имя пользователя: {0}, Имя сервера: {1}. Скорее всего это внутренняя ошибка приложения. Пожалуйста, сообщите о проблеме в наш список рассылки (dev@jitsi.java.net).
@@ -336,7 +338,6 @@ service.gui.MESSAGE=Сообщение
 service.gui.MISSED_CALLS_TOOL_TIP=Пропущенные вызовы от:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= и {0} больше
 service.gui.MODERATOR=модератор
-service.gui.MORE=Посмотреть больше
 service.gui.MORE_LABEL=Еще
 service.gui.MOVE=Переместить
 service.gui.MOVE_SUBCONTACT=П&ереместить контакт
@@ -345,12 +346,12 @@ service.gui.MOVE_SUBCONTACT_FAILED=Контакт, который вы выбр�
 service.gui.MOVE_SUBCONTACT_QUESTION=Вы уверенны, что желаете переместить {0} в {1}?
 service.gui.MOVE_TO_GROUP=&Переместить в группу
 service.gui.MOVE_CONTACT=Переместить контакт
-service.gui.MOVE_CONTACT_ERROR=&Контакт не может быть перемещён
 service.gui.MSG_DELIVERY_FAILURE=Сообщение выше не может быть доставлено
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Используемый вами протокол не поддерживает offline-сообщения. Вы можете попробовать связаться с {0} через другой протокол или подождать пока он/она не подключатся к сети.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Произошла внутренняя ошибка приложения. Возможно это баг. Пожалуйста, сообщите о ней сюда: https://jitsi.org/Development/BugsAndIssues.
 service.gui.MSG_DELIVERY_ERROR=Не удалось доставить сообщение.
 service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Произошла неизвестная ошибка во время доставки вашего сообщения.
+service.gui.MSG_DELIVERY_UNSUPPORTED_OPERATION=Неподдерживаемая операция.
 service.gui.MSG_NOT_DELIVERED=Произошла сетевая ошибка. Пожалуйста, проверьте вашу сетевую конфигурацию и попробуйте снова.
 service.gui.MSG_NOT_POSSIBLE=Обмен сообщениями невозможен для данного контакта (не поддерживается протоколом)
 service.gui.MSG_RECEIVED={0} написал
@@ -358,8 +359,7 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Вы должны быть подклю�
 service.gui.MULTIPLE_LOGINS=Вы подключены больше одного раза к тому же аккаунту. Следующий аккаунт: Имя пользователя: {0}, Имя сервера: {1} в данный момент отключён.
 service.gui.MY_CHAT_ROOMS=Добавить комнату
 service.gui.MY_CHAT_ROOMS_TITLE=Добавить комнату
-service.gui.MUTE=Отключить звук
-service.gui.MUTUALLY_ON_HOLD_STATUS=В ожидании
+service.gui.MUTUALLY_ON_HOLD_STATUS=Совместное удержание
 service.gui.NAME=Имя
 service.gui.NETWORK=Сеть
 service.gui.NETWORK_FAILURE=Сбой сети
@@ -369,19 +369,20 @@ service.gui.NEW_MESSAGE=Новое сообщение
 service.gui.NEW_NAME=Новое имя
 service.gui.NEW_STATUS_MESSAGE=Новый статус сообщения
 service.gui.NEW_STATUS_MESSAGE_SAVE=Сохранить собственное сообщение
+service.gui.NICKNAME=Псевдоним
 service.gui.NO=Нет
 service.gui.NONE=Нет
-service.gui.NO_CAMERA_AVAILABLE=Камера не подключена
+service.gui.NO_CAMERA_AVAILABLE=Камера не обнаружена
 service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=Демонстрация рабочего стола не поддерживается данным протоколом
 service.gui.NO_VIDEO_ENCODINGS=Видеокодеки не определены в конфигурации
 service.gui.NO_VIDEO_FOR_PROTOCOL=Передача видео не поддерживается для данного протокола
 service.gui.NO_AVAILABLE_ROOMS=Список комнат для этого сервера в настоящее время не доступен.
 service.gui.NO_CONTACTS_FOUND=Соответствующие контакты не найдены. Нажмите Ctrl+Enter, чтобы позвонить {0} или используйте кнопки ниже.
-service.gui.NO_CONTACTS_FOUND_SHORT=Соответствующие контакты не найдены.
+service.gui.NO_CONTACTS_FOUND_SHORT=Подходящих контактов не найдено.
 service.gui.NO_MESSAGE=Нет сообщений
 service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=Не обнаружены аккаунты с поддержкой многопользовательского чата. Посетите jitsi.org для получения более подробной информации о том какие протоколы поддерживает многопользовательский чат.
 service.gui.NO_ONLINE_CONFERENCING_ACCOUNT=Аккаунт не поддерживает конференции. Проверьте https://jitsi.org для получения информации о протоколах с поддержкой конференций.
-service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=По крайней мере один SIP Аккаунт необходим для того, чтобы сделать звонок. Войдите в один из ваших SIP аккаунтов и повторите попытку.
+service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=По крайней мере один SIP аккаунт необходим для того, чтобы сделать звонок. Войдите в один из ваших SIP аккаунтов и повторите попытку.
 service.gui.NOT_AUTHORIZED=Не авторизован
 service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=В этом чате есть не отправленное сообщение. Вы уверены, что хотите закрыть этот чат?
 service.gui.NON_EXISTING_USER_ID=На сервере {0} нет такого пользователя.
@@ -389,7 +390,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Не в списке контакто
 service.gui.SD_QUALITY=Стандартное качество
 service.gui.OFFLINE=Не в сети
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Старые звонки
 service.gui.ONLINE=В сети
 service.gui.OPEN=Открыть
 service.gui.OPEN_FILE_FROM_IMAGE=Дважды щелкните, чтобы открыть файл.
@@ -397,11 +397,19 @@ service.gui.OPEN_FOLDER=Открыть папку
 service.gui.OPEN_IN_BROWSER=Открыть в &браузере
 service.gui.OPTIONS=Опции
 service.gui.OPEN_AUTOMATICALLY=Открыть комнату автоматически в случае
+service.gui.OPEN_ON_ACTIVITY=Открыть активность
+service.gui.OPEN_ON_MESSAGE=Открыть только по сообщению
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Открывать только для важных сообщений
 service.gui.OR=или
-service.gui.OR_ENTER_PHONE_NUMBER=Или введите номер телефона здесь...
 service.gui.ORGANIZATION=Организация
 service.gui.OTHER=Другое
+service.gui.chat.role.OWNER=Владелец
+service.gui.chat.role.ADMINISTRATOR=Администратор
+service.gui.chat.role.MODERATOR=Модератор
+service.gui.chat.role.MEMBER=Участник
+service.gui.chat.role.GUEST=Гость
+service.gui.chat.role.SILENT_MEMBER=Безмолвный участник
+service.gui.chat.role.OUTCAST=Запрещено подключаться
 service.gui.OWNER=владелец комнаты
 service.gui.ON_MOBILE_TOOLTIP=(на мобильный)
 service.gui.PASSWORD=Пароль
@@ -416,8 +424,8 @@ service.gui.PREFIX=Префикс
 service.gui.PRESENCE=Присутствие
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' для предложений
 service.gui.PRESS_FOR_CALL_INFO=Нажмите для получения информации о звонке
+service.gui.PRESS_TO_OPEN_CRM=Нажмите для открытия приложения CRM
 service.gui.PREVIOUS=Предыдущий
-service.gui.PREVIOUS_TOOLTIP=Обзор старых разговоров
 service.gui.PRINT=&Печать
 service.gui.PROACTIVE_NOTIFICATION=пишет сообщение
 service.gui.PROBLEMS_ENCOUNTERED=Встречающиеся проблемы
@@ -428,11 +436,11 @@ service.gui.QUIT=&Выйти
 service.gui.READY=Готово
 service.gui.RECENT_MESSAGES=Последние разговоры
 service.gui.REASON=Причина
+service.gui.RECEIVED={0} получено
 service.gui.RECONNECTION_LIMIT_EXCEEDED=Вы были отключены и подключены к серверу слишком быстро. Следующий аккаунт: Имя пользователя: {0}, Сервер: {1} временно заблокирован и придется немного подождать, прежде чем пробовать войти снова.
 service.gui.RE_REQUEST_AUTHORIZATION=Запрос повторной авторизации
 service.gui.REFERRED_STATUS=Переведен
 service.gui.REJECT=&Отклонить
-service.gui.REMIND_ME_LATER=Напомнить мне позже
 service.gui.REMEMBER_PASSWORD=Запомнить пароль
 service.gui.REMOVE=&Удалить
 service.gui.REMOVE_ACCOUNT=&Удалить аккаунт
@@ -447,7 +455,8 @@ service.gui.RENAME_CONTACT=Переименовать &контакт
 service.gui.RENAME_CONTACT_WIZARD=В поле ниже можно указать имя, которое вы хотели бы использовать для данного контакта.
 service.gui.RENAME_GROUP=Переименовать &группу
 service.gui.RENAME_GROUP_INFO=В поле ниже можно указать название, которое хотите использовать для данной группы.
-service.gui.RINGING_STATUS=Вызываю
+service.gui.RENAME_CLEAR_USER_DEFINED=Восстановить
+service.gui.RINGING_STATUS=Звонит
 service.gui.REQUEST=&Запрос
 service.gui.REQUEST_AUTHORIZATION=&Запрос авторизации
 service.gui.REQUEST_AUTHORIZATION_MSG=Не удается добавить {0} в список контактов. {0} должен разрешить запрос на добавление. Пожалуйста, введите Ваш запрос ниже.
@@ -457,27 +466,23 @@ service.gui.REVOKE_ADMIN=Исключить из администраторов
 service.gui.REVOKE_MODERATOR=Исключить из модераторов
 service.gui.REVOKE_MEMBERSHIP=Аннулировать членство
 service.gui.REVOKE_VOICE=Исключить из голосования
-service.gui.ROOT_GROUP=Корневая группа
 service.gui.SAVE=&Сохранить
-service.gui.SAVE_AS_DEFAULT=Сохранить по умолчанию
 service.gui.SEARCH=&Поиск
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Нажмите кнопку ниже, чтобы показать все чаты, существующие на выбранном сервере. Затем выберите тот, в который хотите присоединиться и нажмите на кнопку соединения.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Поиск контактов
 service.gui.SECURITY=Безопасность
 service.gui.SELECT_ACCOUNT=Выбрать аккаунт
+service.gui.SELECT_ACCOUNT_INFO=Какую учётную запись вы хотите использовать для связи с этим контактом?
 service.gui.SELECT_COLOR=Выбрать цвет
 service.gui.SELECT_GROUP=Выбрать группу
-service.gui.SELECT_GROUP_WIZARD_MSG=Представленный ниже список содержит все группы в списке контактов. Выберите одну, которую хотите добавить новый контакт.
+service.gui.SELECT_GROUP_INFO=Под какой группой вы хотите отобразить этот контакт? (Необязательно)
 service.gui.SELECT_NO_GROUP=Без группы
-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.SELECT_VIDEO_CONFERENCE=Выбрать видеоконференцию
+service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Выберите чат-комнату из списка и нажмите OK чтобы добавить ее
 service.gui.SEND=&Отправить
 service.gui.SEND_FILE=Отправить &файл
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Информация об этом контакте отсутствует.
 service.gui.SEND_MESSAGE=&Отправить сообщение
-service.gui.SEND_AS_SMS=Отправить как SMS
 service.gui.SEND_PRIVATE_MESSAGE=Отправить личное сообщение
 service.gui.SEND_SMS=Отправить SMS
 service.gui.SEND_SMS_DETAILS=Помните, что вам нужно ввести номер телефона в международном формате, например, начиная с +7 для России, +78001112233
@@ -485,13 +490,13 @@ service.gui.SEND_SMS_NOT_SUPPORTED=Выбранный протокол не по
 service.gui.SMS=СМС
 service.gui.SEND_VIA=Отправить по
 service.gui.SENT=посланный
-service.gui.SERVER_CHAT_ROOMS=Сервер комнаты
+service.gui.SERVER_CHAT_ROOMS=Серверные чат комнаты
 service.gui.SET_GLOBAL_STATUS=Установить глобальный статус
 service.gui.SET_STATUS_MESSAGE=Установить статус сообщения
 service.gui.SET_SUBJECT=Задать тему
 service.gui.SETTINGS=&Опции
-service.gui.SHARE_DESKTOP=&Открыть рабочий стол
-service.gui.SHARE_DESKTOP_WITH_CONTACT=Открыть рабочий стол контакту
+service.gui.SHARE_DESKTOP=&Предоставить доступ к рабочему столу
+service.gui.SHARE_DESKTOP_WITH_CONTACT=Предоставить контакту доступ к рабочему столу
 service.gui.SHARE_FULL_SCREEN=Открыть рабочий стол в полноэкранном режиме
 service.gui.SHARE_REGION=Открыть часть
 service.gui.SHOW=Показать
@@ -516,21 +521,19 @@ service.gui.STREET=Улица
 service.gui.SUBJECT=Тема
 service.gui.SUMMARY=Сводка
 service.gui.TELEPHONY=Телефония
-service.gui.TODAY=Сегодня
 service.gui.TOOLS=&Инструменты
 service.gui.TRANSFER=Передача
 service.gui.TO=&Кому:
 service.gui.TRANSFER_CALL_MSG=Выберите контакт, который хотите передать, и нажмите Передача.
-service.gui.TRANSFER_CALL_TITLE=Перевести звонок
+service.gui.TRANSFER_CALL_TITLE=Передача вызова
 service.gui.TRANSFER_CALL_TO=Перевод на:
-service.gui.TRANSPARENCY_NOT_ENABLED=Прозрачность не поддерживается текущей конфигурацией.
+service.gui.TRANSPARENCY_NOT_ENABLED=Прозрачность не поддерживается вашей текущей конфигурацией.
 service.gui.TYPE_YOUR_REQUEST=Введите свой запрос здесь
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Не удалось изменить качество видео для этого вызова.
-service.gui.UNMUTE=Включить звук
 service.gui.USER_IDENTIFIER=Идентификатор пользователя:
 service.gui.USER_EXISTS_ERROR=Этот пользователь уже существует в выбранной сети. Пожалуйста, выберите другого пользователя или сеть.
 service.gui.USERNAME_NULL=Пожалуйста, заполните свое имя пользователя и пароль.
-service.gui.WEBPAGE=Открыть веб страницу
+service.gui.WEBPAGE=Открыть веб-страницу
 service.gui.ACCOUNT_CREATION_FAILED=Мы не смогли создать учетную запись из-за следующей ошибки: {0}
 service.gui.UNKNOWN=Неизвестный пользователь
 service.gui.UNKNOWN_STATUS=Неизвестное состояние
@@ -539,13 +542,12 @@ service.gui.USE_PROVISIONING=Использовать автонастройку
 service.gui.VALUE=Значение
 service.gui.VIDEO_CALL=&Видеовызов
 service.gui.VIA=через
-service.gui.VIA_SMS=Через SMS
 service.gui.VIEW=&Показать
 service.gui.VIEW_HISTORY=Показать &историю
 service.gui.VIEW_SMILEYS=Показать &смайлы
 service.gui.VIEW_TOOLBAR=Показать &тулбар
 service.gui.VIEW_SIMPLE_CHAT_THEME=Простой вид чата
-service.gui.VOICEMAIL_NEW_URGENT_OLD_RECEIVED={0} новых ({1} важных) и {2} старых сообщений
+service.gui.VOICEMAIL_NEW_URGENT_OLD_RECEIVED={0} новых ({1} срочных) и {2} старых сообщений
 service.gui.VOICEMAIL_NEW_URGENT_RECEIVED={0} новых ({1} срочных) сообщений
 service.gui.VOICEMAIL_NEW_OLD_RECEIVED={0} новых и {1} старых сообщений
 service.gui.VOICEMAIL_NEW_RECEIVED={0} новых сообщений
@@ -553,15 +555,12 @@ service.gui.VOICEMAIL_OLD_RECEIVED={0} старых сообщений
 service.gui.VOICEMAIL_NO_MESSAGES=Нет сообщений.
 service.gui.VOICEMAIL_TITLE=Голосовые сообщения
 service.gui.VOICEMAIL_TOOLTIP=Голосовые сообщения для:
-service.gui.VOICEMAIL_TIP=Нажмите кнопку вызова для прослушивания сообщений.
+service.gui.VOICEMAIL_TIP=Нажмите кнопку вызова, чтобы прослушать ваши сообщения.
 service.gui.VOICEMAIL_TIP_NO_ACCOUNT=Пожалуйста, настройте URI для проверки голосовой почты в учетной записи
 service.gui.VOLUME_CONTROL_TOOL_TIP=Регулировка громкости
 service.gui.WAITING_AUTHORIZATION=Ожидание авторизации
 service.gui.WARNING=Предупреждение
 service.gui.YES=Да
-service.gui.YESTERDAY=Вчера
-service.gui.EXISTING_ACCOUNT_ERROR=Введенный аккаунт уже установлен.
-service.gui.NEW_MAIL=<b>У Вас одно новое письмо!</b><br/><b>От:</b> {0} {1} <br/><b>Тема:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Вы получили новое письмо во {0} <a href="{1}">входящие</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Вы получили {2} новых письма во {0} <a href="{1}">входящие</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=еще один непрочитанный разговор во<a href="{0}">входящих</a>.<br/>
@@ -569,13 +568,17 @@ service.gui.NEW_GMAIL_MANY_FOOTER={1} еще непрочитанный разг
 service.gui.ACTIVATE=Активировать
 service.gui.DEACTIVATE=Деактивировать
 service.gui.NEW=Новый
-service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Развернуть на весь экран
+service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Войти в полноэкранный режим
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Выйти из полноэкранного режима
 service.gui.HOLD_BUTTON_TOOL_TIP=Удержание разговора
 service.gui.MUTE_BUTTON_TOOL_TIP=Выключить микрофон или удерживайте кнопку для настройки громкости микрофона
+service.gui.PARK=Удержание
+service.gui.PARKING_SLOT=Место для удержания:
+service.gui.PARK_BUTTON_TOOL_TIP=Поставить звонок на удержание
 service.gui.RECORD_BUTTON_TOOL_TIP=Запись разговора
 service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=Включить видеосвязь
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Показать/скрыть свое видео
+service.gui.SHOW_HIDE_PEERS_TOOL_TIP=Показать/скрыть список участников конференции
 service.gui.TRANSFER_BUTTON_TOOL_TIP=Переадресовать вызов
 service.gui.TRANSFER_TO=Переадресовать на...
 service.gui.SECURITY_INFO=Информация о безопасности
@@ -584,14 +587,15 @@ service.gui.SECURITY_ERROR=Ошибка безопасности
 service.gui.SPEED=Скорость:
 service.gui.SILENT_MEMBER=молчаливый участник
 service.gui.NON_SECURE_CONNECTION=Безопасное соединение не может быть установлено для {0}. Если Вы хотите использовать незащищенное подключение, пожалуйста, установите флажок "Разрешить незащищенные соединения" в конфигурации учетной записи
-service.gui.UPDATE=Обновить
 service.gui.MOBILE_PHONE=Мобильный
 service.gui.VIDEO_PHONE=Видеовызовы
 service.gui.WORK_PHONE=Рабочий
 service.gui.PHONE=Телефон
 service.gui.PHONES=Телефон
 service.gui.EDIT_NOT_SUPPORTED=Редактирование этой учетной записи не поддерживается
-service.gui.SHOW_PREVIEW=(показать превью)
+service.gui.SHOW_PREVIEW=(предварительный просмотр)
+service.gui.SHOW_PREVIEW_WARNING_DESCRIPTION=Вы хотите отобразить это изображение ?\n\nИмейте в виду, что предпросмотр изображений/видео можеть нарушить Вашу анонимность и раскрыть Вашу активность в сети.
+service.gui.SHOW_PREVIEW_DIALOG_TITLE=Показать предпросмотр изображения/видео
 
 service.gui.ZID_NAME_SET=Имя ZRTP идентификатора:
 service.gui.ZID_NAME_NOT_SET=Не задано имя ZRTP идентификатора.
@@ -617,10 +621,11 @@ service.gui.callinfo.CALL_INFORMATION=Информация о вызове
 service.gui.callinfo.CALL_IDENTITY=Учетная запись
 service.gui.callinfo.PEER_COUNT=Количество участников
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Конференция
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Шифрование включено
 service.gui.callinfo.CALL_TRANSPORT=Транспорт сигнализации
 service.gui.callinfo.CALL_DURATION=Длительность вызова
 service.gui.callinfo.TLS_PROTOCOL=Протокол TLS
+service.gui.callinfo.TLS_CIPHER_SUITE=набор шифров TLS
+service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Содержимое сертификата TLS сервера показано ниже.
 service.gui.callinfo.VIEW_CERTIFICATE=Просмотр сертификата
 service.gui.callinfo.CODEC=Кодек / Частота
 service.gui.callinfo.NA=N.A.
@@ -629,7 +634,7 @@ service.gui.callinfo.AUDIO_INFO=Аудио поток
 service.gui.callinfo.VIDEO_INFO=Видео поток
 service.gui.callinfo.LOCAL_IP=Локальный IP / Порт
 service.gui.callinfo.REMOTE_IP=Удаленный IP / Порт
-service.gui.callinfo.BANDWITH=Полоса пропускания
+service.gui.callinfo.BANDWITH=Пропускная способность
 service.gui.callinfo.LOSS_RATE=Потеря пакетов
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Джиттер
@@ -639,10 +644,14 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Протокол обмена ключами
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE кандидат расширенного типа
 service.gui.callinfo.ICE_STATE=Состояние ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Получение кандидатов
 service.gui.callinfo.ICE_STATE.RUNNING=Проверка подключения
 service.gui.callinfo.ICE_STATE.COMPLETED=Завершено
 service.gui.callinfo.ICE_STATE.FAILED=Ошибка
+service.gui.callinfo.ICE_STATE.TERMINATED=Завершённый
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Локальный IP / Порт
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Локальный входящий IP / Порт
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Локальный исходящий IP / Порт
@@ -655,35 +664,42 @@ service.gui.callinfo.HARVESTING_MS_FOR=мс (для
 service.gui.callinfo.HARVESTS=результатов)
 service.gui.callinfo.DECODED_WITH_FEC=Пакетов декодированных с FEC
 service.gui.callinfo.DISCARDED_PERCENT=Отброшенных пакетов
-service.gui.callinfo.DISCARDED_TOTAL=Всего отброшенных пакетов
+service.gui.callinfo.DISCARDED_TOTAL=Количество отброшенных пакетов
+service.gui.callinfo.ADAPTIVE_JITTER_BUFFER=Адаптивный буфер синхронизации
+service.gui.callinfo.JITTER_BUFFER_DELAY=Буфер синхронизации
 
 service.gui.ALWAYS_TRUST=Всегда доверять этому сертификату
 service.gui.CERT_DIALOG_TITLE=Проверить сертификат
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} не может проверить подлинность сервера при подключении к<br><b>{1}</b>.<br><br>Сертификат не является доверенным, это означает, что сервер не может быть автоматически проверен.<br><br>Вы хотите продолжить подключение?<br> Для получения дополнительной информации, нажмите кнопку "Показать сертификат".</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} не может проверить подлинность сертификата сервера.<br><br>Сертификат не является доверенным. Это означает, что сервер не<br> может быть автоматически проверен.Вы хотите продолжить подключение?<br><br> Для получения дополнительной информации, нажмите кнопку "Показать сертификат".</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} не может проверить подлинность клиента.<br><br> Сертификат не является доверенным, это означает, что клиент не<br> может быть автоматически проверен. Вы хотите принять подключение?<br><br> Для получения дополнительной информации, нажмите кнопку "Показать сертификат".</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} не может проверить подлинность клиента {1}.<br><br> Сертификат не является доверенным, это означает, что клиент не<br> может быть автоматически проверен. Вы хотите продолжить подключение?<br><br> Для получения дополнительной информации, нажмите кнопку "Показать сертификат".</html>
 service.gui.CONTINUE_ANYWAY=Все равно продолжить
+service.gui.CERT_INFO_CHAIN=Цепочка сертификатов:
+service.gui.CERT_INFO_ISSUED_TO=Выпущен для
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Имя сертификата:
 service.gui.CERT_INFO_O=Организация:
 service.gui.CERT_INFO_C=Страна:
 service.gui.CERT_INFO_ST=Штат или область:
 service.gui.CERT_INFO_L=Населенный пункт:
+service.gui.CERT_INFO_ISSUED_BY=Выдан
 service.gui.CERT_INFO_OU=Подразделение:
+service.gui.CERT_INFO_VALIDITY=Срок действия
 service.gui.CERT_INFO_ISSUED_ON=Действителен с:
 service.gui.CERT_INFO_EXPIRES_ON=Действителен по:
-service.gui.CERT_INFO_FINGERPRINTS=Ключ
+service.gui.CERT_INFO_FINGERPRINTS=Отпечатки
+service.gui.CERT_INFO_CERT_DETAILS=Информация о сертификате
 service.gui.CERT_INFO_SER_NUM=Серийный номер:
 service.gui.CERT_INFO_VER=Версия:
 service.gui.CERT_INFO_SIGN_ALG=Алгоритм подписи:
+service.gui.CERT_INFO_PUB_KEY_INFO=Информация об открытом ключе
 service.gui.CERT_INFO_ALG=Алгоритм:
 service.gui.CERT_INFO_PUB_KEY=Открытый ключ:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} байт: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} бит
 service.gui.CERT_INFO_EXP=Экспонента:
 service.gui.CERT_INFO_KEY_SIZE=Размер ключа:
 service.gui.CERT_INFO_SIGN=Подпись:
-service.gui.CONTINUE=Продолжить
 service.gui.SHOW_CERT=Показать сертификат
 service.gui.HIDE_CERT=Скрыть сертификат
 
@@ -699,26 +715,26 @@ service.gui.AUTO_ANSWER_FWD_CALLS=Переадресация звонков
 service.gui.AUTO_ANSWER_FWD_CALLS_TO=Переадресовывать все звонки на номер или URI:
 service.gui.AUTO_ANSWER_VIDEO=Видеовызовы
 service.gui.AUTO_ANSWER_VIDEO_CALLS_WITH_VIDEO=Отвечать на видеозвонки с видео
+service.gui.LOCAL_VIDEO_ERROR_TITLE=Ошибка с локальным видео
+service.gui.LOCAL_VIDEO_ERROR_MESSAGE=Невозможно включить/выключить локальное видео.
 
 service.gui.security.SECURE_AUDIO=Аудиопоток защищен
 service.gui.security.AUDIO_NOT_SECURED=Аудиопоток не защищен
 service.gui.security.SECURE_VIDEO=Видеопоток защищен
 service.gui.security.VIDEO_NOT_SECURED=Видеопоток не защищен
-service.gui.security.NO_VIDEO=Нет видео
-service.gui.security.CIPHER=Шифр: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Разговор защищен. Для получения информации нажмите сюда.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Разговор не защищен.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Нажмите здесь, чтобы сверить ключ с собеседником.
-service.gui.security.COMPARE_WITH_PARTNER=Сверьте ключ с собеседником и нажмите замочек для подтверждения.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Сверьте ключ с собеседником:
 service.gui.security.STRING_COMPARED=Ключ подтвержден!
+service.gui.security.SAS_INFO_TOOLTIP=<html>Чтобы полностью быть защищённым, Вам<br/>следует голосом <b>сверить</b>короткую<br/>строку аутентификации, указанную здесь,<br/>с партнером и нажать кнопку подтверждения, когда  <br/>строка будет проверена.<br/><br/>Если Вы очистите подтверждение, Вам потребуется заново проверять собеседника<br/>при следующем звонке этому партнеру.</html>
 service.gui.security.SECURITY_ALERT=Инициализация защиты вызова. Отключение через
 
-service.gui.avatar.CHOOSE_ICON=Выбрать аватар
+service.gui.avatar.CHOOSE_ICON=Выбрать картинку
 service.gui.avatar.REMOVE_ICON=Удалить текущий аватар
 service.gui.avatar.CLEAR_RECENT=Очистить список
-service.gui.avatar.RECENT_ICONS=Аватары:
+service.gui.avatar.RECENT_ICONS=Недавние картинки:
 # service.gui.avatar.imagepicker
 service.gui.avatar.imagepicker.CANCEL=Отмена
 service.gui.avatar.imagepicker.CHOOSE_FILE=Обзор ...
@@ -726,19 +742,20 @@ service.gui.avatar.imagepicker.CLICK=Сделать снимок
 service.gui.avatar.imagepicker.IMAGE_FILES=Файлы изображений
 service.gui.avatar.imagepicker.IMAGE_PICKER=Изображение
 service.gui.avatar.imagepicker.IMAGE_SIZE=Размер изображения
-service.gui.avatar.imagepicker.INITIALIZING=Инициализация
 service.gui.avatar.imagepicker.RESET=Сброс
 service.gui.avatar.imagepicker.SET=Задать
 service.gui.avatar.imagepicker.TAKE_PHOTO=Сделать снимок
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Ошибка вебкамеры
 
 service.gui.security.encryption.required=Требуется шифрование!
 
+service.protocol.ICE_FAILED=Невозможно установить подключение (сбой ICE, не найдено трансляции)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
+service.systray.MODE=Реализация лотка
+service.systray.mode.NATIVE=Исходный
+service.systray.mode.DISABLED=Деактивирован
+service.systray.mode.APPINDICATOR=Индикатор приложения (Unity, KDE, неясно с Gnome 3; может упасть на Debian)
+service.systray.mode.APPINDICATOR_STATIC=Статический индикатор приложения (нет меню состояния учётной записи)
+service.systray.CLI_NOTE=Если ваш выбор не работает, вы можете выполнить {0} с опцией "--notray". Это принудительно переведёт статус в положение "Деактивирован" и покажет графический интерфейс. Изменение состояния лотка требует перезапуска.
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Ошибка в адресной книге SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Ресурс не может быть прочитан {0}. Для {1}
@@ -764,9 +781,11 @@ impl.ldap.GENERAL=Общие
 impl.ldap.FIELDS=Поля
 impl.ldap.QUERY=Запрос
 impl.ldap.QUERY_DEFAULT=Создать автоматически
-impl.ldap.NEW=Новый
+impl.ldap.QUERY_CUSTOM=Индивидуальный запрос
+impl.ldap.QUERY_CUSTOM_HINT=Используйте {0} в качестве шаблона для поиска термина.
+impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Автоматически добавить метасимволы в текст запроса
+impl.ldap.QUERY_PHOTO_INLINE=Получать фото вместе с остальными атрибутами
 impl.ldap.EDIT=изменить
-impl.ldap.REMOVE=Удалить
 impl.ldap.ENABLED=Активен
 impl.ldap.SERVER_NAME=Краткое имя
 impl.ldap.SERVER_NAME_EXAMPLE=Адресная книга LDAP
@@ -799,21 +818,27 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 impl.ldap.PHONE_PREFIX=Телефонный префикс
 impl.ldap.PHONE_PREFIX_EXAMPLE=Например: +7
 
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS=''{0}'' не является действительным SIP адресом.
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS=''{0}'' не является действительным XMPP JID.
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Адресная книга
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Включить поиск в адресной книге MacOSX
 plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=Включить поиск контактов в Microsoft Outlook
 plugin.addrbook.DESCRIPTION=Если включено, будет производиться поиск в системной адресной книге и все соответствующие контакты из адресной книги появятся в вашем списке контактов.
-plugin.addrbook.DEFAULT_IM_APP=Сделать Jitsi клиентом для мгновенного обмена сообщениями по умолчанию (Интеграция с Outlook)
+plugin.addrbook.DEFAULT_IM_APP=Сделать Jitsi клиентом для обмена мгновенными сообщениями по умолчанию (Интеграция с Outlook)
 plugin.addrbook.PREFIX=Телефонный префикс
 plugin.addrbook.PREFIX_EXAMPLE=Например: +7
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE=Ошибка доступа к контактам Microsoft Outlook
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT={0} не может в данный момент получить доступ к контактам Microsoft Outlook, так как Outlook не является почтовой программой по умолчанию.
 plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Сделать Outlook почтовым клиентом по умолчанию
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Контакты Google
-impl.googlecontacts.NEW=Новый
 impl.googlecontacts.EDIT=изменить
-impl.googlecontacts.REMOVE=Удалить
 impl.googlecontacts.ENABLED=Активен
 impl.googlecontacts.ACCOUNT_NAME=Аккаунт
 impl.googlecontacts.SAVE=Сохранить
@@ -822,6 +847,10 @@ impl.googlecontacts.USERNAME=Имя аккаунта
 impl.googlecontacts.PASSWORD=Пароль
 impl.googlecontacts.PREFIX=Телефонный префикс
 impl.googlecontacts.WRONG_CREDENTIALS=Неверные данные для аккаунта Google {0}
+impl.googlecontacts.OAUTH_DIALOG_TITLE=Авторизация через Google Контакты
+impl.googlecontacts.INSTRUCTIONS=<html><p><b>Нажмите на ссылку ниже, чтобы утвердить плагину Google Контакты доступ к учётной записи.</b><br><br> Нажав на ссылку, в вашем обозревателе откроется веб-страница. Войдите в требуемую учётную запись и подтвердите доступ. После утверждения, Google покажет вам код. Скопируйте этот код в текстовое поле ниже и нажмите 'Сохранить' </p><p>Это одноразовая операция. Токен авторизации будет сохранён для последующего использования.</p></html>
+impl.googlecontacts.CODE=Код:
+impl.googlecontacts.HYPERLINK_TEXT=Нажмите здесь, чтобы одобрить доступ к {0}
 
 # account info
 plugin.accountinfo.TITLE=Информация об аккаунте
@@ -836,26 +865,27 @@ plugin.accountinfo.NICKNAME=Ник:
 plugin.accountinfo.URL=URL:
 plugin.accountinfo.AGE=Возраст:
 plugin.accountinfo.BDAY=Дата рождения:
+plugin.accountinfo.BDAY_FORMAT=МММ дд, гггг
 plugin.accountinfo.GENDER=Пол:
 plugin.accountinfo.STREET=Адрес:
 plugin.accountinfo.CITY=Город:
 plugin.accountinfo.REGION=Область:
 plugin.accountinfo.POST=Почтовый индекс:
-plugin.accountinfo.COUNTRY=Страна
+plugin.accountinfo.COUNTRY=Страна:
 plugin.accountinfo.EMAIL=Электронный ящик:
+plugin.accountinfo.WORK_EMAIL=Рабочий E-mail:
 plugin.accountinfo.PHONE=Телефон:
+plugin.accountinfo.WORK_PHONE=Рабочий телефон:
 plugin.accountinfo.MOBILE_PHONE=Мобильный телефон:
 plugin.accountinfo.ORGANIZATION=Организация:
 plugin.accountinfo.JOB_TITLE=Должность:
 plugin.accountinfo.ABOUT_ME=Обо мне:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Фотографии пользователя
 plugin.accountinfo.GLOBAL_ICON=Использовать общий значок
 plugin.accountinfo.LOCAL_ICON=Использовать следующий значок:
-plugin.accountinfo.CHANGE=Изменить
-plugin.accountinfo.ONLY_MESSAGE=Только сообщения
 
 # connection info
+plugin.connectioninfo.TITLE=Информация о соединении
 
 # contact info
 plugin.contactinfo.TITLE=Информация о контакте
@@ -863,7 +893,7 @@ plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=Суммарная информа
 plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=Расширенный контактные данные
 plugin.contactinfo.NOT_SPECIFIED=[Не указано]
 plugin.contactinfo.USER_PICTURES=Фотография пользователя
-plugin.contactinfo.USER_STATUS_MESSAGE=Статус
+plugin.contactinfo.USER_STATUS_MESSAGE=Сообщение о состоянии
 
 # aimaccregwizz
 plugin.aimaccregwizz.PROTOCOL_NAME=AIM
@@ -872,62 +902,24 @@ plugin.aimaccregwizz.USERNAME=AIM Имя:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Идентификатор пользователя и пароль
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Регистрация новой учетной записи
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=В случае, если вы не имеете учетной записи AIM, нажмите на эту кнопку, чтобы создать новую.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Переопределить параметры сервера по умолчанию
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=О нас {0}
 plugin.branding.LOGO_MESSAGE=Open Source VoIP && Обмен мгновенными сообщениями
-plugin.branding.LOADING=Загрузка
 plugin.branding.ABOUT_MENU_ENTRY=&О программе
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} в настоящее время в стадии активной разработки. Версия, запущенная вами, экспериментальная и может работать НЕ ТАК как вы ожидаете. Пожалуйста, обратитесь к {2} для получения дополнительной информации.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Все права защищены. Посетите <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> распространяется по лицензии LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Словари
-plugin.dictaccregwizz.ANY_DICTIONARY=Любой словарь
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Любой словарь от {0}
-plugin.dictaccregwizz.FIRST_MATCH=Первое совпадение
-plugin.dictaccregwizz.NO_MATCH=Нет совпадений
-plugin.dictaccregwizz.MATCH_RESULT=Определений для "{0}" не найдено, может быть, вы имеете в виду:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Текущего словаря "{0}" не существует на сервере.
-plugin.dictaccregwizz.INVALID_STRATEGY=Нынешняя стратегия отсутствует на сервере.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=DICT протокол
-plugin.dictaccregwizz.HOST=Хост
-plugin.dictaccregwizz.SERVER_INFO=Информация о сервере
-plugin.dictaccregwizz.STRATEGY_SELECTION=Выбор метода
-plugin.dictaccregwizz.STRATEGY_LIST=Список методов:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Поиск методов
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Использовать метод для поиска похожих слов, если перевод не был найден, благодаря разным методам. Например, номера стратегии будет искать слова, которые начинаются, как слово, которое вы бы перевести.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Информация об учетной записи
-plugin.dictaccregwizz.FIRST_ACCOUNT=Этот мастер поможет создать ваш первый аккаунт на сайте dict.org.\n\nВы можете добавить новый словарь пройдя регистрацию учетной записи в мастере. Заполните поля словаря который вы хотели бы добавить.
-plugin.dictaccregwizz.THREAD_CONNECT=Попытка подключения к серверу
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Попытка подключения не удалась, это не сервер словарей или сервер недоступен
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Получение метода
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Метод не найден на сервере
-plugin.dictaccregwizz.POPULATE_LIST=Заполнение списка
-plugin.dictaccregwizz.CLOSING_CONNECTION=Закрытие соединения
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Для того, чтобы использовать Facebook чат необходимо создать "Имя пользователя" <br>в "Настройках аккаунта " на Facebook.</a><br><br>Примечание: При создании имени пользователя необходимо выйти из страницы <br>и может потребоваться некоторое время, прежде чем вы сможете войти с вашим новым именем пользователя!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Протокол чата Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Имя пользователя:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Имя пользователя и пароль
+plugin.branding.COPYRIGHT_LICENSE=<DIV><font size=3 color={0}>Авторские права 2003-{1} <a href="{2}"><b>{3}</b></a>, Все права защищены.</font><br><br>{4} распространяется на условиях <a href="{5}">{6}</a>.</DIV>
+
+plugin.busylampfield.PICKUP=Поднять трубку
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Автоматический запуск {0} при загрузке компьютера
-plugin.generalconfig.CHATALERTS_ON_MESSAGE=Использовать панель задач / область уведомлений для входящих звонков и сообщений
+plugin.generalconfig.CHATALERTS_ON_MESSAGE=Использовать панель задач / область уведомлений для входящих звонков и бесед
 plugin.generalconfig.GROUP_CHAT_MESSAGES=Группировать текстовые чаты в одном окне
 plugin.generalconfig.LOG_HISTORY=История чата
 plugin.generalconfig.SHOW_HISTORY=Показывать
 plugin.generalconfig.HISTORY_SIZE=последних сообщений в новом чате
 plugin.generalconfig.SEND_MESSAGES_WITH=Отправлять сообщения при нажатии:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Переносить окно чата поверх всех окон при входящем сообщении
-plugin.generalconfig.ERROR_PERMISSION=У вас нет достаточных привилегий для отключения автозапуска
-plugin.generalconfig.TRANSPARENCY=Прозрачность
-plugin.generalconfig.ENABLE_TRANSPARENCY=Включить прозрачность
 plugin.generalconfig.DEFAULT_LANGUAGE=Язык интерфейса
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Изменения вступят в силу при следующем запуске Jitsi.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% переведено
@@ -938,19 +930,27 @@ plugin.generalconfig.ERROR_PORT_NUMBER=Неверный номер порта
 plugin.generalconfig.CHECK_FOR_UPDATES=Проверять наличие обновлений при запуске
 plugin.generalconfig.STARTUP_CONFIG=Запуск
 plugin.generalconfig.LEAVE_CHATROOM_ON_WINDOW_CLOSE=Сообщить о выходе из чата при закрытии окна
+plugin.generalconfig.SHOW_RECENT_MESSAGES=Показать недавние беседы (зависит от истории разговоров)
 plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=Удалить специальные символы из телефонного номера, прежде чем сделать вызов
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=Преобразовывать буквы в цифры телефонного номера
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=напр. +1-800-MYPHONE преобразуется в +1-800-694663
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.XMPP_USE_ALL_RESOURCES=Использовать все ресурсы при обнаружении возможностей контакта
 plugin.generalconfig.OPUS_CONFIG=Кодек Opus
+plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=Частота выборки:
+plugin.generalconfig.OPUS_BITRATE=Средняя скорость кодировщика (кбит/с)
 plugin.generalconfig.OPUS_USE_DTX=Использовать DTX:
 plugin.generalconfig.OPUS_USE_FEC=Использовать Inband FEC:
+plugin.generalconfig.OPUS_COMPLEXITY=Сложность кодировщика:
+plugin.generalconfig.OPUS_MIN_EXPECTED_PACKET_LOSS=Минимальные ожидаемые потери пакетов(%):
 plugin.generalconfig.SILK_CONFIG=Silk
 plugin.generalconfig.SILK_USE_FEC=Использовать Inband FEC:
 plugin.generalconfig.SILK_ALWAYS_ASSUME_PACKET_LOSS=Всегда учитывать потери пакетов:
 plugin.generalconfig.SILK_SAT=Порог голосовой активности (0-1):
 plugin.generalconfig.SILK_ADVERTISE_FEC=Объявлять поддержку FEC в SDP:
 plugin.generalconfig.RESTORE=Восстановить значения по умолчанию
+plugin.generalconfig.MINIMIZE_NOT_HIDE=Минимизировать основное окно вместо закрытия или сворачивания
 
 # gibberish accregwizz
 plugin.gibberishaccregwizz.PROTOCOL_NAME=Gibberish
@@ -969,12 +969,24 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Регистрация новой уч
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=Протокол IRC.
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN и пароль
+plugin.ircaccregwizz.USERNAME=Псевдоним
+plugin.ircaccregwizz.EXAMPLE_USERNAME=Пример: IRC-пользователь
 plugin.ircaccregwizz.INFO_PASSWORD=Большинство IRC серверов не требуют пароля.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=Автоматически менять ник, когда он уже используется
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Использовать порт по умолчанию
 plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=Мой ник не требует идентификации
 plugin.ircaccregwizz.HOST=Хост:
 plugin.ircaccregwizz.IRC_SERVER=Сервер
+plugin.ircaccregwizz.EXAMPLE_SERVER=Пример: chat.freenode.net
+plugin.ircaccregwizz.USE_SECURE_CONNECTION=Использовать безопасное подключение
+plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=Включить присутствие контакта
+plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=Включить присутствие чат комнаты
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=SASL аутентификация
+plugin.ircaccregwizz.ENABLE_SASL_AUTHENTICATION=Включить SASL аутентификацию
+plugin.ircaccregwizz.SASL_USERNAME=Имя пользователя
+plugin.ircaccregwizz.SASL_AUTHZ_ROLE=Должность
+plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED=Вышеупомянутый IRC пароль используется для SASL аутентификации
+plugin.ircaccregwizz.RESOLVE_DNS_THROUGH_PROXY=Всегда разрешать DNS имена через прокси
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
@@ -997,17 +1009,14 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Комментарий
 plugin.jabberaccregwizz.RESOURCE=Ресурс
 plugin.jabberaccregwizz.AUTORESOURCE=Автоматическое создание ресурса
 plugin.jabberaccregwizz.PRIORITY=Приоритет
-plugin.jabberaccregwizz.XMPP_ERROR=Ошибка XMPP
-plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Неизвестная ошибка XMPP ({0)}. Убедитесь, что имя сервера, является правильным.
+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Неизвестная ошибка XMPP ({0)}. Убедитесь, что имя сервера является правильным.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Пароли не совпадают.
 plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Переопределить параметры сервера по умолчанию
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Дополнительные параметры
 plugin.jabberaccregwizz.USE_ICE=Использовать ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Использовать Google Jingle/ICE (экспериментальная функция)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Автоматически обнаруживать STUN/TURN сервера
 plugin.jabberaccregwizz.SUPPORT_TURN=Поддерживать TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Имя пользователя TURN
-plugin.jabberaccregwizz.IP_ADDRESS=IP Адрес
+plugin.jabberaccregwizz.IP_ADDRESS=IP-Адрес
 plugin.jabberaccregwizz.ADD_STUN_SERVER=Добавить STUN-сервер
 plugin.jabberaccregwizz.EDIT_STUN_SERVER=Редактировать STUN-сервер
 plugin.jabberaccregwizz.ADDITIONAL_STUN_SERVERS=Дополнительные STUN-сервера
@@ -1027,19 +1036,17 @@ plugin.jabberaccregwizz.EXISTING_ACCOUNT=Существующий аккаунт
 plugin.jabberaccregwizz.DOMAIN_BYPASS_CAPS=Домен, для которого будут использоваться GTalk-вызовы
 plugin.jabberaccregwizz.TELEPHONY_DOMAIN=Домен для телефонии 
 plugin.jabberaccregwizz.ALLOW_NON_SECURE=Разрешить небезопасные подключения
+plugin.jabberaccregwizz.DISABLE_CARBON=Отключить мультиклиентный обмен сообщениями
 plugin.jabberaccregwizz.DTMF_AUTO=Автоматически выбирать между RTP и Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Параметры сервера
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Изменить пароль
-plugin.jabberaccregwizz.NEW_PASSWORD=Новый пароль
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Повторите пароль
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Пожалуйста, необходимо указать верный порт для продолжения.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Для смены пароля необходимо выполнить вход на сервер.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Пароль пустой.
 plugin.jabberaccregwizz.TLS_REQUIRED=Соединение не использует TLS, пароль не будет изменен.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Пароль успешно изменен
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Ваш XMPP сервер не поддерживает изменение пароля.
 plugin.jabberaccregwizz.PASSWORD_NOT_STORED=Пароль был изменен на сервере, но локальные настройки обновлены не были
-plugin.jabberaccregwizz.ENTER_NEW_PASSWORD=Пожалуйста, введите Ваш новый пароль в оба поля:
+plugin.jabberaccregwizz.ENTER_NEW_PASSWORD=Пожалуйста, введите ваш новый пароль в оба поля:
 plugin.jabberaccregwizz.OVERRIDE_ENCODINGS=Переопределить глобальные настройки кодеков
 plugin.jabberaccregwizz.ENCODINGS=Кодеки
 plugin.jabberaccregwizz.AUDIO=Аудио
@@ -1048,21 +1055,6 @@ plugin.jabberaccregwizz.RESET=Сброс
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Сброс на глобальные настройки
 plugin.jabberaccregwizz.DISABLE_JINGLE=Отключить Jingle (аудио и видеозвонки через XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Исходящее сообщение:
-plugin.mailbox.INCOMING=Входящие сообщение:
-plugin.mailbox.WAIT_TIME=Звонок переводиться на автоответчик
-plugin.mailbox.MAX_MESSAGE_TIME=Максимальная продолжительность входящих сообщений
-plugin.mailbox.CONFIRM=Подтвердить
-plugin.mailbox.DEFAULTS=По умолчанию
-plugin.mailbox.MAILBOX=Почтовый ящик
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Протокол для подключения и чата на MSN службе.
-plugin.msnaccregwizz.USERNAME=Электронный ящик:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID и пароль
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Установить
 plugin.pluginmanager.UNINSTALL=Удалить
@@ -1091,9 +1083,9 @@ plugin.sipaccregwizz.SERVER_PORT=Порт сервера
 plugin.sipaccregwizz.PROXY=Прокси
 plugin.sipaccregwizz.PROXY_PORT=Порт прокси
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Предпочтительный вид транспорта
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Дополнительные параметры
 plugin.sipaccregwizz.PROXY_OPTIONS=Настройки прокси-сервера
 plugin.sipaccregwizz.PROXY_AUTO=Автоматическая настройка прокси-сервера
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=Обход проверки безопасности прокси для сценариев HA (использовать только при необходимости)
 plugin.sipaccregwizz.ENABLE_PRESENCE=Включить присутствие (SIMPLE)
 plugin.sipaccregwizz.FORCE_P2P_PRESENCE=Принудительно включить режим присутствия peer-to-peer
 plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=Период опроса контактов не в сети (в сек.)
@@ -1103,14 +1095,14 @@ plugin.sipaccregwizz.KEEP_ALIVE=Поддерживать активным
 plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Метод поддержки
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Интервал переподключения
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=От 1 до 3600 секунд
+plugin.sipaccregwizz.DTMF_MINIMAL_TONE_DURATION=Минимальная длительность RTP DTMF тона (мс)
+plugin.sipaccregwizz.DTMF_MINIMAL_TONE_DURATION_INFO=Длительность RTP DTMF по умолчанию 70 мс
 plugin.sipaccregwizz.DTMF=DTMF
 plugin.sipaccregwizz.DTMF_METHOD=Метод DTMF
 plugin.sipaccregwizz.DTMF_AUTO=Автоматически выбирать между RTP и Inband (нет SIP INFO)
 plugin.sipaccregwizz.DTMF_RTP=RTP (RFC2833 / RFC4733)
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Переопределить параметры сервера по умолчанию
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Включить поддержку шифрования звонков
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Сообщать о поддержке ZRTP в протоколе сигнализации
 plugin.sipaccregwizz.AUTH_NAME=Имя для авторизации
@@ -1131,10 +1123,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=URI для проверки ГП
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Пароли не совпадают.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none> (использовать обычную проверку подлинности)
 plugin.sipaccregwizz.SAVP_OPTION=Использование RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Выключено (использовать только RTP/AVP) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Обязательно (предлагать и принимать только RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Опционально (сначала предлагать RTP/SAVP, затем RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Включить S-дескриптор (также известный как SDES или SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Выберите протоколы шифрования и их приоритет (сверху протокол с наибольшим приоритетом):
 plugin.sipaccregwizz.CIPHER_SUITES=Доступные наборы шифров:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} будет пытаться автоматически защитить все Ваши звонки с помощью ZRTP. Вы будете уведомлены об этом каждый раз, осуществляя вызов. Вы можете изменять дополнительные настройки только в том случае, если хорошо понимаете, что делаете.</div></html>
@@ -1144,23 +1136,14 @@ plugin.sipaccregwizz.SDES_OPTION=Опция SDES
 
 # skin manager
 plugin.skinmanager.SKINS=Скины
-plugin.skinmanager.DEFAULT_SKIN=Скин по умолчанию
-plugin.skinmanager.ADD_NEW_SKIN=Добавить новый скин...
-plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Скин приложения по умолчанию.
-
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Протокол для подключения к удаленным компьютерам через SSH.
-plugin.sshaccregwizz.USERNAME=ID учетной записи:
-plugin.sshaccregwizz.IDENTITY_FILE=Личный файл:
-plugin.sshaccregwizz.KNOWN_HOSTS=Известные хосты:
-plugin.sshaccregwizz.OPTIONAL=Необязательный
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Информация об учетной записи
+plugin.skinmanager.DEFAULT_SKIN=Оболочка по умолчанию
+plugin.skinmanager.ADD_NEW_SKIN=Добавить новую оболочку...
+plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Оболочка приложения по умолчанию.
 
 # status update
 plugin.autoaway.AUTO_STATUS=Авто отсуствие
 plugin.autoaway.ENABLE_CHANGE_STATUS=Изменить статус, когда отошел
-plugin.autoaway.AWAY_MINUTES=Минут до переключения в ''Нет на месте'':
+plugin.autoaway.AWAY_MINUTES=Минут до переключения в режим ''Нет на месте'':
 
 # updatechecker
 plugin.updatechecker.DIALOG_TITLE=Установить обновления
@@ -1170,6 +1153,7 @@ plugin.updatechecker.BUTTON_DOWNLOAD=Скачать
 plugin.updatechecker.BUTTON_CLOSE=Закрыть
 plugin.updatechecker.BUTTON_INSTALL=Установить
 plugin.updatechecker.UPDATE_MENU_ENTRY=Проверить обновления
+plugin.updatechecker.DIALOG_WARN={0} необходимо выйти перед тем, как он сможет установить обновления. Любые беседы или звонки будут временно отключены. Следует ли {0} продолжить установку обновлений?
 plugin.updatechecker.DIALOG_NOUPDATE=Ваша версия является актуальной.
 plugin.updatechecker.DIALOG_NOUPDATE_TITLE=Нет новой версии
 plugin.updatechecker.DIALOG_MISSING_UPDATE=Обновление установщика не удалось.
@@ -1203,22 +1187,6 @@ plugin.whiteboard.DESELECT=Отменить
 plugin.whiteboard.DELETE=Удалить
 plugin.whiteboard.PROPERTIES=Свойства
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Протокол для подключения и общения на Yahoo! Service.
-plugin.yahooaccregwizz.USERNAME=Имя пользователя:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID и пароль
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Zeroconf (Bonjour) протокол.
-plugin.zeroaccregwizz.FIRST_NAME=Имя:
-plugin.zeroaccregwizz.LAST_NAME=Фамилия:
-plugin.zeroaccregwizz.EMAIL=Электронный ящик:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Запомнить Bonjour контакты?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID и пароль
-plugin.zeroaccregwizz.USERID=Пользовательский ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Протокол Google Talk
@@ -1232,19 +1200,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, портал IP Теле�
 plugin.iptelaccregwizz.USERNAME=Имя пользователя
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Подписаться на iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP и чат
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Имя пользователя
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Введите пароль еще раз
 plugin.sip2sipaccregwizz.EMAIL=Адрес электронной почты
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Для получения справки об услуге посетите<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Адрес электронной почты используется для отправки голосовых сообщений, <br>уведомлений о пропущенных звонках, а также восстановления утерянного пароля</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Для получения справки об услуге посетите<a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Существующий sip2sip.info аккаунт
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Создать бесплатный аккаунт sip2sip.info
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Мгновенные сообщения
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Для получения справки об услуге посетите<br>http://ippi.fr
@@ -1253,6 +1213,8 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Существующие ippi аккау�
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Создать бесплатную учетную запись ippi
 
 # key binding chooser
+plugin.keybindings.WAITING=Нажмите ярлык...
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Закрыть окно чата
 plugin.keybindings.CHAT_COPY=Копировать
 plugin.keybindings.CHAT_CUT=Вырезать
@@ -1275,10 +1237,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Действие
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Сочетание клавиш
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Дополнительно
 plugin.keybindings.globalchooser.PRESS_BTN=Нажмите для назначения сочетания клавиш
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Ожидание
-plugin.keybindings.globalchooser.PUSH_TO_TALK=Push to talk
+plugin.keybindings.globalchooser.PUSH_TO_TALK=Нажмите, чтобы говорить
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Включить обнаружение специальных клавиш
 plugin.keybindings.PLUGIN_NAME=Сочетания клавиш
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Чат
 plugin.keybindings.MAIN=Основные
 plugin.keybindings.GLOBAL=Глобальные
@@ -1306,6 +1268,7 @@ plugin.notificationconfig.tableheader.SOUND=Системный звуковой
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Звуковой сигнал через динамики
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Звуковой сигнал через динамик ПК
 plugin.notificationconfig.tableheader.DESCRIPTION=Описание события
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Входящий звонок
 plugin.notificationconfig.event.SecurityMessage=Сообщение безопасности
 plugin.notificationconfig.event.IncomingFile=Получен файл
@@ -1376,11 +1339,13 @@ impl.media.configform.AUDIO=&Аудио система:
 impl.media.configform.AUDIO_IN=Микрофон:
 impl.media.configform.AUDIO_NOTIFY=&Уведомления:
 impl.media.configform.AUDIO_OUT=Динамики:
+impl.media.configform.AUTOMATICGAINCONTROL=Автоматическая регулировка усиления
 impl.media.configform.DENOISE=Включить подавления шума
 impl.media.configform.DEVICES=Устройства
 impl.media.configform.DOWN=&Вниз
 impl.media.configform.ECHOCANCEL=Включить подавление эха
 impl.media.configform.ENCODINGS=Кодеки
+impl.media.configform.NO_AVAILABLE_AUDIO_DEVICE=Нет доступного звукового устройства. Пожалуйста, подключите его.
 impl.media.configform.NO_DEVICE=<Нет устройства>
 impl.media.configform.NO_PREVIEW=Предварительный просмотр
 impl.media.configform.UP=&Вверх
@@ -1388,25 +1353,32 @@ impl.media.configform.VIDEO=&Выбрать веб-камеру:
 impl.media.configform.VIDEO_MORE_SETTINGS=Дополнительно
 impl.media.configform.VIDEO_RESOLUTION=Разрешение видео
 impl.media.configform.VIDEO_FRAME_RATE=Количество кадров (в сек.)
+impl.media.configform.VIDEO_PACKETS_POLICY=Пороговая скорость RTP (кБайт/с)
+impl.media.configform.VIDEO_BITRATE=Скорость передачи данных видео (килобит/с)
 impl.media.configform.VIDEO_RESET=Сброс настроек
-impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_IN=Выбрано новое устройство для ввода звука:
-impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_OUT=Выбрано новое устройство для вывода звука:
-impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_NOTIFICATIONS=Выбрано новое устройство для оповещений:
-impl.media.configform.VIDEO_DEVICE_SELECTED=Выбрано новое устройство для видео:
+impl.media.configform.AUDIO_DEVICE_CONNECTED=Подключенное устройство:
+impl.media.configform.AUDIO_DEVICE_DISCONNECTED=Отключенное устройство:
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_IN=Новое выбранное устройство для ввода звука:
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_OUT=Новое выбранное устройство для вывода звука:
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_NOTIFICATIONS=Новое выбранное устройство для оповещений:
+impl.media.configform.VIDEO_DEVICE_SELECTED=Новое выбранное устройство для видео:
 impl.media.configform.AUDIO_DEVICE_CONFIG_MANAGMENT_CLICK=Нажмите для настройки устройств
 
 impl.neomedia.configform.AUDIO=Аудио
 impl.neomedia.configform.VIDEO=Видео
 
 impl.neomedia.configform.H264=H.264
+impl.neomedia.configform.H264.defaultIntraRefresh=Периодическое обновление интра-данных
 impl.neomedia.configform.H264.defaultProfile=Профиль для кодирования:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Базовый
 impl.neomedia.configform.H264.defaultProfile.high=Высокое
 impl.neomedia.configform.H264.defaultProfile.main=Основной
+impl.neomedia.configform.H264.keyint=Максимальный интервал между ключевыми кадрами
 impl.neomedia.configform.H264.preferredKeyFrameRequester=Метод запроса ключевых кадров:
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTCP
 impl.neomedia.configform.H264.preferredKeyFrameRequester.signaling=Сигнализация
-impl.neomedia.configform.H264.preset=Предустановки кодеков
+impl.neomedia.configform.H264.preset=Предустановка шифратора
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
@@ -1422,15 +1394,14 @@ plugin.callrecordingconfig.CALL_SAVED_TO={0}
 plugin.securityconfig.TITLE=Безопасность
 plugin.securityconfig.masterpassword.TITLE=Пароли
 plugin.securityconfig.masterpassword.CHANGE_MASTER_PASSWORD=Изменить Мастер-пароль...
-plugin.securityconfig.masterpassword.USE_MASTER_PASSWORD=Использовать Мастер-пароль
+plugin.securityconfig.masterpassword.USE_MASTER_PASSWORD=Использовать мастер-пароль
 plugin.securityconfig.masterpassword.SAVED_PASSWORDS=Сохраненные пароли...
 plugin.securityconfig.masterpassword.INFO_TEXT=Мастер-пароль используется для защиты сохраненных паролей к учетным записям. Пожалуйста, убедитесь, что вы запомнили его.
 plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Текущий пароль:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Введите новый пароль:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Введите пароль повторно:
 plugin.securityconfig.masterpassword.MP_TITLE=Мастер-пароль
-plugin.securityconfig.masterpassword.MP_NOT_SET=(не установлено)
-plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Вы ввели неправильный текущий Мастер-пароль. Пожалуйста, попробуйте еще раз.
+plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Вы ввели неправильный текущий мастер-пароль. Пожалуйста, попробуйте еще раз.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Мастер-пароль неправильный!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Изменение пароля не удалось
 plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS=Пароль успешно изменен
@@ -1455,11 +1426,14 @@ plugin.securityconfig.masterpassword.PASSWORD_QUALITY_METER=Сложность �
 plugin.securityconfig.masterpassword.MP_INPUT=Пожалуйста введите ваш мастер-пароль:\n\n
 
 # otr plugin
-plugin.otr.menu.TITLE=Шифрование
+plugin.otr.menu.TITLE=Безопасная беседа
 plugin.otr.menu.START_OTR=Начать приватный разговор
 plugin.otr.menu.END_OTR=Закончить приватный разговор
+plugin.otr.menu.FINISHED=Ваш приятель закончил личную беседу. Вам следует сделать то же самое
+plugin.otr.menu.VERIFIED=Ваша личная беседа является проверенной
+plugin.otr.menu.UNVERIFIED=Ваша личная беседа не является проверенной. Пожалуйста, удостоверьтесь в подлинности вашего приятеля
 plugin.otr.menu.LOADING_OTR=Начать приватный разговор...
-plugin.otr.menu.TIMED_OUT=Начать приватный разговор
+plugin.otr.menu.TIMED_OUT=Начало личной беседы просрочено (время вышло).
 plugin.otr.menu.REFRESH_OTR=Обновить приватный разговор
 plugin.otr.menu.AUTHENTICATE_BUDDY=Проверка собеседника
 plugin.otr.menu.WHATS_THIS=О технологии
@@ -1469,13 +1443,23 @@ plugin.otr.menu.CB_ENABLE=Включить шифрование сообщени
 plugin.otr.menu.CB_REQUIRE=Требовать шифрование сообщений
 plugin.otr.menu.CB_RESET=Сброс
 plugin.otr.menu.OTR_TOOLTIP=Шифрование переписки OTR
-plugin.otr.authbuddydialog.AUTHENTICATION_METHOD=Как бы вы хотели проходить авторизацию?
+plugin.otr.authbuddydialog.HELP_URI=https://jitsi.org/GSOC2009/OTR
+plugin.otr.authbuddydialog.AUTHENTICATION_INFO=Удостоверение в подлинности собеседника гарантирует, что человек, с которым вы говорите, является тем, за кого он себя выдает.
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD=Как бы вы хотели пройти авторизацию?
 plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_QUESTION=Вопрос для авторизации
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_SECRET=Авторизация методом секретных данных
 plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_FINGERPRINT=Авторизация по отпечатку
+plugin.otr.authbuddydialog.AUTHENTICATION_FINGERPRINT=Чтобы проверить отпечаток, свяжитесь со своим приятелем через другой подтверждённый канал, такой как телефон или электронная почта с CPG-подписью. Каждому из вас следует сообщить ваш отпечаток друг другу. Если всё совпадает, вы должны пометить следующий диалог как *действительно* проверенный с помощью отпечатка.
 plugin.otr.authbuddydialog.LOCAL_FINGERPRINT=Ваш ключ, {0}: {1}
 plugin.otr.authbuddydialog.REMOTE_FINGERPRINT=Ключ собеседника {0}: {1}
-plugin.otr.authbuddydialog.QUESTION_INIT=Введите свой вопрос:
+plugin.otr.authbuddydialog.AUTH_BY_QUESTION_INFO_INIT=Чтобы проверить подлинность с помощью вопроса, вам необходимо составить вопрос, ответ на который известен только вам и вашему приятелю. Вашему собеседнику зададут этот вопрос и если ответы не будут совпадать, тогда, возможно, вы разговариваете с самозванцем.
+plugin.otr.authbuddydialog.AUTH_BY_SECRET_INFO_INIT=Для проверки подлинности с помощью секретных данных вам следует подобрать данные, которые известны только вам и вашему приятелю. Затем вашего приятеля тоже попросят подобрать данные и если они не будут совпадать, тогда, возможно, вы беседуете с самозванцем.
+plugin.otr.authbuddydialog.AUTH_BY_SECRET_INFO_RESPOND=Ваш приятель пытается определить, разговаривает ли он с вами или с самозванцем. Он задал вам вопрос. Если вы хотите пройти проверку подлинности, пожалуйста, введите ответ ниже.
+plugin.otr.authbuddydialog.SHARED_SECRET=Введите ваш общий секрет:
+plugin.otr.authbuddydialog.QUESTION_RESPOND=Ваш приятель задаёт вам вопрос:
+plugin.otr.authbuddydialog.QUESTION_INIT=Введите ваш вопрос здесь:
 plugin.otr.authbuddydialog.ANSWER=Введите свой ответ (с учетом регистра):
+plugin.otr.authbuddydialog.AUTHENTICATION_FROM=Проверка подлинности от {0}.
 plugin.otr.authbuddydialog.CANCEL=Отмена
 plugin.otr.authbuddydialog.HELP=Помощь
 plugin.otr.authbuddydialog.TITLE=Проверка собеседника
@@ -1484,6 +1468,7 @@ plugin.otr.authbuddydialog.I_HAVE=Есть
 plugin.otr.authbuddydialog.I_HAVE_NOT=Я не
 plugin.otr.authbuddydialog.VERIFY_ACTION=подтверждаю, что это действительно правильный ключ для {0}.
 plugin.otr.authbuddydialog.FINGERPRINT_CHECK=Пожалуйста, введите уникальный код, полученный от {0}.
+plugin.otr.smpprogressdialog.TITLE=Процесс проверки подлинности
 plugin.otr.smpprogressdialog.AUTHENTICATION_SUCCESS=Проверка прошла успешно!
 plugin.otr.smpprogressdialog.AUTHENTICATION_FAIL=Сбой проверки подлинности!
 plugin.otr.configform.MY_PRIVATE_KEYS=Собственные ключи
@@ -1496,7 +1481,7 @@ plugin.otr.configform.GENERATE=Создать
 plugin.otr.configform.REGENERATE=Обновить
 plugin.otr.configform.FINGERPRINT=Ключ
 plugin.otr.configform.VERIFY_FINGERPRINT=Подтвердить ключ
-plugin.otr.configform.FORGET_FINGERPRINT=Отклонить ключ
+plugin.otr.configform.FORGET_FINGERPRINT=Забыть отпечаток
 plugin.otr.configform.COLUMN_NAME_CONTACT=Контакт
 plugin.otr.configform.COLUMN_NAME_VERIFIED_STATUS=Проверен
 plugin.otr.configform.COLUMN_VALUE_VERIFIED_TRUE=Да
@@ -1504,22 +1489,35 @@ plugin.otr.configform.COLUMN_VALUE_VERIFIED_FALSE=Нет
 plugin.otr.activator.unverifiedsessionwarning={0} связывается с Вами с недоверенного компьютера. Вы должны <A href="jitsi://{1}/{2}?{3}">проверить подлинность собеседника {0}</a>.
 plugin.otr.activator.unverifiedsessionstared=<b>Непроверенный</b> приватный разговор с {0} начался.
 plugin.otr.activator.sessionstared=Приватный разговор с {0} начался.
-plugin.otr.activator.sessionfinished={0} закончил приватный разговор с Вами. Вы должны сделать то же самое.
+plugin.otr.activator.sessionfinished={0} закончил приватный разговор с вами. Вы должны сделать то же самое.
 plugin.otr.activator.sessionlost=Приватный разговор с {0} закончен.
-plugin.otr.activator.unreadablemsgreceived={0} отправил нечитаемое шифрованное сообщение.
+plugin.otr.activator.historyon={0} записывает эту беседу на ваше устройство. Вы можете <A href="jitsi://{1}/{2}">отключить историю разговора здесь</a>.
+plugin.otr.activator.historyoff={0} НЕ записывает эту беседу. Вы можете <A href="jitsi://{1}/{2}">активировать историю разговора здесь</a>.
+plugin.otr.activator.sessionfinishederror=Ваше сообщение [{0}] не было отправлено. Пожалуйста, закончите вашу личную беседу с {1}.
+plugin.otr.activator.smpaborted={0} прервал процесс проверки подлинности.
+plugin.otr.activator.smperror=В процессе проверки подлинности произошла ошибка.
+plugin.otr.activator.unencryptedmsgreceived=Сообщение было получено в незашифрованном виде.
+plugin.otr.activator.unreadablemsgreceived={0} отправил вам неразборчивое зашифрованное сообщение.
+plugin.otr.activator.requireencryption=Ваше сообщение [{0}] не было отправлено. Требуется конфиденциальный обмен сообщениями.
+plugin.otr.activator.unreadablemsgreply=Вы отправили {0} неразборчивое зашифрованное сообщение. Пожалуйста, закончите вашу личную беседу с {1} или обновите её.
+plugin.otr.activator.fallbackmessage=<span style="font-weight: bold;">{0} пытается начать с вами зашифрованную <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging"> беседу в формате Off-The-Record</a>. Однако, ваше программное обеспечение не поддерживает Off-The-Record. Для большей информации смотрите <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">http://en.wikipedia.org/wiki/Off-the-Record_Messaging</a></span>
+plugin.otr.activator.multipleinstancesdetected=Ваш приятель {0} вошёл в систему много раз и ОТР установила несколько сеансов. Вы можете выбрать исходящий сеанс из меню ниже.
+plugin.otr.activator.msgfromanotherinstance={0} отправил вам сообщение, которое было предназначено для другой сессии. Если вы вошли в систему несколько раз, другая сессия, возможно, получила это сообщение.
 
 # global proxy plugin
-plugin.globalproxy.GLOBAL_PROXY_CONFIG=Прокси-сервер
+plugin.globalproxy.GLOBAL_PROXY_CONFIG=Глобальный прокси-сервер
 plugin.globalproxy.PROXY_TYPE=Тип прокси-сервера
 plugin.globalproxy.PROXY_ADDRESS=Прокси-сервер
 plugin.globalproxy.PROXY_PORT=Порт
 plugin.globalproxy.PROXY_USERNAME=Имя пользователя
 plugin.globalproxy.PROXY_PASSWORD=Пароль
 plugin.globalproxy.DESCRIPTION={0} будет использовать перечисленные параметры прокси-сервера для всех сетей при следующем подключении. \nПоддержка прокси в настоящее время экспериментальная и работает только с некоторыми протоколами. Смотрите таблицу ниже для более подробной информации:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
+plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Аутентификация </td><td> HTTP </td><td> HTTP+Аутентификация </td></tr><tr><td>XMPP (Джаббер)</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
-plugin.globalproxy.FWD_DNS_ADDR=Адрес сервера DNS Proxy
-plugin.globalproxy.FWD_DNS_PORT=Порт сервера DNS Proxy
+plugin.globalproxy.FWD_DNS=Также проксифицировать DNS
+plugin.globalproxy.FWD_DNS_NOTE=Полезно с Тор. Помогает избежать утечки DNS, направляя весь DNS трафик через Тор прокси. Требуется перезагрузка.
+plugin.globalproxy.FWD_DNS_ADDR=Адрес сервера DNS Прокси
+plugin.globalproxy.FWD_DNS_PORT=Порт сервера DNS Прокси
 
 # plugin reconnect
 plugin.reconnectplugin.CONNECTION_FAILED_MSG=Не удалось соединение для следующего аккаунта:\nИмя пользователя: {0}, Имя сервера: {1}.\nПожалуйста, проверьте ваше сетевое подключение или свяжитесь с администратором.
@@ -1531,30 +1529,32 @@ plugin.reconnectplugin.NETWORK_DOWN=Подключение к сети прер�
 plugin.chatconfig.TITLE=Чат
 plugin.chatconfig.replacement.TITLE=Фото/Видео:
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Включить поддержку смайликов
-plugin.chatconfig.replacement.REPLACEMENT_TITLE=Включить предпросмотр для фото и видео
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=Замещение Изображения/Видео
 plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Включить
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_PROPOSAL=Отключено (показать ссылку для предварительного просмотра)
+plugin.chatconfig.replacement.DISABLE_REPLACEMENT=Отключить
+plugin.chatconfig.replacement.CONFIGURE_REPLACEMENT=Изменить настройки замещения Изображения/Видео
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Источники:
 plugin.chatconfig.spellcheck.TITLE=Проверка правописания
 
 #provisioning plugin
-plugin.provisioning.PROVISIONING=Автонастройка
-plugin.provisioning.ENABLE_DISABLE=Автоматическое обнаружение адреса автонастройки
+plugin.provisioning.PROVISIONING=Резервирование
+plugin.provisioning.ENABLE_DISABLE=Включить резервирование
 plugin.provisioning.AUTO=Автоматическое обнаружение адреса автонастройки
 plugin.provisioning.DHCP=DHCP
 plugin.provisioning.DNS=DNS
-plugin.provisioning.BONJOUR=Bonjour
+plugin.provisioning.BONJOUR=Приветсвие
 plugin.provisioning.MANUAL=Вручную задать адрес URI автонастройки
 plugin.provisioning.URI=URI
 plugin.provisioning.RESTART_WARNING=Изменения вступят в силу только при следующем запуске {0}!
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Скопировать UUID в буфер
 plugin.provisioning.CLIPBOARD_FAILED=Ошибка при копировании UUID в буфер
-plugin.provisioning.EXIT_ON_FAIL=Закрывать Jitsi, если автонастройка не удалась
 plugin.provisioning.CREDENTIALS=Учетная запись для автонастройки
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Вы действительно хотите сбросить пароль для автонастройки?
 plugin.provisioning.PROV_FAILED=Автонастройка не удалась
 plugin.provisioning.PROV_FAILED_MSG=<html>Автонастройка не удалась. {0}! <br>Пожалуйста, попробуйте позже или свяжитесь с администратором.</html>
-plugin.provisioning.FORGET_PASSWORD=Сброс сохраненных паролей
+plugin.provisioning.FORGET_PASSWORD=Забыть пароль
 
 # packet logging service
 plugin.loggingutils.PACKET_LOGGING_CONFIG=Протоколирование
@@ -1564,7 +1564,7 @@ plugin.loggingutils.PACKET_LOGGING_RTP_DESCRIPTION=(записывает 1 из
 plugin.loggingutils.PACKET_LOGGING_ICE4J=ice4j.org
 plugin.loggingutils.PACKET_LOGGING_DESCRIPTION=<html>Записывать отладочные сведения различных протоколов в папку журналов <br>в формате pcap (tcpdump/wireshark).</html>
 plugin.loggingutils.PACKET_LOGGING_FILE_COUNT=Количество файлов журнала
-plugin.loggingutils.PACKET_LOGGING_FILE_SIZE=Максимальный размер файла (в Кб)
+plugin.loggingutils.PACKET_LOGGING_FILE_SIZE=Максимальный размер файла (в КБ)
 plugin.loggingutils.ARCHIVE_BUTTON=Архивировать журналы
 plugin.loggingutils.UPLOAD_LOGS_BUTTON=Загрузить журналы
 plugin.loggingutils.UPLOAD_BUTTON=Загрузить
@@ -1582,9 +1582,9 @@ plugin.dnsconfig.chkBackupDnsEnabled.text=Задействовать допол�
 plugin.dnsconfig.lblBackupResolver.text=Имя DNS-сервера
 plugin.dnsconfig.lblBackupResolverFallbackIP.text=IP-адрес DNS-сервера
 plugin.dnsconfig.lblBackupPort.text=Порт
-plugin.dnsconfig.lblRedemption.text=Возврат на первичный DNS
+plugin.dnsconfig.lblRedemption.text=Вернуться к первичному ДНС
 plugin.dnsconfig.lblRedemption.description=<html>Число откликов первичного DNS-сервера перед тем, как задействовать его опять вместо резервного</html>
-plugin.dnsconfig.lblPatience.text=Использовать дополнительный DNS после
+plugin.dnsconfig.lblPatience.text=Запускать дополнительный ДНС после
 plugin.dnsconfig.lblPatience.description=<html>Количество миллисекунд ожидания ответа от первичного DNS, прежде чем использовать резервный</html>
 plugin.dnsconfig.dnssec.chkEnabled=Задействовать DNSSEC
 plugin.dnsconfig.dnssec.lblDefault=Режим по умолчанию
@@ -1616,8 +1616,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} попытался подкл
 #plugin spellcheck
 plugin.spellcheck.TITLE=Орфография и Грамматика
 plugin.spellcheck.MENU=Открыть словарь
-plugin.spellcheck.LANG=Язык
-plugin.spellcheck.EDIT_PERSONAL_DICT=Правка
 plugin.spellcheck.ENABLE_SPELL_CHECK=Проверка правописания
 plugin.spellcheck.dialog.FIND=Найти далее
 plugin.spellcheck.dialog.REPLACE=Заменить   
@@ -1652,15 +1650,20 @@ plugin.certconfig.FILE_TYPE_DESCRIPTION=Хранилище сертификат�
 plugin.certconfig.ALIAS_LOAD_EXCEPTION=Не удается получить псевдонимы из хранилища ключей ({0}).
 plugin.certconfig.INVALID_KEYSTORE_TYPE=Выбранный тип хранилища ключей неверен ({0}).
 plugin.certconfig.BROWSE_KEYSTORE=Открыть хранилище ключей
+plugin.certconfig.REVOCATION_TITLE=Настройки отзыва сертификатов
+plugin.certconfig.REVOCATION_CHECK_ENABLED=Проверка СОС (Списка Отозванных Сертификатов) включена
+plugin.certconfig.REVOCATION_OCSP_ENABLED=Проверка статуса сертификата на предмет отозванности включена
 
 # Phone number contact source plugin
 plugin.phonenumbercontactsource.DISPLAY_NAME=Телефонные номера
 
 # properties editor
 plugin.propertieseditor.TITLE=Редактор свойств
-plugin.propertieseditor.NEW_PROPERTY_TITLE=Добавить свойство
+plugin.propertieseditor.NEW_PROPERTY_TITLE=Добавить новое свойство
 plugin.propertieseditor.CHECK_BOX=Показать это предупреждение в следующий раз
-plugin.propertieseditor.IM_AWARE=Я осознаю риск
+plugin.propertieseditor.DESCRIPTION=Следующая кнопка позволяет изменять свойства конфигурации Jitsi. Изменение этих продвинутых настроек может пагубно влиять на стабильность, безопасность и производительность данного приложения. Вам следует продолжить только если вы уверены в том, что вы делаете.
+plugin.propertieseditor.IM_AWARE=Я отдаю себе отчет о рисках
+plugin.propertieseditor.NEED_RESTART=На заметку: некоторые свойства могут потребовать перезапуска перед тем, как новые настройки вступят в силу.
 
 #Thunderbird address book plugin
 plugin.thunderbird.CONFIG_FORM_TITLE=Thunderbird
diff --git a/resources/languages/resources_si.properties b/resources/languages/resources_si.properties
index 909a419..be6326f 100644
--- a/resources/languages/resources_si.properties
+++ b/resources/languages/resources_si.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,24 +43,18 @@ service.gui.ACCOUNT_ME=මම
 service.gui.ACCOUNT_REGISTRATION_WIZARD=ගිණුම ලියාපදිංචි කිරීමේ සහකරු
 service.gui.ACCOUNTS=ගිණුම්
 service.gui.ADD=එකතු කරන්න (&A)
-service.gui.ADD_ACCOUNT=ගිණුමක් එකතු කරන්න
 service.gui.ADD_CONTACT=සබැඳුමක් එකතු කරන්න (&A)
 service.gui.ADD_CONTACT_TO=සබැඳුමක් එකතු කරන්න (&A) - 
 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} යන නම සහිත සමූහය එකතු කිරීම අසාර්ථක විය. මෙම පද්ධතියේ IO operation එකක් අතරතුර දෝශයක් ඇතිවිය.
 service.gui.ADD_GROUP_EXIST_ERROR={0} යන සමූහය දැනටමත් ඔබේ ලැයිස්තුවේ අන්තර්ගතයි. කරුණාකර වෙනත් නමක් ඇතුලත් කරන්න.
 service.gui.ADD_GROUP_NET_ERROR=ජාල දෝශයක් හේතුවෙන් {0} යන නම සහිත සමූහය එකතු කිරීම අසාර්ථක විය. කරුණාකර ඔබගේ ජාල සම්බන්ධතාව පරීක්ෂාකර නැවත උත්සාහ කරන්න.
 service.gui.ADD_GROUP_ERROR={0} යන නම සහිත සමූහය එකතු කිරීම අසාර්ථක විය.
 service.gui.ADD_GROUP_EMPTY_NAME=සමූහ නාමය හිස් විය නොහැක.
-service.gui.ADD_GROUP=සමූහයක් සාදන්න
-service.gui.ADD_SUBCONTACT=උප-සබැඳුමක් එකතු කරන්න (&A)
 service.gui.ADMINISTRATOR=administrator
 service.gui.ADVANCED=වැඩිමනත් (&A)
-service.gui.ALL=සියල්ල (&A)
 service.gui.ALL_CONTACTS=සියලු සබැඳුම් (&A)
 service.gui.APPLY=ක්‍රියාත්මක කරන්න (&A)
 service.gui.ARE_CALLING=අමතමින්...
@@ -57,7 +62,6 @@ service.gui.ARE_NOW=ඔබ දැන් {0}
 service.gui.AT=වේලාව:
 service.gui.AUTHORIZATION_ACCEPTED=මෙම සබැඳුම ඔබේ ඉල්ලීම අනුමත කර ඇත.
 service.gui.AUTHENTICATION_FAILED=අවසර නොලැබේ. ඔබ ඇතුලත් කල රහස් පදය වැරදියි.
-service.gui.AUTHENTICATION_REQUESTED=සත්‍යතා සහතික කිරීමක් ඉල්ලුම් කර ඇත.
 service.gui.AUTHENTICATION_REQUESTED_SERVER={0} server එක ඔබේ අනන්‍යතාව සහතික කිරීමට ඉල්ලුම් කර ඇත.
 service.gui.AUTHENTICATION_REJECTED=මෙම සබැඳුම ඔබේ ඉල්ලීම ප්‍රතික්ෂේප කර ඇත.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} සත්‍යතා සහතික කිරීම
@@ -97,12 +101,10 @@ service.gui.CHAT_ROOM_USER_KICKED={0}න් එලවන ලදි
 service.gui.CHAT_ROOM_USER_QUIT={0} සමු ගත්තා
 service.gui.CHAT_ROOM_NAME=සංවාදයේ නම
 service.gui.ROOM_NAME=සංවාද මණ්ඩපය
-service.gui.AUTOJOIN=ස්වයංක්‍රීය සම්බන්ධවීම
 service.gui.CHAT_ROOM_NAME_INFO=පහත තීරුවේ ඔබ සෑදීමට යන සංවාද මණ්ඩපය සඳහා නම ඇතුලත් කරන්න.
 service.gui.CHAT_ROOM_NOT_EXIST={0} කුටිය {1} server එකේ සොයාගත නොහැක. කරුණාකර ඔබ ඇතුලත් කළ නම නිවැරදිදැයි තහවුරු කරගන්න.
 service.gui.CHAT_ROOM_NOT_CONNECTED={0} සංවාදයට සම්බන්ධ වීම සඳහා ඔබ ප්‍රවේශවී (log-in) තිබිය යුතුය.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=සංවාදයකින් ඉවත්වීම සඳහා ඔබ ප්‍රවේශවී (log-in) තිබිය යුතුය.
-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} සංවාද මණ්ඩපය රහස්පදයක් ඉල්ලා සිටියි.
@@ -112,14 +114,11 @@ service.gui.CHAT_ROOM_SUBJECT_CHANGED={0}හි මාතෘකාව {1} ලෙ
 service.gui.CLOSE=වහන්න (&o)
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=ඔබ‍ට අවසානවරට පණිවිඩය ලැබුණේ මෙයට තත්පර දෙකකටත් අඩු කාලයක් ඉහතදීය. ඔබට සැබවින්ම ඉවත්වීමට අවශ්‍යද?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=දැනටමත් ඔබේ ගොනු හුවමාරු වෙමින් පවතී. ඒවා අහෝසි කිරීම තහවුරු කරන්න.
-service.gui.CONFIRM=තහවුරු කරන්න
 service.gui.CONNECTING=සම්බන්ධ වෙමින්...
 service.gui.CONNECTING_STATUS=සබැඳුම
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=සම්බන්ධ වෙමින්...
 service.gui.CONNECTION=සබැඳුම
-service.gui.CONNECTION_FAILED_MSG=පහත ගිණුම සමග සම්බන්ධවීම අසාර්ථක විය.පරිශීලක නාමය: {0}, Server නාමය: {1}. කරුණාකර ඔබගේ ජාල සබැඳුම පරීක්ෂා කරන්න. නැතහොත් වැඩි විස්තර ජාල administratorගෙන් ලබා ගන්න.
 service.gui.CONNECTION_EXPIRED_MSG={0} server එක සමග ඔබ දැන‍ට සම්බන්ධවී නොමැත.
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=තෝරන ලද {0} සබැඳුම දුරකථන සහාය නොදක්වයි.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=තෝරන ලද {0} සබැඳුම සම්මන්ත්‍රණ සඳහා සහාය නොදක්වයි.
 service.gui.CONTACT_PAUSED_TYPING={0} පණිවිඩය ඇතුලත් කිරීම නැවැත්වූවා
 service.gui.CONTACT_TYPING={0} පණිවිඩයක් ඇතුලත් කරමින් සිටියි
@@ -132,13 +131,10 @@ service.gui.CREATE_CHAT_ROOM=සංවාද මණ්ඩපක් සාදන�
 service.gui.CREATE_CHAT_ROOM_ERROR={0} සංවාද මණ්ඩපක් සෑදීම අසාර්ථක විය.
 service.gui.CREATE_CHAT_ROOM_WIZARD=සංවාද මණ්ඩප සෑදීමේ සහකරු
 service.gui.CREATE_CONFERENCE_CALL=සම්මන්ත්‍රණ ඇමතුමක් ගන්න... (&C)
-service.gui.CREATE_CONFERENCE_CHAT=සම්මන්ත්‍රණයක් ආරම්භ කරන්න... (&C)
 service.gui.CREATE_GROUP=සමූහයක් සාදන්න... (&C)
 service.gui.CREATE_GROUP_NAME=පහත තීරුවේ ඔබ සෑදීමට යන සමූහය සඳහා නම ඇතුලත් කරන්න.
-service.gui.CREATE_FIRST_GROUP_WIZARD=ඔබේ සබඳතා ලැයිස්තුවේ කිසිඳු සමූහයක් අඩංගු නොවේ. කරුණාකර ප්‍රථමයෙන් සමූයක් සාදන්න (ගොනු මෙනුවෙන්).
 service.gui.CONTACT_INFO_NOT_SUPPORTED=මෙම සබැඳුම ජාල සබඳතා තොරතුරු සඳහා සහාය නොදක්වයි
 service.gui.CUT=කපන්න (&U)
-service.gui.DATE=දිනය
 service.gui.DELETE=මකන්න
 service.gui.DESKTOP_SHARING_WARNING=<b>තිරය පෙන්වීට අවශ්‍යබව තහවුරු කරන්න</b> <br> 'හරි' එබීමෙන් පසු ඔබගේ පරිගණක තිරය මෙම ඇමතුමට සම්බන්ධව ඇති අයට දිස්වනු ඇත.
 service.gui.DIALPAD=ඇමතුම් පැනලය
@@ -159,7 +155,6 @@ service.gui.ERROR_WAS=දෝෂය: {0}
 service.gui.ESTIMATED_TIME=ඇස්තමේන්තුගත කාලය:
 service.gui.EVENTS=සිදුවීම්
 service.gui.EXIT=පිටවෙන්න (&X)
-service.gui.EXTENDED_CRITERIA=වැඩිදුර නිර්ණායක
 service.gui.GENERAL=සාමාන්‍ය
 service.gui.GENERAL_ERROR=සාමාන්‍ය දෝෂයක්
 service.gui.GROUP_NAME=සමූහ නාමය
@@ -213,7 +208,6 @@ service.gui.HIDE_OFFLINE_CONTACTS=ජාලයට සම්බන්ධනොව
 service.gui.HIDE_MAIN_WINDOW=<DIV>කතිර ලකුණ එබීමෙන් මෙය ඉවත් නොවේ, කවුලුව සඟවයි. ඔබට ඉවත්වීමට අවශ්‍ය නම් ගොනු/පිටවෙන්න තෝරන්න</DIV>
 service.gui.HISTORY=අතීතය (&H)
 service.gui.HISTORY_CONTACT=අතීතය - {0}
-service.gui.HOUR=පැය
 service.gui.IDENTIFIER=හඳුන්වනය
 service.gui.IGNORE=නොසලකා හරින්න (&I)
 service.gui.INSERT_SMILEY=සිනා-මුහුණක් යොදන්න
@@ -230,7 +224,6 @@ service.gui.IS_CALLING=අමතයි...
 service.gui.IS_NOW={0} දැන් {1} නම්වේ
 service.gui.JOIN=එකතුවෙන්න (&J)
 service.gui.JOIN_AS=...ලෙස එකතුවෙන්න (&O)
-service.gui.CLOSE_CHAT_ROOM_DIALOG=වසන්න (&L)
 service.gui.JOIN_CHAT_ROOM=සංවාද මණ්ඩපයට එකතුවෙන්න... (&J)
 service.gui.JOIN_CHAT_ROOM_TITLE=සංවාද මණ්ඩපයට එකතුවෙන්න...
 service.gui.JOIN_CHAT_ROOM_NAME=කරුණාකර ඔබ සම්බන්ධවීමට කැමති සංවාද මණ්ඩපයේ නම ඇතුලත් කරන්න.
@@ -240,7 +233,6 @@ service.gui.KICK_FAILED=ඉවත් කිරීම අසාර්ථක ව�
 service.gui.KICK_FAILED_GENERAL_ERROR={0} ඉවත් කිරීම අසාර්ථක විය. පොදු server දෝශයක් ඇතිවිය.
 service.gui.KICK_FAILED_NOT_ALLOWED={0} ඉවත් කිරීම අසාර්ථක විය. මෙම කුටියේ අයිතිකරු ඉවත් කල නොහැකිවිය.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS={0} ඉවත් කිරීම අසාර්ථක විය. ඔබට ඒ සඳහා වරප්‍රසාද නොමැත.
-service.gui.LAST=අවසාන
 service.gui.LAST_NAME=අවසාන නම:
 service.gui.LEAVE=පිටවෙන්න (&L)
 service.gui.LIMIT_REACHED_FOR_IP=ඔබට දැනටමත් මෙම IP ලිපිනයෙන් ලියාපදිංචිවීම් විශාල ප්‍රමාණයක් ඇත. server {0} තවත් ලියාපදිංචිවීම් සඳහා ඉඩ ලබා නොදෙයි.
@@ -255,7 +247,6 @@ service.gui.MEMBER=සාමාජිකයා
 service.gui.MESSAGE=පණිවිඩය:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= සහ තවත් {0}ක්
 service.gui.MODERATOR=සභාපති
-service.gui.MORE=වැඩිමනත් විස්තර
 service.gui.MORE_LABEL=තැන්මාරු කරන්න
 service.gui.MOVE=තැන්මාරු කරන්න
 service.gui.MOVE_SUBCONTACT=සබැඳුම මාරු කරන්න (&O)
@@ -264,7 +255,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=ඔබ තේරූ සබැඳුම මු
 service.gui.MOVE_SUBCONTACT_QUESTION=ඔබට {0}, {1}‍ වෙත මාරුකිරීමට අවශ්‍යබව තහවුරු කරන්න.
 service.gui.MOVE_TO_GROUP=සමූහයට මාරු කරන්න. (&M)
 service.gui.MOVE_CONTACT=සබැඳුම මාරු කරන්න
-service.gui.MOVE_CONTACT_ERROR=සබැඳුම මාරු කිරීමට නොහැක (&C)
 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.
@@ -275,7 +265,6 @@ service.gui.MSG_NOT_POSSIBLE=මෙම සබැඳුමට පණිවිඩ
 service.gui.MSG_RECEIVED={0} ගෙන්
 service.gui.MSG_SEND_CONNECTION_PROBLEM=පණිවිඩ යැවීමට ඔබ ජාලයට සම්බන්ධවී සිටිය යුතුය.
 service.gui.MULTIPLE_LOGINS=ඔබ එකම ගිණුමෙන් එක් වරකට වඩා ප්‍රවේශවී ඇත. {0} පරිශීලක නාමය සහ {1} server නාමය සහිත ගිණුම දැනට විසන්ධිවී ඇත.
-service.gui.MUTE=නිශ්ශබ්ද
 service.gui.NAME=නම
 service.gui.NETWORK=ජාලය
 service.gui.NETWORK_FAILURE=ජාල දෝශයක්
@@ -294,7 +283,6 @@ service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=ඔබ නොයැවූ පණිව�
 service.gui.NON_EXISTING_USER_ID={0} server එක මෙම පරිශීලක නාමය හඳුනා නොගනී.
 service.gui.OFFLINE=විසන්ධිව
 service.gui.OK=හරි (&O)
-service.gui.OLDER_CALLS=පසුගිය ඇමතුම්
 service.gui.ONLINE=සම්බන්ධව
 service.gui.OPEN=විවෘත කරන්න
 service.gui.OPEN_FILE_FROM_IMAGE=ගොනුව විවෘත කිරීම සඳහා double click කරන්න.
@@ -302,7 +290,6 @@ service.gui.OPEN_FOLDER=බහාලුම විවෘත කරන්න
 service.gui.OPEN_IN_BROWSER=අන්තර්ජාල ගවේශකයේ විවෘත කරන්න (&B)
 service.gui.OPTIONS=තේරීම්
 service.gui.OR=හෝ
-service.gui.OR_ENTER_PHONE_NUMBER=හෝ මෙතැන දුකතන අංකය ඇතුලත් කරන්න...
 service.gui.ORGANIZATION=සංවිධානය:
 service.gui.OWNER=කුටියේ අයිතිකරු
 service.gui.PASSWORD=රහස්පදය
@@ -313,7 +300,6 @@ service.gui.PORT=තොටුපළ
 service.gui.PRESENCE=පැවැත්ම
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS=යෝජනා සඳහා: 'Enter'
 service.gui.PREVIOUS=පසුගිය
-service.gui.PREVIOUS_TOOLTIP=පසුගිය සංවාද පිරික්සන්න
 service.gui.PRINT=මුද්‍රණය (&P)
 service.gui.PROACTIVE_NOTIFICATION=පණිවිඩයක් සටහන් කරමින්...
 service.gui.PROTOCOL=ප්‍රොටෝකෝලය
@@ -346,25 +332,17 @@ service.gui.REVOKE_ADMIN=admin අවලංගුකරන්න
 service.gui.REVOKE_MODERATOR=moderator අවලංගුකරන්න
 service.gui.REVOKE_MEMBERSHIP=සාමාජිකත්වය අවලංගුකරන්න
 service.gui.REVOKE_VOICE=කටහඬ අහෝසිකරන්න
-service.gui.ROOT_GROUP=ප්‍රධාන සමූහය
 service.gui.SAVE=සුරකින්න (&S)
 service.gui.SEARCH=සොයන්න (&S)
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=තෝරාගත් server එකෙහි ඇති සියලු සංවාද මණ්ඩප පෙන්වීමට පහත බොත්තම ඔබා ඔබ සම්බන්ධවීමට කැමති මණ්ඩපට තෝරන්න.
 service.gui.SECURITY=ආරක්ෂාව
-service.gui.SELECT_ACCOUNT=ගිණුම තෝරන්න
 service.gui.SELECT_COLOR=පාට තෝරන්න
 service.gui.SELECT_GROUP=සමූහය තෝරන්න
-service.gui.SELECT_GROUP_WIZARD_MSG=පහත ලැයිස්තුවේ ඔබේ සබඳතා ලැයිස්තුවේ ඇති සියලු සමූහයන් අන්තර්ගතවේ. නව සබැඳුම එකතුවිය යුතු සමූහය තෝරන්න.
 service.gui.SELECT_NO_GROUP=සමූහයක් නොමැත
-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=යවන්න (&S)
 service.gui.SEND_FILE=ගොනුව යවන්න (&F)
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=මෙම සබැඳුම සඳහා තොරතුරු කිසිවක් නොමැත.
 service.gui.SEND_MESSAGE=පණිවිඩයක් යවන්න (&S)
-service.gui.SEND_AS_SMS=කෙටි පණිවිඩයක් ලෙස යවන්න
 service.gui.SEND_SMS=කෙටි පණිවිඩය යවන්න (&E)
 service.gui.SEND_SMS_DETAILS=මෙය ජාත්‍යන්තර අංකයක් ලෙස ඇතුලත්කළ යුතු බව මතක තබාගන්න.උදා- ශ්‍රී ලංකාවේ අංකයක් +94 ලෙස ආරම්භ කරන්න, +941110000000
 service.gui.SEND_SMS_NOT_SUPPORTED=ඔබ තෝරන ලද ගිණුම කෙටි පණිවිඩ සඳහා සහාය නොදක්වයි.
@@ -391,7 +369,6 @@ service.gui.STATUS_CHANGE_NETWORK_FAILURE=ජාල දෝශයක් හේත
 service.gui.STATUS_MESSAGE_INFO=ඔබට පහත තීරුවේ නව පණිවිඩය ඇතුලත් කළ හැක.
 service.gui.SUBJECT=මාතෘකාව
 service.gui.SUMMARY=සාරාංශය
-service.gui.TODAY=අද
 service.gui.TOOLS=මෙවලම්
 service.gui.TRANSFER=පවරන්න (&F)
 service.gui.TO=වෙත: (&T)
@@ -400,7 +377,6 @@ service.gui.TRANSFER_CALL_TITLE=ඇමතුම පවරන්න
 service.gui.TRANSFER_CALL_TO=වෙත පවරන්න:
 service.gui.TRANSPARENCY_NOT_ENABLED=ඔබේ වර්තමාන සැකසුම් පාරදෘශ්‍යතාව සඳහා සහාය නොදක්වයි.
 service.gui.TYPE_YOUR_REQUEST=මෙතැන ඔබේ ඉල්ලීම ඇතුලත් කරන්න.
-service.gui.UNMUTE=නිශ්ශබ්දතාව අහෝසි කරන්න
 service.gui.USER_IDENTIFIER=පරිශීලක හඳුන්වනය:
 service.gui.USER_EXISTS_ERROR=තේරූ ජාලයේ දැනටමත් මෙම පරිශිලකයා පවතී. කරුණාකර වෙනත් පරිශිලකයෙක් හෝ ජාලයක් තෝරන්න.
 service.gui.ACCOUNT_CREATION_FAILED=මෙම දෝශය හේතුවෙන් ඔබේ ගිණුම සෑදීම අසාර්ථක විය: {0}
@@ -414,9 +390,6 @@ service.gui.VIEW_TOOLBAR=මෙවලම් තීරුව පෙන්වන�
 service.gui.VOICEMAIL_NO_MESSAGES=පණිවිඩයක් නොමැත
 service.gui.WARNING=අවවාදයයි
 service.gui.YES=ඔව්
-service.gui.YESTERDAY=ඊයේ
-service.gui.EXISTING_ACCOUNT_ERROR=ඔබ ඇතුලත්කළ ගිණුම දැනටමත් ස්ථාපනය කර ඇත.
-service.gui.NEW_MAIL=<b>ඔබට නව ලිපියක් තිබේ!</b><br/><b>එවන්නා:</b> {0} {1} <br/><b>මාතෘකා‍ව:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=ඔබේ {0} <a href="{1}">inbox</a> එකට නව ලිපියක් ලැබී ඇත:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=ඔබේ {0} <a href="{1}">inbox</a> එකට නව ලිපි {2}ක් ලැබී ඇත:<br/>
 service.gui.NEW_GMAIL_FOOTER=ඔබේ <a href="{0}">inbox</a> එකේ නොකියවූ තවත් එක් සංවාදයක් තිබේ. <br/>
@@ -436,7 +409,6 @@ service.gui.SECURITY_WARNING=ආරක්ෂක අවවාදය
 service.gui.SECURITY_ERROR=ආරක්ෂණ දෝශය
 service.gui.SPEED=වේගය:
 service.gui.SILENT_MEMBER=සාමාජිකයා නිශ්ශබ්ද කරන්න
-service.gui.UPDATE=යාවත්කාලීන
 service.gui.VIDEO_PHONE=දෘශ්‍ය
 service.gui.PHONE=දුරකතනය:
 service.gui.PHONES=දුරකතනය:
@@ -459,12 +431,16 @@ service.gui.callinfo.VIEW_CERTIFICATE=සහතිකය පෙන්වන්�
 service.gui.callinfo.MEDIA_STREAM_RTP=ZRTP
 service.gui.callinfo.MEDIA_STREAM_SRTP=ZRTP
 
+#enum values from IceProcessingState
+
+
 service.gui.ALWAYS_TRUST=මෙම සහතිකය සෑමවිටම විශ්වාස කරන්න
 service.gui.CERT_DIALOG_TITLE=සහතිකය තහවුරු කරන්න
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{1}:{2} වෙත සම්බන්ධවීමේදී server එකෙහි අනන්‍යතාව {0}ට තහවුරු කරගත නොහැක. <br><br> සහතිකය විශ්වාස කළ නොහැකි බැවින් server එකෙහි අනන්‍යතාව ස්වයංක්‍රීයව තහවුරු කරගත නොහැක. ඔබට මෙම සම්බන්ධවීම පවත්වාගෙන යාමට අවශ්‍යද? <br><br> වැඩිදුර තොරතුරු සඳහා "සහතිකය පෙන්වන්න" යන්න ඔබන්න.</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{1}:{2} වෙත සම්බන්ධවීමේදී server එකෙහි අනන්‍යතාව {0}ට තහවුරු කරගත නොහැක. <br><br> සහතිකය විශ්වාස කළ නොහැකි බැවින් server එකෙහි අනන්‍යතාව ස්වයංක්‍රීයව තහවුරු කරගත නොහැක. ඔබට මෙම සම්බන්ධවීම පවත්වාගෙන යාමට අවශ්‍යද? <br><br> වැඩිදුර තොරතුරු සඳහා "සහතිකය පෙන්වන්න" යන්න ඔබන්න.</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{1}:{2} වෙත සම්බන්ධවීමේදී server එකෙහි අනන්‍යතාව {0}ට තහවුරු කරගත නොහැක. <br><br> සහතිකය විශ්වාස කළ නොහැකි බැවින් server එකෙහි අනන්‍යතාව ස්වයංක්‍රීයව තහවුරු කරගත නොහැක. ඔබට මෙම සම්බන්ධවීම පවත්වාගෙන යාමට අවශ්‍යද? <br><br> වැඩිදුර තොරතුරු සඳහා "සහතිකය පෙන්වන්න" යන්න ඔබන්න.</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{1}:{2} වෙත සම්බන්ධවීමේදී server එකෙහි අනන්‍යතාව {0}ට තහවුරු කරගත නොහැක. <br><br> සහතිකය විශ්වාස කළ නොහැකි බැවින් server එකෙහි අනන්‍යතාව ස්වයංක්‍රීයව තහවුරු කරගත නොහැක. ඔබට මෙම සම්බන්ධවීම පවත්වාගෙන යාමට අවශ්‍යද? <br><br> වැඩිදුර තොරතුරු සඳහා "සහතිකය පෙන්වන්න" යන්න ඔබන්න.</html>
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=පොදු නාමය:
 service.gui.CERT_INFO_O=සංවිධානය:
 service.gui.CERT_INFO_C=රට:
@@ -478,18 +454,15 @@ service.gui.CERT_INFO_VER=සංස්කරණය:
 service.gui.CERT_INFO_SIGN_ALG=මුද්‍රා ඇල්ගොරිතමය:
 service.gui.CERT_INFO_ALG=ඇල්ගොරිතමය:
 service.gui.CERT_INFO_PUB_KEY=පොදු යතුර:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} බයිට්: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} බිට්
 service.gui.CERT_INFO_EXP=ප්‍රකාශකයා:
 service.gui.CERT_INFO_KEY_SIZE=යතුරේ ප්‍රමාණය:
 service.gui.CERT_INFO_SIGN=මුද්‍රාව:
-service.gui.CONTINUE=පවත්වාගන්න
 service.gui.SHOW_CERT=සහතිකය පෙන්වන්න
 service.gui.HIDE_CERT=සහතිකය සඟවන්න
 
 service.gui.AUTO_ANSWER_VIDEO=දෘශ්‍ය
 
-service.gui.security.COMPARE_WITH_PARTNER=සහකරු සමග සසඳාබලා තහවුරුකිරීම සඳහා ඉබියතුර ඔබන්න.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT={0} සහකරු සමග සසඳන්න
 
@@ -503,18 +476,12 @@ service.gui.avatar.imagepicker.CLICK=ඔබා සිනාසෙන්න
 service.gui.avatar.imagepicker.IMAGE_FILES=පිළිබිඹු ගොනු
 service.gui.avatar.imagepicker.IMAGE_PICKER=රූපය
 service.gui.avatar.imagepicker.IMAGE_SIZE=පිළිබිඹුවේ ප්‍රමාණය
-service.gui.avatar.imagepicker.INITIALIZING=අරඹමින්
 service.gui.avatar.imagepicker.RESET=නැවත පිහිටුවන්න
 service.gui.avatar.imagepicker.SET=තෝරන්න
 service.gui.avatar.imagepicker.TAKE_PHOTO=ඡායාරූපයක් ගන්න
-service.gui.avatar.imagepicker.WEBCAM_ERROR=වෙබ්කැමරාවේ දෝශයක්
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 
 # systray
@@ -533,9 +500,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=ජාලය තෝරන්න
 
 # LDAP
 impl.ldap.GENERAL=සාමාන්‍ය
-impl.ldap.NEW=නව
 impl.ldap.EDIT=සැකසුම් (E)
-impl.ldap.REMOVE=ඉවත්කරන්න
 impl.ldap.ENABLED=සක්‍රීය කරන්න
 impl.ldap.SERVER_HOSTNAME=සත්කාරක නම:
 impl.ldap.SAVE=සුරකින්න (&S)
@@ -544,12 +509,14 @@ impl.ldap.SERVER_PORT=තොටුපළ
 impl.ldap.PASSWORD=රහස්පදය
 impl.ldap.MAIL_FIELD_EXAMPLE=විද්‍යුත් තැපැල් ලිපිනය:
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
-impl.googlecontacts.NEW=නව
 impl.googlecontacts.EDIT=සැකසුම් (E)
-impl.googlecontacts.REMOVE=ඉවත්කරන්න
 impl.googlecontacts.ENABLED=සක්‍රීය කරන්න
 impl.googlecontacts.SAVE=සුරකින්න (&S)
 impl.googlecontacts.CANCEL=එපා (&C)
@@ -569,9 +536,6 @@ plugin.accountinfo.BDAY=උපන් දිනය:
 plugin.accountinfo.GENDER=‍ස්ත්‍රී/පුරුෂ භාවය:
 plugin.accountinfo.EMAIL=විද්‍යුත් තැපෑල:
 plugin.accountinfo.PHONE=දුරකතනය:
-plugin.accountinfo.USER_PICTURES=පරිශීලක රූප
-plugin.accountinfo.CHANGE=වෙනස් කරන්න
-plugin.accountinfo.ONLY_MESSAGE=පණිවිඩ පමණක්
 
 # connection info
 
@@ -589,49 +553,12 @@ plugin.aimaccregwizz.USERNAME=AIM තිරනාමය:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=තිරනාමය සහ රහස්පදය
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=නව ගිණුමක් ලියාපදිංචි කරන්න
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=ඔබට AIM ගිණුමක් නොමැතිනම්, අලුතෙන් ආරම්භ කිරීමට මෙම බොත්තම ඔබන්න.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=server එකෙහි සම්මත සැකසුම් වෙනස් කරන්න
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE={0} ගැන
 plugin.branding.LOGO_MESSAGE=විවෘත කේත VoIP සහ ක්ෂණික පණිවිඩ
-plugin.branding.LOADING=ප්‍රවේශ වෙම්න්
 plugin.branding.ABOUT_MENU_ENTRY=පිළිබඳව (&A)
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>The {1},දැනට සක්‍රීය ගොඩනැගුම් අදියරේ ඇත. ඔබ පාවිච්චි කරන සංස්කරණය පරීක්ෂණ මට්ටමේ ඇති බැවින් බලාපොරොත්තුවන ආකාරයට ක්‍රියා නොකිරීමට පිළිවන. කරුණාකර වැඩිවිස්තර සඳහා {2} බලන්න.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2009 ප්‍රකාශන හිමිකම <b>sip-communicator.org</b>. සියලු හිමිකම් ඇවිරිණි. <a href="http://sip-communicator.org">http://sip-communicator.org</a> වෙත යන්න.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>SIP Communicator</b>, LGPLහි අඩංගු වගන්ති යටතේ බෙදාහැරේ.(<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=ශබ්දකෝෂ
-plugin.dictaccregwizz.ANY_DICTIONARY=ඕනෑම ශබ්දකෝෂයක්
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM={0} සිට ඕනෑම ශබ්දකෝෂයක්
-plugin.dictaccregwizz.FIRST_MATCH=ප්‍රථම ගැළපුම
-plugin.dictaccregwizz.NO_MATCH=ගැළපීම් නොමැත
-plugin.dictaccregwizz.MATCH_RESULT="{0}" සඳහා අර්ථ දැක්වීම් කිසිවක් සොයාගත නොහැක. සමහරවිට ඔබ අදහස් කරන්නේ මෙය විය හැක:\n
-plugin.dictaccregwizz.INVALID_DATABASE=මෙම "{0}" ශබ්දකෝෂය තවදුරටත් server එකෙහි නොපවතී.
-plugin.dictaccregwizz.INVALID_STRATEGY=මෙම මූලෝපාය server එකෙහි අඩංගු නොවේ.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION='Dict' සේවා ප්‍රොටෝකෝලය
-plugin.dictaccregwizz.HOST=ධාරකයා
-plugin.dictaccregwizz.SERVER_INFO=server තොරතුරු
-plugin.dictaccregwizz.STRATEGY_SELECTION=මූලෝපා තේරීම
-plugin.dictaccregwizz.STRATEGY_LIST=මූලෝපායන් ලැයිස්තුව
-plugin.dictaccregwizz.SEARCH_STRATEGIES=මූලෝපායන් සොයන්න
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=මූලෝපාය වන්නේ, පරිවර්තනයක් සොයා නොගතහොත් සමාන වචන සෙවීමයි. උදාහරණයක් ලෙස, උපසර්ග මූලෝපායයෙන් ඔබ පරිවර්තනය කිරීමට යන වචනයෙන් පටන්ගන්නා වචන සොයාදෙයි.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE='Dict' ගිණුම් තොරතුරු
-plugin.dictaccregwizz.FIRST_ACCOUNT=මෙමගින්, dict.org හි ඔබේ ප්‍රථම Dict ගිණුම සෑදීමට සහායවනු ඇත.\n\nනව ගිණුමක් එකතු කිරීමට "ගිණුම් ලියාපදිංචිකිරීමේ සහකරු" වෙත ගොස් "සත්කාරකයා" තීරුවෙහි ඔබේ ශබ්දකෝෂය ඇතුලත් කරන්න.
-plugin.dictaccregwizz.THREAD_CONNECT=server එකට සම්බන්ධවීමට උත්සාහ කරමින්...
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=සම්බන්ධවීමට නොහැකිවිය. මෙය dic server එකක් නොවේ, එසේ නොමැතිනම් server එක ක්‍රියාකාරීව නොපවතී
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=ලබාගන්නා මූලෝපායයන්
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=මෙම server එකෙහි මූලෝපායක් හමු නොවුණි
-plugin.dictaccregwizz.POPULATE_LIST=ලැයිස්තුව සකසමින්
-plugin.dictaccregwizz.CLOSING_CONNECTION=සම්බන්ධතාවය වසමින්
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">ෆේස්බුක් කතාබහ සඳහා ඔබ පරිශීලක නාමයක් සෑදිය යුතුවේ:<br>ෆේස්බුක් හි "Account Settings" පිටුවෙන්.</a><br><br>සටහන: පරිශීලක නාමය සෑදූ පසු වෙබ් අඩවියෙන් ඉවත්වන්න<br>නව පරිශීලක නාමයෙන් ඇතුලුවීම සඳහා ටික වේලාවක් ගතවිය හැකිය!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=ෆේස්බුක් කතාබහ ප්‍රොටෝකෝලය
-plugin.facebookaccregwizz.PROTOCOL_NAME=ෆේස්බුක් (facebook)
-plugin.facebookaccregwizz.USERNAME=පරිශීලක නාමය:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=පරිශීලක නාමය සහ රහස්පදය
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=පරිගණකය නැවත ක්‍රියාත්මක කරනවිට {0} ස්වයංක්‍රීයව ආරම්භ කරන්න
@@ -641,9 +568,6 @@ plugin.generalconfig.SHOW_HISTORY=පෙන්වන්න
 plugin.generalconfig.HISTORY_SIZE=නව කතාබහකදී මෑතකදී හුවමාරුවූ පණිවිඩ
 plugin.generalconfig.SEND_MESSAGES_WITH=මෙමගින් යවන්න:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=කතාබහ කවුලුව ඉදිරියට ගෙනෙන්න
-plugin.generalconfig.ERROR_PERMISSION=ස්වංක්‍රීය ආරම්භකිරීම ඉවත්කිරීම සඳහා ඔබට ප්‍රමාණවත් අයිතීන් නොමැත
-plugin.generalconfig.TRANSPARENCY=පාරදෘශ්‍යතාවය
-plugin.generalconfig.ENABLE_TRANSPARENCY=පාරදෘශ්‍යතාවය සක්‍රීය කරන්න
 plugin.generalconfig.DEFAULT_LANGUAGE=අතුරුමුහුණත් භාෂාව
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=ඔබ සිදුකල වෙනස්කම් ඊළඟ ප්‍රතිපිහිටුමේදී ක්‍රියාවට නැංවෙනු ඇත
 plugin.generalconfig.SIP_CLIENT_PORT=SIP සේවාග්‍රාහක දොරටුව
@@ -681,7 +605,6 @@ plugin.ircaccregwizz.IRC_SERVER=Server
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=SIP ප්‍රොටෝකෝලය
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=රහස්පදය තහවුරු කරන්න
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=අනන්‍යතාව සහ රහස්පදය
 plugin.jabberaccregwizz.CSERVER=Server
 plugin.jabberaccregwizz.SERVER=Server එකට සම්බන්ධවන්න
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=ක්‍රියාත්මකව තබාගැනීම සක්‍රීය කරන්න
@@ -695,10 +618,7 @@ plugin.jabberaccregwizz.SERVER_COLUMN=Server
 plugin.jabberaccregwizz.COMMENT_COLUMN=සටහන
 plugin.jabberaccregwizz.RESOURCE=සම්පත
 plugin.jabberaccregwizz.PRIORITY=ප්‍රමුඛතාව
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP දෝශයක්
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=හඳුනානොගත් XMPP දෝශයක්. server නාමය නිවැරදිදැයි පරීක්ෂා කරන්න.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=server එකෙහි සම්මත සැකසුම් අභිබවා යන්න
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=වැඩිදුර සැකසුම්
 plugin.jabberaccregwizz.USE_ICE=ICE පාවිච්චි කරන්න
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=STUN/TURN servers ස්වයංක්‍රීයව හඳුනාගන්න
 plugin.jabberaccregwizz.SUPPORT_TURN=TURN සහාය
@@ -711,31 +631,14 @@ plugin.jabberaccregwizz.NO_STUN_USERNAME=ඉදිරියට යෑම සඳ�
 plugin.jabberaccregwizz.STUN_ALREADY_EXIST=ඔබ සඳහන් කළ STUN server එක දැනටමත් පවතී.
 plugin.jabberaccregwizz.JID_ADDRESS=IP ලිපිනය
 plugin.jabberaccregwizz.EXISTING_ACCOUNT=දැනටමත් පවතින SIP ගිණුමක්
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=රහස්පදය තහවුරු කරන්න
 plugin.jabberaccregwizz.ENCODINGS=කේතකයන් (&E):
 plugin.jabberaccregwizz.AUDIO=ශ්‍රව්‍ය
 plugin.jabberaccregwizz.VIDEO=දෘශ්‍ය
 plugin.jabberaccregwizz.RESET=නැවත පිහිටුවන්න
 
-# mailbox
-plugin.mailbox.OUTGOING=යැවෙන පණිවිඩය:
-plugin.mailbox.INCOMING=ලැබෙන පණිවිඩ:
-plugin.mailbox.WAIT_TIME=ඇමතුම voicemail වෙත යැවීමට රැඳී සිටිය යුතු කාලය
-plugin.mailbox.MAX_MESSAGE_TIME=උපරිම පණිවිඩ කාලය
-plugin.mailbox.CONFIRM=තහවුරු කරන්න
-plugin.mailbox.DEFAULTS=සම්මත සැකසුම්
-plugin.mailbox.MAILBOX=තැපැල් පෙට්ටිය
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=එම්.එස්.එන්. (MSN)
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=MSN සේවා සඳහා සම්බන්ධවීමට සහ එමගින් කතාබහ කිරීමට අදාල ප්‍රොටෝකෝලය.
-plugin.msnaccregwizz.USERNAME=විද්‍යුත් තැපැල් ලිපිනය:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=පරිශීලක නාමය සහ රහස්පදය
-
 # plugin manager
 plugin.pluginmanager.INSTALL=ස්ථාපනය කරන්න
 plugin.pluginmanager.UNINSTALL=අස්ථාපනය කරන්න
-plugin.pluginmanager.UPDATE=යාවත්කාලීන
 plugin.pluginmanager.PLUGINS=ප්ලග්-ඉන්
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=ගොනුව තෝරන්න
@@ -759,7 +662,6 @@ plugin.sipaccregwizz.SERVER_PORT=Server දොරටුව
 plugin.sipaccregwizz.PROXY=ප්‍රොක්සි
 plugin.sipaccregwizz.PROXY_PORT=ප්‍රොක්සි දොරටුව
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=ප්‍රවාහන ආකාරය
-plugin.sipaccregwizz.ADVANCED_OPTIONS=වැඩිදුර සැකසුම්
 plugin.sipaccregwizz.PROXY_OPTIONS=ප්‍රොක්සි සැකසුම්
 plugin.sipaccregwizz.PROXY_AUTO=ප්‍රොක්සි ස්වයංක්‍රීයව සකසන්න
 plugin.sipaccregwizz.ENABLE_PRESENCE=පැවැත්ම සක්‍රීය කරන්න (සරල)
@@ -771,8 +673,6 @@ plugin.sipaccregwizz.KEEP_ALIVE=සජීවීව තබාගැනීම
 plugin.sipaccregwizz.KEEP_ALIVE_METHOD=සජීවීව තබාගැනීමේ ක්‍රමය
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=සජීවී පරාසය
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=තත්පර 1 සහ 3600 අතර
-plugin.sipaccregwizz.REGISTER=ලියාපදිංචිය
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=server එකෙහි සම්මත සැකසුම් අබිභවා යන්න
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=ඇමතුම් කේතනය කිරීමේ සහාය
 plugin.sipaccregwizz.AUTH_NAME=බලයලත් නාමය
 plugin.sipaccregwizz.DISPLAY_NAME=පෙන්වන නම
@@ -783,6 +683,7 @@ plugin.sipaccregwizz.CLIST_TYPE=ගිණුම් වර්ගය
 plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS=SIP ගිණුම් දත්ත යොදාගන්න
 plugin.sipaccregwizz.XCAP_USER=පරිශීලක
 plugin.sipaccregwizz.XCAP_PASSWORD=රහස්පදය
+#used from SecurityPanel
 
 # skin manager
 plugin.skinmanager.SKINS=තේමාව
@@ -790,15 +691,6 @@ plugin.skinmanager.DEFAULT_SKIN=සම්මත තේමාව
 plugin.skinmanager.ADD_NEW_SKIN=නව තේමාවක් එකතු කරන්න...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=යෙදුමේ සම්මත තේමාව.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=SSH හරහා දුරස්ථ පරිගණය සම්බන්ධ කිරීම සඳහාවූ ප්‍රොටෝකෝලයකි.
-plugin.sshaccregwizz.USERNAME=ගිණුම් අනන්‍යතාව:
-plugin.sshaccregwizz.IDENTITY_FILE=අනන්‍යතා ගොනුව:
-plugin.sshaccregwizz.KNOWN_HOSTS=දන්නා සත්කාරකයන්:
-plugin.sshaccregwizz.OPTIONAL=අතිරේක
-plugin.sshaccregwizz.ACCOUNT_DETAILS=ගිණුම් විස්තර
-
 # status update
 plugin.autoaway.AUTO_STATUS=ස්වයංක්‍රීය බැහැරවීම
 plugin.autoaway.ENABLE_CHANGE_STATUS=බැහැරව සිටිනවිට තත්වය වෙනස්කරන්න
@@ -843,21 +735,6 @@ plugin.whiteboard.DESELECT=නොතෝරන්න
 plugin.whiteboard.DELETE=මකන්න
 plugin.whiteboard.PROPERTIES=තොරතුරු
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=යාහූ සේවාවන් අතර සම්බන්ධ වීමට සහ කතාබහ කිරීමට අදාළ ප්‍රොටෝකෝලය.
-plugin.yahooaccregwizz.USERNAME=පරිශීලක නාමය:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=අනන්‍යතාව සහ රහස්පදය
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=සීරෝ-කන්ෆ් (Zeroconf)
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=සීරෝ-කන්ෆ් (Zeroconf-Bonjour) සේවා ප්‍රොටෝකෝලය.
-plugin.zeroaccregwizz.FIRST_NAME=මුල් නම:
-plugin.zeroaccregwizz.LAST_NAME=අවසාන නම:
-plugin.zeroaccregwizz.EMAIL=විද්‍යුත් තැපෑල:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Bonjour සබඳතා මතක තබා ගන්න
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=අනන්‍යතාව සහ රහස්පදය
-plugin.zeroaccregwizz.USERID=පරිශීලක නාමය
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=ගූගල් කතා ප්‍රොටෝකෝලය
 plugin.googletalkaccregwizz.USERNAME=පරිශීලක නාමය
@@ -870,25 +747,18 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org සන්නිවේද�
 plugin.iptelaccregwizz.USERNAME=පරිශීලක නාමය
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=iptel.org හි ලියාපදිංචි වන්න
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=සිප්2සිප් (sip2sip.info)
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=අන්තර්ජාල ඇමතුම් සහ කතාබහ
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=පරිශීලක නාමය
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=රහස්පදය නැවත ඇතුලත් කරන්න
 plugin.sip2sipaccregwizz.EMAIL=විද්‍යුත් තැපෑල
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=සේවා සහාය සඳහා <br>http://wiki.sip2sip.info වෙත යන්න
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>මගහැරුණු ඇමතුම්, පටිගතකළ පණිවිඩ යැවීමට සහ අස්ථාන ගතවූ රහස්පදය <br>ආපසු ලබාගැනීමට විද්‍යුත් තැපැල් ලිපිනය යොදාගැනේ</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>සේවා සහාය සඳහා <a href=''>http://wiki.sip2sip.info</a> වෙත යන්න</html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=දැනට පවතින සිප්2සිප් ගිණුමක්
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=නව සිප්2සිප් ගිණුමක් සාදන්න
-
-# ippi accregwizz
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=සේවා සහාය සඳහා <br>http://wiki.sip2sip.info වෙත යන්න
 plugin.ippiaccregwizz.INFO_NOTE=<html>සේවා සහාය සඳහා <a href=''>http://wiki.sip2sip.info</a> වෙත යන්න</html>
 plugin.ippiaccregwizz.EXISTING_ACCOUNT=දැනටමත් පවතින SIP ගිණුමක්
 plugin.ippiaccregwizz.CREATE_ACCOUNT=SIP ගිණුමක් සාදන්න
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=කතාබහ කවුලුව වැසීම
 plugin.keybindings.CHAT_COPY=පිටපත් කිරීම
 plugin.keybindings.CHAT_CUT=කැපීම
@@ -904,6 +774,7 @@ plugin.keybindings.OPEN_HISTORY=අතීතය විවෘත කිරීම
 plugin.keybindings.OPEN_SMILIES=සිනා-මුහුණු
 plugin.keybindings.globalchooser.SHORTCUT_NAME=නම
 plugin.keybindings.PLUGIN_NAME=යතුරුපුවරු කෙටි මං
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=කතාබහ
 
 # Notification Configuration Form
@@ -918,6 +789,7 @@ plugin.notificationconfig.EXEC_PROG=වැඩසටහන ක්‍රියා�
 plugin.notificationconfig.DISPLAY_POPUP=මතුවන කවුලුවක පණිවිඩය පෙන්වන්න
 plugin.notificationconfig.POPUP_NOTIF_HANDLER=නිවේදන වර්ගය:
 plugin.notificationconfig.tableheader.EXECUTE=වැඩසටහන ක්‍රියාත්මක කරන්න:
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingMessage=ලැබෙන පණිවිඩ:
 plugin.notificationconfig.event.HangUp=විසන්ධි කරන්න
 
@@ -968,6 +840,7 @@ impl.media.configform.VIDEO_RESET=සම්මත සැකසුම් ප්�
 impl.neomedia.configform.AUDIO=ශ්‍රව්‍ය
 impl.neomedia.configform.VIDEO=දෘශ්‍ය
 
+#in JNIEncoder
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=ZRTP
 
 # The callrecordingconfig plugin was never really committed into trunk and its
@@ -991,7 +864,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=පවත්නා රහ�
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=නව රහස්පදය :
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=නැවත ඇතුලත් කරන්න:
 plugin.securityconfig.masterpassword.MP_TITLE=ප්‍රධාන රහස්පදය
-plugin.securityconfig.masterpassword.MP_NOT_SET=(සකසා නොමැත)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=පවතින රහස්පදය ඔබ ඇතුලත් කර නොමැත. නැවත උත්සාහ කරන්න.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=ප්‍රධාන රහස්පදය වැරදියි!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=රහස්පදය වෙනස්කිරීම අසාර්ථක විය
@@ -1006,7 +878,6 @@ plugin.securityconfig.masterpassword.COL_NAME=නම
 plugin.securityconfig.masterpassword.COL_PASSWORD=රහස්පදය
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(නොදනී)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(විකේතනය කළ නොහැක)
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=ඉවත්කරන්න
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=සියල්ල ඉවත්කරන්න
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=සියලු රහස්පද ඉවත්කිරීමට අවශ්‍යබව තහවුරු කරන්න
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=සියලු රහස්පද ඉවත්කිරීම
@@ -1065,7 +936,6 @@ plugin.globalproxy.PROXY_PORT=ප්‍රොක්සි දොරටුව
 plugin.globalproxy.PROXY_USERNAME=ප්‍රොක්සි පරිශීලක නාමය
 plugin.globalproxy.PROXY_PASSWORD=ප්‍රොක්සි රහස්පදය
 plugin.globalproxy.DESCRIPTION=මෙතැන් පටන් ඔබ ඕනෑම ජාලයකට සම්බන්ධවීමේදී  මෙම ප්‍රොක්සි සැකසුම් භාවිතා කෙ‍රෙනු ඇත. \nප්‍රොක්සි සහාය දැනට පරීක්ෂණ මට්ටමේ පවතින අතර එය ක්‍රියාත්මක වන්නේ සමහර ප්‍රොටෝකෝල සමග පමණි. වැඩි විස්තර සඳහා පහත වගුව බලන්න.
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>යාහූ!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>එම්.එස්.එන්.</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>ජැබ'</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -1100,7 +970,6 @@ plugin.dnsconfig.lblBackupPort.text=තොටුපළ
 net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=නොසලකා හරින්න (&I)
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=සැකසුම් (E)
 plugin.spellcheck.UNINSTALL_DICTIONARY=අස්ථාපනය කරන්න
 
 
diff --git a/resources/languages/resources_sk.properties b/resources/languages/resources_sk.properties
index 70ccefb..72e4f3c 100644
--- a/resources/languages/resources_sk.properties
+++ b/resources/languages/resources_sk.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Ja
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Sprievodca registráciou účtu
 service.gui.ACCOUNTS=Účty
 service.gui.ADD=&Pridať
-service.gui.ADD_ACCOUNT=Pridať účet
 service.gui.ADD_CONTACT=&Pridať kontakt
 service.gui.ADD_AUTHORIZED_CONTACT=Pridať {0} do zoznamu kontaktov
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Pridať kontakt do zoznamu kontaktov
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Chyba pri pridávaní kontaktu
 service.gui.ADD_CONTACT_EXIST_ERROR=Kontakt {0} už existuje vo vašom zozname kontaktov.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Server neodpovedal na požiadávku pridania kontaktu: {0}
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Nepodarilo sa pridať kontakt s ID: {0}. Nepodporovaná operácia.
-service.gui.ADD_CONTACT_IDENTIFIER=Do pola nižšie zadajte identifikátor kontaktu, ktorý chcete pridať.
-service.gui.ADD_CONTACT_WIZARD=Sprievodca pridaním kontaktu
 service.gui.ADD_CONTACT_NOT_CONNECTED=Na pridanie kontaktu musíte byť pripojený. Prosím prihláste sa na zvolenú službu a skúste znova.
 service.gui.ADD_GROUP_LOCAL_ERROR=Nepodarilo sa pridať skupinu: {0}. Problém nastal počas lokálnej vstup/výstup operácie.
 service.gui.ADD_GROUP_EXIST_ERROR=Skupina {0} už existuje vo vašom zozname kontaktov. Zvoľte iný názov.
 service.gui.ADD_GROUP_NET_ERROR=Nepodarilo sa pridať skupinu: {0}. Problém nastal kvôli chybe v sieti. Prosím skontrolujte sieťové pripojenie a skúste znova.
 service.gui.ADD_GROUP_ERROR=Nepodarilo sa pridať skupinu: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Názov skupiny musí byť zadaný.
-service.gui.ADD_GROUP=Vytvoriť skupinu
-service.gui.ADD_SUBCONTACT=&Pridať subkontakt
 service.gui.ADDRESS=Adresa
 service.gui.ADMINISTRATOR=administrátor
 service.gui.ADVANCED=&Pokročilé
-service.gui.ALL=&Všetko
 service.gui.ALL_CONTACTS=&Všetky kontakty
 service.gui.ALTERNATE_ADDRESS=Alternatívna adresa
 service.gui.APPLY=&Použiť
@@ -65,7 +70,6 @@ service.gui.AT=o
 service.gui.AUTHORIZE=&Autorizovať
 service.gui.AUTHORIZATION_ACCEPTED=kontakt prijal vašu žiadosť o autorizáciu.
 service.gui.AUTHENTICATION_FAILED=Nepodarilo sa prihlásiť pre {0}. Zadali ste nesprávne heslo.
-service.gui.AUTHENTICATION_REQUESTED=Požadované prihlásenie
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Server {0} vyžaduje prihlásenie.
 service.gui.AUTHENTICATION_REJECTED=kontakt zamietol vašu žiadosť o autorizáciu.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} prihlásenie
@@ -107,26 +111,24 @@ service.gui.CHANGE_NICKNAME_LABEL=Do políčka nižšie zadajte novú prezívku.
 service.gui.CHANGE_NICKNAME_ERROR=Chyba pri zmene prezývky
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Prezývka už existuje
 service.gui.CHANGE_VIDEO_QUALITY=Zmeniť kvalitu vzdialeného videa
-service.gui.CHAT_CONFERENCE_LABEL=Konferencia
 service.gui.CHAT_ROOM_ALREADY_JOINED=K miestnosti {0} ste už pripojený.
 service.gui.CHAT_ROOM_CONFIGURATION=Nastavenia miestnosti {0}
 service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Nepodarilo sa získať formulár nastavenia miestnosti {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Nebolo možné získať konfiguračný formulár pre {0} chat miestnosť. Iba majitelia chat miestnosti môžu vidieť a zmeniť konfiguračný formulár.
 service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Chyba pri odosielaní formuláru nastavenia miestnosti {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_TITLE=Uprav členský zoznam
 service.gui.CHAT_ROOM_USER_JOINED=sa pripojil(a) {0}
 service.gui.CHAT_ROOM_USER_LEFT=opustil(a) {0}
 service.gui.CHAT_ROOM_USER_KICKED=bol(a) vykopnutý z {0}
 service.gui.CHAT_ROOM_USER_QUIT=sa odpojil(a) {0}
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Vymaže vybranú miestnosť zo zoznamu uložených miestností.
 service.gui.CHAT_ROOM_NAME=Názov miestnosti
 service.gui.CLEAR_CUSTOM_MESSAGES=Vymazať vlastné správy
 service.gui.ROOM_NAME=Miestnosť
-service.gui.AUTOJOIN=Automaticky pripojiť
 service.gui.CHANGE_PASSWORD=Zmeniť heslo
 service.gui.CHAT_ROOM_NAME_INFO=Do poľa nižšie zadajte názov miestnosti, ktorú chcete vytvoriť.
 service.gui.CHAT_ROOM_NOT_EXIST=Miestnosť {0} nebola nájdená na serveri {1}. Prosím skontrolujte názov miestnosti.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Musíte byť prihlásený aby ste sa mohli pripojiť k miestnosti {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Musíte byť prihlásený aby ste mohli opustiť miestnosť.
-service.gui.CHAT_ROOM_NOT_JOINED=Musíte byť pripojený k miestnosti aby ste s ňou mohli vykonávať ďalšie operácie.
 service.gui.CHAT_ROOM_OPTIONS=Možnosti miestnosti
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Na pripojenie k miestnosti {0} je potrebná registrácia.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Miestnosť {0} vyžaduje heslo.
@@ -140,21 +142,17 @@ service.gui.CLEAR=Vymazať
 service.gui.CLOSE=&Zavrieť
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Pred menej než dvoma sekundami ste prijali novú správu. Naozaj chcete zavrieť tento chat?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Prebieha prenos súborov. Chcete ich zrušiť?
-service.gui.CONFIRM=Potvrdiť
 service.gui.CONNECTED_STATUS=Pripojený
 service.gui.CONNECTING=Pripája sa...
 service.gui.CONNECTING_STATUS=Pripája sa
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Pripája sa*
 service.gui.CONNECTION=Pripojenie
-service.gui.CONNECTION_FAILED_MSG=Pripojenie k serveru zlyhalo: Užívateľské meno: {0}, Názov serveru: {1}. Skontrolujte, prosím, svoje nastavenia alebo sa obráťte na správcu siete pre ďalšie informácie.
 service.gui.CONNECTION_EXPIRED_MSG=Momentálne ste odpojení od serveru {0}.
 service.gui.CONTACT_NAME=ID alebo číslo
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Zvolený {0} kontakt nepodporuje telefonovanie.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Zvolený {0} kontakt nepodporuje konferenčný chat.
 service.gui.CONTACT_PAUSED_TYPING={0} prestal(a) písať...
 service.gui.CONTACT_TYPING={0} píše správu...
 service.gui.CONTACT_INFO=&Informácie o kontakte
-service.gui.CONTACTLIST=Zoznam kontaktov
 service.gui.CONTACTS=Kontakty
 service.gui.COPY=&Kopírovať
 service.gui.COPY_LINK=Kopírovať &odkaz
@@ -163,13 +161,10 @@ service.gui.CREATE_CHAT_ROOM=&Vytvoriť miestnosť...
 service.gui.CREATE_CHAT_ROOM_ERROR=Nepodarilo sa vytvoriť miestnosť {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Sprievodca vytváraním miestnosti
 service.gui.CREATE_CONFERENCE_CALL=&Vytvoriť konferenčný hovor...
-service.gui.CREATE_CONFERENCE_CHAT=&Vytvoriť konferenčný chat...
 service.gui.CREATE_GROUP=&Vytvoriť skupinu...
 service.gui.CREATE_GROUP_NAME=Do poľa nižšie zadajte názov skupiny, ktorú chcete vytvoriť.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Váš zoznam kontaktov neobsahuje žiadnu skupinu. Prosím vytvorte najprv skupinu (Súbor/Vytvoriť skupinu).
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Tento kontakt nepodporuje informácie z webu
 service.gui.CUT=&Vystrihnúť
-service.gui.DATE=Dátum
 service.gui.DELETE=Vymazať
 service.gui.DENY=&Zamietnuť
 service.gui.DESKTOP_SHARING_WARNING=<b>Naozaj chcete zdielať obrazovku?</b> <br> Stlačením OK umožníte všetkým účastníkom hovoru vidieť vašu obrazovku.
@@ -179,7 +174,6 @@ service.gui.DISCONNECTED_STATUS=Odpojený
 service.gui.DND_STATUS=Nerušiť
 service.gui.DO_NOT_ASK_AGAIN=Nepýtať sa znovu
 service.gui.DO_NOT_SHOW_AGAIN=Túto správu už nezobrazovať
-service.gui.DOWNLOAD_NOW=&Stiahnúť teraz
 service.gui.DRAG_FOR_SHARING=Potiahnite sem to čo chcete zdielať...
 service.gui.DURATION=trvanie
 service.gui.EDIT=&Upraviť
@@ -196,7 +190,6 @@ service.gui.ERROR_WAS=Chyba bola: {0}
 service.gui.ESTIMATED_TIME=Predpokladaný čas:
 service.gui.EVENTS=Udalosti
 service.gui.EXIT=&Ukončiť
-service.gui.EXTENDED_CRITERIA=Rozšírené hľadanie
 service.gui.GENERAL=Všeobecný
 service.gui.GENERAL_ERROR=Všeobecná chyba
 service.gui.GROUP_NAME=Názov skupiny
@@ -252,7 +245,6 @@ service.gui.HIDE_MAIN_WINDOW=<DIV>Kliknutím na tlačidlo X nevypne aplikáciu,
 service.gui.HISTORY=&História
 service.gui.HISTORY_CONTACT=História - {0}
 service.gui.HOME=Domov
-service.gui.HOUR=Hodina
 service.gui.IDENTIFIER=Identifikátor
 service.gui.IGNORE=Ignorovať
 service.gui.INSERT_SMILEY=Vložiť smajlík
@@ -271,9 +263,6 @@ service.gui.INVITE_CONTACT_TO_CALL=Pozvať kontakty na hovor
 service.gui.INVITE_REASON=Dôvod pozvania
 service.gui.IS_CALLING=volá...
 service.gui.IS_NOW={0} je teraz {1}
-service.gui.JITSI_WARNING=SIP Communicator bol nedávno premenovaný na Jitsi.<br/>Ak chcete aby vaša verzia ostala aktuálna, stiahnite si Jitsi teraz.<br/><br/>Ospravedlňujeme sa za všetky nepríjemnosti, ktoré vám to mohlo spôsobiť.<br/><br/>Jitsi Dev Team
-service.gui.JITSI_WARNING_TITLE=SIP Communicator sa premenoval na Jitsi
-service.gui.CLOSE_CHAT_ROOM_DIALOG=&Zatvoriť
 service.gui.JOIN_CHAT_ROOM_TITLE=Pripojiť sa do miestnosti
 service.gui.JOIN_CHAT_ROOM_NAME=Zadajte prosím názov miestnosti, do ktorej sa chcete pripojiť.
 service.gui.JOIN_CHAT_ROOM_WIZARD=Sprievodca pripojením k miestnosti
@@ -293,7 +282,7 @@ service.gui.NAME=Meno
 service.gui.NEW_ACCOUNT=Pridať nový účet
 service.gui.NO=Nie
 service.gui.OPEN=Otvoriť
-service.gui.OPTIONS=Voliteľné
+service.gui.OPTIONS=Nastavenia
 service.gui.chat.role.ADMINISTRATOR=administrátor
 service.gui.PASSWORD=Heslo
 service.gui.PASSWORD_CHANGE_FAILURE=Zmena hesla bola neúspešná
@@ -306,7 +295,7 @@ service.gui.RENAME_CONTACT=Premenovať kontakt
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Kliknite na tlačidlo na zobrazenie všetkých chat miestností vo vybranom servery. Následne vyberte tú, do ktorej sa chcete zapojiť a stlačte tlačidlo pripojiť.
 service.gui.SECURITY=Bezpečnosť
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Vyberte chat miestnosť z listu a stlačte ok pre jej pridanie.
-service.gui.SETTINGS=Voliteľné
+service.gui.SETTINGS=&Nastavenia
 service.gui.SHOW=Zobraz
 service.gui.SHOW_CONTACT_LIST_TOOL_TIP=Kliknite tu pre vypnutie historie a zobrazenie vášho kontaktu zoznamov.
 service.gui.SHOW_MORE=ukázať viac...
@@ -317,7 +306,6 @@ service.gui.YES=Áno
 service.gui.NEW=Nový
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Zobraziť/skryť lokálne video
 service.gui.SHOW_HIDE_PEERS_TOOL_TIP=Zobraziť/skryť účastníkov rozhovoru
-service.gui.UPDATE=Aktualizovať
 service.gui.VIDEO_PHONE=Video
 
 
@@ -325,13 +313,16 @@ service.gui.VIDEO_PHONE=Video
 service.gui.callinfo.MEDIA_STREAM_RTP=RTP
 service.gui.callinfo.MEDIA_STREAM_SRTP=RTP
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_PUB_KEY=Verejný klúč:
 
 service.gui.AUTO_ANSWER_LABEL=Automatická odpoveď
 service.gui.AUTO_ANSWER_VIDEO=Video
 
-service.gui.security.NO_VIDEO=HD video
-service.gui.security.COMPARE_WITH_PARTNER=Porovnajte údaje s partnerom a kliknite na "zámok" pre potvrdenie.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Porovnajte s partnerom: {0}
 
@@ -340,9 +331,6 @@ service.gui.avatar.imagepicker.CANCEL=Zrušiť
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -352,21 +340,21 @@ service.gui.avatar.imagepicker.CANCEL=Zrušiť
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=ICE nastavenie
 impl.ldap.GENERAL=Všeobecný
-impl.ldap.NEW=Nový
 impl.ldap.EDIT=upraviť
-impl.ldap.REMOVE=Odstrániť
 impl.ldap.ENABLED=Povoliť
 impl.ldap.CANCEL=Zrušiť
 impl.ldap.SERVER_PORT=Port
 impl.ldap.PASSWORD=Heslo
 impl.ldap.MAIL_FIELD_EXAMPLE=E-mail:
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
-impl.googlecontacts.NEW=Nový
 impl.googlecontacts.EDIT=upraviť
-impl.googlecontacts.REMOVE=Odstrániť
 impl.googlecontacts.ENABLED=Povoliť
 impl.googlecontacts.CANCEL=Zrušiť
 impl.googlecontacts.PASSWORD=Heslo
@@ -391,19 +379,16 @@ plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=V prípade že nemáte AIM účet
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=&O programe
 
-# Dict protocol
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Informácie o RSS účte
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.USERNAME=Užívateľské meno:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Používateľské meno a heslo
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Zapnúť automaticky {0} pri štarte alebo reštarte
 plugin.generalconfig.GROUP_CHAT_MESSAGES=Správy skupinových konverzácií v jednom okne
 plugin.generalconfig.LOG_HISTORY=Ukladaj históriu konverzácií
 plugin.generalconfig.HISTORY_SIZE=posledných správ v nových konverzáciách
+plugin.generalconfig.BRING_WINDOW_TO_FRONT=Preniesť okno s konverzáciou do popredia
 plugin.generalconfig.CHECK_FOR_UPDATES=Skontrolovať aktualizácie pri štarte
+plugin.generalconfig.LEAVE_CHATROOM_ON_WINDOW_CLOSE=Opusť chat miestnosti po zatvorení okna
+plugin.generalconfig.SHOW_RECENT_MESSAGES=Zobraz posledné konverzácie (závisí na histórii konverzácií)
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
 plugin.generalconfig.RESTORE=Obnoviť štandardné
 
@@ -417,32 +402,16 @@ plugin.ircaccregwizz.USERNAME_AND_PASSWORD=ID a heslo
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=SIP protokol
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID a heslo
 plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Vytvoriť voľný SIP účet
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Vaše heslá sa nezhodujú.
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Pokročilé nastavenia
 plugin.jabberaccregwizz.EXISTING_ACCOUNT=Existujúci SIP účet
 plugin.jabberaccregwizz.ALLOW_NON_SECURE=Povoliť nezabezpečené spojenia
 plugin.jabberaccregwizz.AUDIO=Zvuk
 plugin.jabberaccregwizz.VIDEO=Video
 
-# mailbox
-plugin.mailbox.OUTGOING=Odchádzajúca správa:
-plugin.mailbox.INCOMING=Prichádzajúce správy:
-plugin.mailbox.CONFIRM=Potvrdiť
-plugin.mailbox.DEFAULTS=Východzie
-plugin.mailbox.MAILBOX=Poštová schránka
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Protokol pre pripojenie k službe MSN.
-plugin.msnaccregwizz.USERNAME=E-mail:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID a heslo
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Inštalovať
 plugin.pluginmanager.UNINSTALL=Odinštalovať
-plugin.pluginmanager.UPDATE=Aktualizovať
 plugin.pluginmanager.URL=Url
 plugin.pluginmanager.CHOOSE_FILE=Vybrať súbor
 plugin.pluginmanager.SYSTEM=Systém
@@ -459,7 +428,6 @@ plugin.sipaccregwizz.PROTOCOL_NAME=SIP
 plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=SIP protokol
 plugin.sipaccregwizz.USERNAME_AND_PASSWORD=Používateľské meno a heslo
 plugin.sipaccregwizz.PROXY_PORT=Proxy port
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Pokročilé nastavenia
 plugin.sipaccregwizz.PROXY_OPTIONS=Nastavenia proxy
 plugin.sipaccregwizz.PROXY_AUTO=Nastaviť proxy automaticky
 plugin.sipaccregwizz.PRESENCE_OPTIONS=Nastavenia Prítomnosti
@@ -468,7 +436,6 @@ plugin.sipaccregwizz.KEEP_ALIVE_METHOD=Metóda pre udržiavanie spojenia
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=Interval udržiavania spojenia
 plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=Medzi 1 a 3600 sekundami
 plugin.sipaccregwizz.DTMF_METHOD=Metóda DTMF
-plugin.sipaccregwizz.REGISTER=REGISTER
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Povoliť podporu pre šifrovanie hovorov
 plugin.sipaccregwizz.AUTH_NAME=Meno pre autorizáciu
 plugin.sipaccregwizz.DISPLAY_NAME=Zobraziť meno
@@ -479,6 +446,7 @@ plugin.sipaccregwizz.CLIST_TYPE=Typ
 plugin.sipaccregwizz.XCAP_USER=Používateľ
 plugin.sipaccregwizz.XCAP_PASSWORD=Heslo
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Vaše heslá sa nezhodujú.
+#used from SecurityPanel
 
 # skin manager
 plugin.skinmanager.SKINS=Vzhľady
@@ -486,10 +454,6 @@ plugin.skinmanager.DEFAULT_SKIN=Štandardný vzhľad
 plugin.skinmanager.ADD_NEW_SKIN=Pridať nový vzhľad...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Predvolený vzhľad aplikácie.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.OPTIONAL=Voliteľné
-
 # status update
 plugin.autoaway.ENABLE_CHANGE_STATUS=Zmeniť status keď som preč
 
@@ -528,18 +492,6 @@ plugin.whiteboard.GRID=Mriežka
 plugin.whiteboard.DELETE=Vymazať
 plugin.whiteboard.PROPERTIES=Vlastnosti
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Protokol pre pripojenie k službe MSN.
-plugin.yahooaccregwizz.USERNAME=Užívateľské meno:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID a heslo
-
-# zero accregwizz
-plugin.zeroaccregwizz.FIRST_NAME=Krstné meno:
-plugin.zeroaccregwizz.LAST_NAME=Priezvisko:
-plugin.zeroaccregwizz.EMAIL=E-mail:
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID a heslo
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Google Talk protokol
@@ -550,16 +502,14 @@ plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE=Google Talk registrácia nového �
 # iptel accregwizz
 plugin.iptelaccregwizz.USERNAME=Užívatelské meno
 
-# sip2sip accregwizz
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Užívatelské meno
 plugin.sip2sipaccregwizz.EMAIL=E-mailová adresa
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Vytvoriť voľný SIP účet
-
-# ippi accregwizz
 plugin.ippiaccregwizz.EXISTING_ACCOUNT=Existujúci SIP účet
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Vytvoriť voľný SIP účet
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Zavrieť okno chatu
 plugin.keybindings.CHAT_COPY=Kopírovať
 plugin.keybindings.CHAT_CUT=Vystrihnúť
@@ -576,6 +526,7 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Meno
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primárna klávesová skratka
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Sekundárna klávesová skratka
 plugin.keybindings.globalchooser.PRESS_BTN=Stlačte kláves pre nastavenie skratky
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 plugin.keybindings.MAIN=Hlavný
 
@@ -594,6 +545,7 @@ plugin.notificationconfig.BROWSE_PROGRAM=Vybrať program
 plugin.notificationconfig.tableheader.ENABLE=Povoliť alebo zakázať túto funkciu
 plugin.notificationconfig.tableheader.EXECUTE=Spustiť program
 plugin.notificationconfig.tableheader.DESCRIPTION=Opis udalosti
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Prichádzajúci hovor
 plugin.notificationconfig.event.SecurityMessage=Bezpečnostná správa
 plugin.notificationconfig.event.IncomingFile=Prichádzajúci súbor
@@ -642,6 +594,7 @@ impl.media.configform.VIDEO_RESET=Obnoviť východzie nastavenia
 impl.neomedia.configform.AUDIO=Zvuk
 impl.neomedia.configform.VIDEO=Video
 
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.main=Hlavný
 impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTP
 
@@ -662,7 +615,6 @@ plugin.securityconfig.masterpassword.SAVED_PASSWORDS=Uložené heslá...
 plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Súčastné heslo:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Zadajte nové heslo:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Znovu zadajte nové heslo:
-plugin.securityconfig.masterpassword.MP_NOT_SET=(nenastavené)
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Zmena hesla bola neúspešná
 plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS=Zmena hesla bola úspešná
 plugin.securityconfig.masterpassword.MP_REMOVE_FAILURE=Odstránenie hesla bolo neúspešné
@@ -673,7 +625,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Heslo
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(neznámy)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(nie je možné dešifrovať)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Uložené heslá
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Odstrániť
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Odstrániť všetky
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Ste si istý, že chcete odstrániť všetky heslá?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Zmazať všetky heslá
@@ -721,7 +672,6 @@ plugin.globalproxy.PROXY_PORT=Port proxy
 plugin.globalproxy.PROXY_USERNAME=Používateľské meno pre proxy
 plugin.globalproxy.PROXY_PASSWORD=Heslo pre proxy
 plugin.globalproxy.DESCRIPTION={0} bude používať nastavenia serveru proxy uvedenné vyššie pre všetky siete ku ktorým sa od teraz pripojíte. \nPodpora proxy je momentálne experimentálna a funguje iba s niektorými protokolmi. Pre detaily viď tabuľku dole:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -768,8 +718,6 @@ net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult
 #plugin spellcheck
 plugin.spellcheck.TITLE=Pravopis a gramatika
 plugin.spellcheck.MENU=Ukáž pravopis a gramatiku
-plugin.spellcheck.LANG=Jazyk
-plugin.spellcheck.EDIT_PERSONAL_DICT=Upraviť
 plugin.spellcheck.ENABLE_SPELL_CHECK=Zapnúť kontrolu pravopisu
 plugin.spellcheck.dialog.FIND=Nájsť ďalšie
 plugin.spellcheck.dialog.REPLACE=Nahradiť   
diff --git a/resources/languages/resources_sl.properties b/resources/languages/resources_sl.properties
index b19335e..5f9f079 100644
--- a/resources/languages/resources_sl.properties
+++ b/resources/languages/resources_sl.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -31,17 +42,254 @@ service.gui.ACCOUNT=Račun
 service.gui.ACCOUNT_ME=Jaz
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Čarovnik za ustvarjanje računov
 service.gui.ACCOUNTS=Računi
-service.gui.ADD_ACCOUNT=Dodaj račun
+service.gui.ADD=&Dodaj
+service.gui.ADD_CONTACT=&Dodaj stik
 service.gui.ADD_AUTHORIZED_CONTACT=Dodaj osebo {0} na seznam stikov
+service.gui.ADD_CONTACT_TO_CONTACTLIST=Dodaj stik na seznam stikov
 service.gui.ADD_CONTACT_TO=&Dodaj stik v
+service.gui.ADD_CONTACT_ERROR=Stika {0} ni bilo mogoče dodati.
 service.gui.ADD_CONTACT_ERROR_TITLE=Napaka stika
+service.gui.ADD_CONTACT_EXIST_ERROR=Stik {0} na seznamu stikov že obstaja.
+service.gui.ADD_CONTACT_NETWORK_ERROR=Strežnik se ne odziva na zahtevo dodajanja stika {0}.
+service.gui.ADD_CONTACT_NOT_SUPPORTED=Dodajanje stika {0} je spodletelo. Dejanje ni podprto.
+service.gui.ADD_CONTACT_NOT_CONNECTED=Za dodajanje stikov morate biti povezani. Prosimo, vpišite se z izbranim ponudnikom in poskusite znova.
+service.gui.ADD_GROUP_LOCAL_ERROR=Ni bilo mogoče dodati skupine: {0}. Problem se je pojavil med lokalno V/I operacijo.
+service.gui.ADD_GROUP_EXIST_ERROR=Skupina {0} na seznamu stikov že obstaja. Prosimo, izberite drugo ime.
+service.gui.ADD_GROUP_NET_ERROR=Ni bilo mogoče dodati skupine: {0}. Problem se je pojavil zaradi omrežne napake. Prosimo, preverite svojo omrežno povezavo in poskusite znova.
+service.gui.ADD_GROUP_ERROR=Ni bilo mogoče dodati skupine: {0}.
+service.gui.ADD_GROUP_EMPTY_NAME=Ime skupine ne more biti prazno.
+service.gui.ADDRESS=Naslov
 service.gui.ADMINISTRATOR=Skrbnik
 service.gui.ADVANCED=N&apredno
+service.gui.ALL_CONTACTS=&Vsi stiki
+service.gui.ALTERNATE_ADDRESS=Pomožni naslov
+service.gui.APPLY=&Uporabi
 service.gui.ARE_CALLING={0} kliče...
-
-
-
-
+service.gui.ARE_NOW=Sedaj ste {0}
+service.gui.AT=pri
+service.gui.AUTHORIZE=&Pooblasti
+service.gui.AUTHORIZATION_ACCEPTED={0} je sprejel vašo prošnjo za pooblastitev.
+service.gui.AUTHENTICATION_FAILED=Overitev za {0} ni uspela. Geslo, ki ste ga vpisali, ni veljavno.
+service.gui.AUTHENTICATION_REQUESTED_SERVER=Strežnik {0} je zahteval vašo overitev.
+service.gui.AUTHENTICATION_REJECTED={0} je zavrnil vašo prošnjo za overitev.
+service.gui.AUTHENTICATION_WINDOW_TITLE={0} overitev
+service.gui.AUTHORIZATION_REQUESTED=Zahtevana overitev
+service.gui.AUTHORIZATION_REQUESTED_INFO=Stik {0} zahteva vašo overitev.
+service.gui.AUTHORIZATION_RESPONSE=Odgovor overitve
+service.gui.AWAY_STATUS=Odsoten
+service.gui.EXTENDED_AWAY_STATUS=Odsoten - daljše
+service.gui.BAN=Izobčenje ni uspelo
+service.gui.BANNED=izobčen
+service.gui.BAN_FAILED=Izobčenje ni uspelo
+service.gui.BAN_FAILED_GENERAL_ERROR=Izobčenje ni uspelo {0}. Prišlo je do splošne napake.
+service.gui.BAN_FAILED_NOT_ALLOWED=Izobčenje ni uspelo {0}. Ni mogoče izobčiti lastnika ali moderatorja klepetalnice.
+service.gui.BAN_FAILED_NOT_ENOUGH_PERMISSIONS=Izobčenje ni uspelo {0}. Nimate te pravice.
+service.gui.BRB_MESSAGE=Trenutno me ni, a se bom vrnil kasneje.
+service.gui.BROWSE=Brskaj
+service.gui.BUSY_MESSAGE=Oprostite, trenutno sem zaposlen.
+service.gui.BUSY_STATUS=Zaposlen
+service.gui.CALL=Pokliči
+service.gui.CALL_CONTACT=Pokliči stik
+service.gui.CALL_FAILED=Klic ni uspel
+service.gui.CALL_HISTORY_TOOL_TIP=Klikni tukaj za prikaz zgodovine klicev
+service.gui.CALL_HISTORY_GROUP_NAME=Zgodovina klicev
+service.gui.CALL_VIA=Pokliči skozi
+service.gui.CALL_NAME_OR_NUMBER=Pokliči stik ali številko
+service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=Ta klic podpira samo udeležence omrežja {0} in vašega računa {1}.  {2} ne vsebuje naslova za to omrežje ali račun.
+service.gui.CALL_WITH=Pokliči z/s
+service.gui.CALL_NO_AUDIO_DEVICE=Nastavili niste nobene zvočne naprave.
+service.gui.CALL_NO_AUDIO_CODEC=Noben zvočni kodek ni omogočen.
+service.gui.CALL_NO_DEVICE_CODECS_Q=Želite nadaljevati s klicem?
+service.gui.CANCEL=&Prekliči
+service.gui.CHAT=Klepet
+service.gui.CHANGE_FONT=Spremeni pisavo
+service.gui.CHANGE_ROOM_SUBJECT=Spremeni zadevo klepetalnice ...
+service.gui.CHANGE_ROOM_SUBJECT_LABEL=V spodnje polje lahko vpišete novo zadevo klepetalnice
+service.gui.CHANGE_NICK=Spremeni vzdevek
+service.gui.CHANGE_NICKNAME=Spremeni vzdevek...
+service.gui.CHANGE_NICKNAME_LABEL=Spodaj lahko vnesete nov vzdevek.
+service.gui.CHANGE_NICKNAME_ERROR=Napaka pri spreminjanju vzdevka
+service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Vzdevek že obstaja
+service.gui.CHANGE_VIDEO_QUALITY=Spremeni kvaliteto oddaljenega videa
+service.gui.CHAT_CONFERENCE_ITEM_LABEL=konferenca od {0}
+service.gui.CHAT_ROOM_ALREADY_JOINED=Klepetalnica {0} je že pridružena.
+service.gui.CHAT_ROOM_CONFIGURATION=nastavitve za klepetalnico {0}
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED=Ni bilo mogoče pridobiti obrazca za nastavitve klepetalnice {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_FORBIDDEN=Ni bilo mogoče pridobiti obrazca za nastavitve klepetalnice {0}. Samo lastniki klepetalnic lahko vidijo in spreminjajo nastavitveni obrazec.
+service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED=Prišlo je do napake pri pošiljanju nastavitvenega obrazca za klepetalnico {0}.
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_TITLE=Uredi spisek članov
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_DESCRIPTION=Člani so uporabniki izpisani v spisku na desni. Ko je klepetalnica "Samo za člane" se samo ti uporabniki lahko pridružijo.
+service.gui.CHAT_ROOM_USER_JOINED=se je pridružil {0}
+service.gui.CHAT_ROOM_USER_LEFT=je odšel {0}
+service.gui.CHAT_ROOM_USER_KICKED=ga je izobčil {0}
+service.gui.CHAT_ROOM_USER_QUIT=je končal {0}
+service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Pošiljanje sporočila je prepovedano (preklican glas)
+service.gui.CHAT_ROOM_NAME=Ime klepetalnice
+service.gui.CLEAR_CUSTOM_MESSAGES=Počisti sporočila po meti
+service.gui.ROOM_NAME=Klepetelnica
+service.gui.CHANGE_PASSWORD=Spremeni geslo
+service.gui.CHAT_ROOM_NAME_INFO=V spodnje polje vpišite ime klepetalnice, ki jo želite ustvariti.
+service.gui.CHAT_ROOM_NOT_EXIST=Klepetalnice {0} ni najti na strežniku {1}. Preverite, prosim, da ste ime napisali pravilno.
+service.gui.CHAT_ROOM_NOT_CONNECTED=Če se želite pridružiti klepetalnici {0} morate biti prijavljeni.
+service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Da zapustite klepetalnico morate biti prijavljeni.
+service.gui.CHAT_ROOM_OPTIONS=Možnosti kelpetalnice
+service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Klepetalnica {0} zahteva registracijo za pridružitev.
+service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Klepetalnica {0} zahteva geslo.
+service.gui.CHAT_ROOMS=Klepetalnice
+service.gui.CHAT_ROOM=Klepetelnica
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} je spremenil zadevo v {1}
+service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=Pogovor lahko nadaljujete v klepetalnici: {0}
+service.gui.CHAT_NICKNAME_CHANGE={0} je zdaj znan kot {1}
+service.gui.CHOOSE_CONTACT=Izberite stik
+service.gui.CHOOSE_NUMBER=Izberite številko
+service.gui.CHOOSE_ACCOUNT=Izberite prosim enega izmed računov na seznamu
+service.gui.CITY=Mesto
+service.gui.COUNTRY=Država
+service.gui.SHOW_MORE_TOOLTIP=Kliknite za več rezultatov
+service.gui.CLEAR=Počisti
+service.gui.CLOSE=&Zapri
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Pred manj kot 2 sekundama ste prejeli novo sporočilo. Ali res želite zapreti ta pogovor?
+service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Nekateri prenosi datotek so še aktivni. Ali jih res želite prekiniti?
+service.gui.CONNECTED_STATUS=Povezan
+service.gui.CONNECTING=Povezovanje ...
+service.gui.CONNECTING_STATUS=Povezovanje
+service.gui.CONNECTING_EARLY_MEDIA_STATUS=Povezovanje*
+service.gui.CONNECTION=Povezava
+service.gui.CONTACT_NAME=ID ali Številka
+service.gui.CONTACTS=Stiki
+service.gui.COPY=&Kopiraj
+service.gui.COPY_LINK=Kopiraj &povezavo
+service.gui.CREATE=&Ustvari
+servoce.gui.CREATE_CALL_FAILED=Klic ni uspel.
+service.gui.CREATE_CHAT_ROOM=Ustvari &klepetalnico ...
+service.gui.CREATE_CHAT_ROOM_ERROR=Ustvarjanje klepetalnice {0} ni uspelo.
+service.gui.CREATE_CHAT_ROOM_WIZARD=Čarovnik za ustvarjanje klepetalnice
+service.gui.CREATE_CONFERENCE_CALL=&Ustvari konferenčni klic ...
+service.gui.CREATE_GROUP=&Ustvari skupino ...
+service.gui.CREATE_VIDEO_BRIDGE=Ustvari most &video ...
+service.gui.CREATE_VIDEO_BRIDGE_MENU=Ustvari most &video
+service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Ustvari / Pridruži se videokonferenci
+service.gui.CREATE_VIDEO_CONFERENCE=Ustvari novo videokonferenco za to klepetalnico
+service.gui.CUT=&Izreži
+service.gui.DELETE=Izbriši
+service.gui.DENY=&Zavrni
+service.gui.DESKTOP_SHARING_WARNING=<b>Ali res želite dati svoje namizje v skupno uporabo?</b> <br> Če kliknete na DA bodo sogovorniki videli vaš zaslon.
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Zaslon ste dali v skupno rabo
+service.gui.DIALPAD=Številčnica
+service.gui.DISPLAY_NAME=Ime za prikaz
+service.gui.DISCONNECTED_STATUS=Ni povezave
+service.gui.DND_STATUS=Ne moti
+service.gui.DO_NOT_ASK_AGAIN=Ne sprašuj spet
+service.gui.DO_NOT_SHOW_AGAIN=Tega sporočila ne prikaži več
+service.gui.DRAG_FOR_SHARING=Sem povlecite kar želite dati v skupno rabo ...
+service.gui.DURATION=trajanje
+service.gui.DESTROY_CHATROOM=Zbriši klepetalnico
+service.gui.END_CONFERENCE=Zaključi konferenco
+service.gui.ENTER_PHONE_NUMBER=Vpišite telefonsko številko
+service.gui.ENTER_NAME_OR_NUMBER=Vpišite ime ali številko
+service.gui.ERROR=Napaka
+service.gui.ERROR_RECEIVED_FROM=Napaka od {0}
+service.gui.ESTIMATED_TIME=Predvideni čas:
+service.gui.EVENTS=Dogodki
+service.gui.EXIT=&Izhod
+service.gui.GENERAL=Splošno
+service.gui.GENERAL_ERROR=Splošna napaka
+service.gui.GROUP_NAME=Ime skupine
+service.gui.FAILED_STATUS=Klic ni uspel
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=Ni se mogoče pridružiti klepetalnici: {0}.
+service.gui.FAX=Faks
+service.gui.FFC_STATUS=Na razpolago za klepet
+service.gui.FILE=&Datoteka
+service.gui.FILE_TOO_BIG=Velikost datoteke je večja od največje dovoljene velikosti za protokol: {0}.
+service.gui.FILE_SEND_REFUSED={0} je zavrnil to datoteko.
+service.gui.FILE_TRANSFER_REFUSED=Zavrnjen prenos datoteke.
+service.gui.FILE_TRANSFER_NOT_SUPPORTED=Izbrani stik ne podpira prenosa datoteke.
+service.gui.FILE_TRANSFER_PREPARING=Priprava prenosa datoteke za uporabnika {0}. Prosim počakajte ...
+service.gui.FILE_TRANSFER_REQUEST_RECIEVED={0} deli datoteko z vami.
+service.gui.FILE_DOES_NOT_EXIST=Izbrane datoteke ni mogoče najti. Lahko je bila premaknjena ali izbrisana.
+service.gui.FILE_OPEN_FAILED=Datoteke ni mogoče odpreti. Lahko je bila premaknjena ali izbrisana.
+service.gui.FONT=Pisava
+service.gui.FONT_BOLD=Krepko
+service.gui.FONT_COLOR=Barva
+service.gui.FONT_ITALIC=Ležeče
+service.gui.FONT_SIZE=Velikost
+service.gui.FONT_STYLE=Slog
+service.gui.FONT_UNDERLINE=Podčrtano
+service.gui.HANG_UP=Odloži
+service.gui.HD_QUALITY=HD video
+service.gui.HELP=&Pomoč
+service.gui.HIDE=Skrij
+service.gui.ICE=ICE
+service.gui.IDENTIFIER=Določilnik
+service.gui.IS_CALLING={0} kliče ...
+service.gui.LAST_NAME=Priimek
+service.gui.LIST=Spisek
+service.gui.MEMBER=član
+service.gui.MESSAGE=Sporočilo
+service.gui.MORE_LABEL=Več
+service.gui.MOVE=Premakni
+service.gui.MOVE_SUBCONTACT=&Premakni stik
+service.gui.MOVE_CONTACT=Premakni stik
+service.gui.NAME=Ime
+service.gui.NEW_MESSAGE=Novo sporočilo
+service.gui.NEW_NAME=Novo ime
+service.gui.NEW_STATUS_MESSAGE=Nov status
+service.gui.NEW_STATUS_MESSAGE_SAVE=Shrani kot prilagojeno sporočilo
+service.gui.NICKNAME=Vzdevek
+service.gui.NO_CAMERA_AVAILABLE=Nobene kamere na razpolago
+service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=V tem protokolu ni podpore za souporabo namizja
+service.gui.NO_VIDEO_FOR_PROTOCOL=V tem protokolu ni podpore za video
+service.gui.OR=ali
+service.gui.chat.role.OWNER=Lastnik
+service.gui.chat.role.ADMINISTRATOR=Skrbnik
+service.gui.chat.role.MODERATOR=Moderator
+service.gui.chat.role.MEMBER=Član
+service.gui.chat.role.GUEST=Gost
+service.gui.chat.role.SILENT_MEMBER=Tihi član
+service.gui.chat.role.OUTCAST=Izobčen
+service.gui.OWNER=lastnik klepetalnice
+service.gui.PASSWORD=Geslo
+service.gui.PASSWORD_CHANGE_FAILURE=Napak pri spremembi gesla
+service.gui.PASSWORD_CHANGE_SUCCESS=Geslo uspešno spremenjeno
+service.gui.PERSONAL=Osebno
+service.gui.PORT=Vrata
+service.gui.POSTAL_CODE=Poštna številka
+service.gui.PREFERENCES=Možnosti
+service.gui.PREFIX=Predpona
+service.gui.PRESENCE=Prisotnost
+service.gui.PREVIOUS=Prejšnji
+service.gui.PROACTIVE_NOTIFICATION=piše sporočilo
+service.gui.PROTOCOL=Protokol
+service.gui.REASON=Razlog
+service.gui.REMEMBER_PASSWORD=Zapomni si geslo
+service.gui.RETRY=Ponovno poskusi
+service.gui.SAVE=&Shrani
+service.gui.SEARCH=&Išči
+service.gui.SELECT_COLOR=Izberi barvo
+service.gui.SELECT_GROUP=Izberi skupino
+service.gui.SELECT_NO_GROUP=Brez skupine
+service.gui.SEND_PRIVATE_MESSAGE=Pošlji zasebno sporočilo
+service.gui.SEND_SMS=P&ošlji SMS
+service.gui.SMS=SMS
+service.gui.SMS_SUCCESSFULLY_SENT=Sporočilo SMS je bilo uspešno poslano!
+service.gui.SOUND_OFF=Izklopi zvok
+service.gui.SOUND_ON=Vklopi zvok
+service.gui.STATUS=Stanje
+service.gui.STATUS_CHANGED_CHAT_MESSAGE=je postal {0}
+service.gui.STREET=Ulica
+service.gui.SUBJECT=Zadeva
+service.gui.SUMMARY=Povzetek
+service.gui.TELEPHONY=Telefonija
+service.gui.TOOLS=&Orodje
+
+
+
+
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
 # keep the following string short
@@ -50,9 +298,6 @@ service.gui.ARE_CALLING={0} kliče...
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -61,6 +306,10 @@ service.gui.ARE_CALLING={0} kliče...
 
 # LDAP
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
@@ -74,10 +323,8 @@ service.gui.ARE_CALLING={0} kliče...
 # aimaccregwizz
 
 # branding
+plugin.branding.ABOUT_MENU_ENTRY=O programu
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 
@@ -89,20 +336,15 @@ service.gui.ARE_CALLING={0} kliče...
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-
 # status update
 
 # updatechecker
@@ -111,21 +353,18 @@ service.gui.ARE_CALLING={0} kliče...
 
 # whiteboard
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+#Enum KeybindingSet.Category
 
 # Notification Configuration Form
+#NotificationsTable constants
 
 # ZRTP Securing
 
@@ -137,36 +376,233 @@ service.gui.ARE_CALLING={0} kliče...
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
 
 # Security configuration form title
+plugin.securityconfig.masterpassword.COL_PASSWORD=Geslo
+plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(neznano)
+plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(ni mogoče odšifrirati)
+plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Shrani gesla
+plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Odstrani vse
+plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Ali res želite odstraniti vsa gesla?
+plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Odstrani vsa gesla
+plugin.securityconfig.masterpassword.SHOW_PASSWORDS_BUTTON=Pokaži gesla
+plugin.securityconfig.masterpassword.HIDE_PASSWORDS_BUTTON=Skrij gesla
+plugin.securityconfig.masterpassword.PASSWORD_QUALITY_METER=Merilec kakovosti gesla
+plugin.securityconfig.masterpassword.MP_INPUT=Vpišite svoje glavno geslo:\n\n
 
 # otr plugin
+plugin.otr.menu.TITLE=Varni klepet
+plugin.otr.menu.START_OTR=Začni zasebni pogovor
+plugin.otr.menu.END_OTR=Prekini zasebni pogovor
+plugin.otr.menu.FINISHED=Vaš sogovornik je prekinil zasebni pogovor. Vi bi morali storiti isto
+plugin.otr.menu.VERIFIED=Vaš zasebni pogovor je preverjen
+plugin.otr.menu.UNVERIFIED=Vaš zasebni pogovor ni preverjen. Prosim overite svojega sogovornika
+plugin.otr.menu.LOADING_OTR=Začenjam zasebni pogovor ...
+plugin.otr.menu.TIMED_OUT=Čas za začetek zasebnega pogovora je pretekel.
+plugin.otr.menu.REFRESH_OTR=Osveži zasebni pogovor
+plugin.otr.menu.AUTHENTICATE_BUDDY=Overi sogovornika
+plugin.otr.menu.WHATS_THIS=Kaj je to
+plugin.otr.menu.CB_AUTO=Samodejno začni zasebni pogovor z {0}
+plugin.otr.menu.CB_AUTO_ALL=Samodejno začni zasebni pogovor z vsemi
+plugin.otr.menu.CB_ENABLE=Omogoči zasebna sporočila
+plugin.otr.menu.CB_REQUIRE=Zahtevaj zasebna sporočila
+plugin.otr.menu.CB_RESET=Ponasatvi
+plugin.otr.menu.OTR_TOOLTIP=Šifriraj pogovore z OTR
+plugin.otr.authbuddydialog.HELP_URI=https://jitsi.org/GSOC2009/OTR
+plugin.otr.authbuddydialog.AUTHENTICATION_INFO=Overjanje sogovornika pomaga pri zagotavljanju, da je oseba res ta kdor trdi, da je.
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD=Kako se želite overiti?
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_QUESTION=Overjanje z vprašanjem
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_SECRET=Overjanje s skupnim geslom
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_FINGERPRINT=Overjanje s prstnim odtisom
+plugin.otr.authbuddydialog.AUTHENTICATION_FINGERPRINT=Za preverjanje prstnega odtisa navežite stik s sogovornikom preko drugega overjenega kanal, kot je telefon ali e-pošta s podpisom GPG. Vsak mora sporočiti svoj prstni odtis drugemu. V primeru, da se vse sklada,  označite , da *ste* preverili prstni odtis v naslednjem pogovornem oknu.
+plugin.otr.authbuddydialog.LOCAL_FINGERPRINT=Prstni odtis za vas {0}: {1}
+plugin.otr.authbuddydialog.REMOTE_FINGERPRINT=Domnevni prstni odtis za {0}: {1}
+plugin.otr.authbuddydialog.AUTH_BY_QUESTION_INFO_INIT=Za overjanje z vprašanjem morate izbrati vprašanje katerega odgovor je znan samo vam in sogovorniku. Sogovorniku bo postavljeno vprašanje in če se odgovora ne skladata je možno, da se pogovarjate z goljufom.
+plugin.otr.authbuddydialog.AUTH_BY_SECRET_INFO_INIT=Za overjanje s skupnim geslom morate izbrati nekaj, kar je znano samo vam in sogovorniku. Sogovornik bo moral tudi izbrati geslo, ki je znano vam in če se skrivnosti ne skladata je možno, da se pogovarjate z goljufom.
+plugin.otr.authbuddydialog.AUTH_BY_SECRET_INFO_RESPOND=Vaš sogovornik želi preveriti, ali se res pogovarja z vami ali z goljufom. Sogovornik vam je postavil vprašanje. V primeru, da se želite overiti vpišite odgovor v spodnje polje.
+plugin.otr.authbuddydialog.SHARED_SECRET=Vpišite svoje skupno geslo:
+plugin.otr.authbuddydialog.QUESTION_RESPOND=Vaš sogovornik vas sprašuje:
+plugin.otr.authbuddydialog.QUESTION_INIT=Vpišite svoje vprašanje:
+plugin.otr.authbuddydialog.ANSWER=Vpišite svoj odgovor (razlikovanje velikosti črk):
+plugin.otr.authbuddydialog.AUTHENTICATION_FROM=Overjeno z {0}.
+plugin.otr.authbuddydialog.CANCEL=Prekliči
+plugin.otr.authbuddydialog.HELP=Pomoč
+plugin.otr.authbuddydialog.TITLE=Overi sogovornika
+plugin.otr.authbuddydialog.AUTHENTICATE_BUDDY=Overi sogovornika
+plugin.otr.authbuddydialog.I_HAVE=Sem
+plugin.otr.authbuddydialog.I_HAVE_NOT=Nisem
+plugin.otr.authbuddydialog.VERIFY_ACTION=preveril, da je to res pravi prstni odtis za {0}.
+plugin.otr.authbuddydialog.FINGERPRINT_CHECK=Vpišite prstni odtis, ki ste ga dobili od {0}.
+plugin.otr.smpprogressdialog.TITLE=Napredovanje overitve
+plugin.otr.smpprogressdialog.AUTHENTICATION_SUCCESS=Overitev je uspela!
+plugin.otr.smpprogressdialog.AUTHENTICATION_FAIL=Overitev ni uspela!
+plugin.otr.configform.MY_PRIVATE_KEYS=Moji zasebni ključi
+plugin.otr.configform.KNOWN_FINGERPRINTS=Znani prstni odtisi
+plugin.otr.configform.CB_AUTO=Samodejno začni zasebno sporočanje
+plugin.otr.configform.CB_ENABLE=Omogoči zasebno sporočanje
+plugin.otr.configform.CB_REQUIRE=Zahtevaj zasebno sporočanje
+plugin.otr.configform.NO_KEY_PRESENT=Nobenega ključa ni
+plugin.otr.configform.GENERATE=Ustvari
+plugin.otr.configform.REGENERATE=Ponovo ustvari
+plugin.otr.configform.FINGERPRINT=Prstni odtis
+plugin.otr.configform.VERIFY_FINGERPRINT=Preveri prstni odtis
+plugin.otr.configform.FORGET_FINGERPRINT=Pozabi prstni odtis
+plugin.otr.configform.COLUMN_NAME_CONTACT=Naveži stik
+plugin.otr.configform.COLUMN_NAME_VERIFIED_STATUS=Preverjenoi
+plugin.otr.configform.COLUMN_VALUE_VERIFIED_TRUE=Da
+plugin.otr.configform.COLUMN_VALUE_VERIFIED_FALSE=Ne
+plugin.otr.activator.unverifiedsessionwarning={0} navezuje stik z vami iz neznanega računalnika. Primerno bi bilo, da <A href="jitsi://{1}/{2}?{3}">overite {0}</a>.
+plugin.otr.activator.unverifiedsessionstared=Začel se je <b>nepreverjen</b> zasebni pogovor z uporabnikom {0}.
+plugin.otr.activator.sessionstared=Začel se je zasebni pogovor z uporabnikom {0}.
+plugin.otr.activator.sessionfinished={0} je prekinil zasebni pogovor z vami; vi bi morali storiti isto.
+plugin.otr.activator.sessionlost=Zasebni pogovor z {0} se je prekinil.
+plugin.otr.activator.historyon={0} snema vajin pogovor na vaši napravi. Tukaj lahko <A href="jitsi://{1}/{2}">izključite zgodovino klepeta</a>.
+plugin.otr.activator.historyoff={0} NE snema vajinega pogovora. Tukaj lahko <A href="jitsi://{1}/{2}">vključite zgodovino klepeta</a>.
+plugin.otr.activator.sessionfinishederror=Vaše sporočilo [{0}] ni bilo poslano. Prosim prekinite vaš zasebni pogovor z {1}.
+plugin.otr.activator.smpaborted={0} je preklical postopek overitve.
+plugin.otr.activator.smperror=Pri postopku overtive je prišlo do napake.
+plugin.otr.activator.unencryptedmsgreceived=To sporočilo je bilo sprejeto nešifrirano,
+plugin.otr.activator.unreadablemsgreceived={0} vam je poslal šifrirano sporočilo, ki ga ni bilo mogoče prebrati.
+plugin.otr.activator.requireencryption=Vaše sporočilo [{0}] ni bilo poslano. Zahtevano je zasebno sporočanje.
+plugin.otr.activator.unreadablemsgreply=Poslali ste {0} neberljivo šifrirano sporočilo. Prosim prekinite zasebni pogovor z uporabnikom {1}, da osvežite pogovor.
+plugin.otr.activator.fallbackmessage=<span style="font-weight: bold;">{0} skuša začeti šifriran <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">pogovor Off-The-Record</a> z vami. A vaša programska oprema ne podpira sporočanja Off-The-Record. Za več informacij preberite <a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">http://en.wikipedia.org/wiki/Off-the-Record_Messaging</a></span>
+plugin.otr.activator.multipleinstancesdetected=Vaš sogovornik {0} je prijavljen večkrat in OTR je vzpostavil več sej. Iz spodnjega menija lahko izberete izhodno sejo.
+plugin.otr.activator.msgfromanotherinstance={0} vam je poslal sporočilo mišljeno za drugo sejo. V primeru, da ste prijavljeni večkrat, bi lahko to sporčilo prišlo v drugo sejo.
 
 # global proxy plugin
+plugin.globalproxy.GLOBAL_PROXY_CONFIG=Splošni posredniški strežnik
+plugin.globalproxy.PROXY_TYPE=Vrsta posredniškega strežnika
+plugin.globalproxy.PROXY_ADDRESS=Posredniški strežnik
+plugin.globalproxy.PROXY_PORT=Vrata posredniškega strežnika
+plugin.globalproxy.PROXY_USERNAME=Uporabniško ime posredniškega strežnika
+plugin.globalproxy.PROXY_PASSWORD=Geslo posredniškega strežnika
 #plugin.globalproxy.PROTOCOL_SUPPORT
+plugin.globalproxy.FWD_DNS=Uporabi posrednika za DNS
+plugin.globalproxy.FWD_DNS_ADDR=Naslov posrednika za DNS
+plugin.globalproxy.FWD_DNS_PORT=Vrata posredniška za DNS
 
 # plugin reconnect
+plugin.reconnectplugin.NETWORK_DOWN=Prekinjena omrežna povezava!
 
 
 #plugin chat config
 
+plugin.chatconfig.TITLE=Klepet
+plugin.chatconfig.replacement.TITLE=Slika/Video:
+plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Omogoči zamejavo smeškov
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=Zamenjava slike/videa
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Omogoči
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_PROPOSAL=Onemogoči (pokaži povezavo za predogled)
+plugin.chatconfig.replacement.DISABLE_REPLACEMENT=Onemogoči
+plugin.chatconfig.replacement.CONFIGURE_REPLACEMENT=Spremeni nastavitve za zamenjavo slike/videa
+plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Viri:
+plugin.chatconfig.spellcheck.TITLE=Črkovanje
 
 #provisioning plugin
+plugin.provisioning.PROVISIONING=Oskrbovanje
+plugin.provisioning.ENABLE_DISABLE=Omogoči oskrbovanje
+plugin.provisioning.AUTO=Samodejno odkrij URI za oskrbovanje
+plugin.provisioning.DHCP=DHCP
+plugin.provisioning.DNS=DNS
+plugin.provisioning.BONJOUR=Bonjour
+plugin.provisioning.MANUAL=Ročno vnesi URI za oskrbovanje
+plugin.provisioning.URI=URI
+plugin.provisioning.RESTART_WARNING=Upoštevajte, da bodo vaše spremembe začele veljati šele pri naslednjem zagonu {0}!
+plugin.provisioning.UUID=UUID
+plugin.provisioning.COPYTOCLIPBOARD=Kopiraj UUID v odložišče
+plugin.provisioning.CLIPBOARD_FAILED=Ni bilo mogoče kopirati UUID v odložišče
+plugin.provisioning.CREDENTIALS=Zadnji shranjeni podatki oskrbovanja
+plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Ali res želite odstraniti geslo za oskrbovanje?
+plugin.provisioning.PROV_FAILED=Oskrbovanje ni uspelo
+plugin.provisioning.PROV_FAILED_MSG=<html>Oskrbovanje ni uspelo. {0}! <br>Prosim poskusite kasneje ali pokličite svojega administratorja</html>
+plugin.provisioning.FORGET_PASSWORD=Pozabi geslo
 
 # packet logging service
+plugin.loggingutils.PACKET_LOGGING_CONFIG=Dnevniški zapis
+plugin.loggingutils.ENABLE_DISABLE=Omogoči dnevniško zapisovnaje paketov
+plugin.loggingutils.PACKET_LOGGING_RTP=RTP
+plugin.loggingutils.PACKET_LOGGING_RTP_DESCRIPTION=(shrani 1 paket na 5000)
+plugin.loggingutils.PACKET_LOGGING_ICE4J=ice4j.org
+plugin.loggingutils.PACKET_LOGGING_DESCRIPTION=<html>Zapisuje razhroščevalne pakete raznih protokolov v <br>mapo dnevniškega zapisa formatu pcap (tcpdump/wireshark).</html>
+plugin.loggingutils.PACKET_LOGGING_FILE_COUNT=Število dnevniških datotek
+plugin.loggingutils.PACKET_LOGGING_FILE_SIZE=Največja velikost datoteke (v KB)
+plugin.loggingutils.ARCHIVE_BUTTON=Arhiviraj dnevniški zapis
+plugin.loggingutils.UPLOAD_LOGS_BUTTON=Pošlji dnevniški zapis
+plugin.loggingutils.UPLOAD_BUTTON=Pošlji
+plugin.loggingutils.ARCHIVE_FILECHOOSE_TITLE=Izberite datoteko
+plugin.loggingutils.ARCHIVE_UPREPORT_EMAIL=marijanovak@example.com
+plugin.loggingutils.ARCHIVE_MESSAGE_OK=Arhviranje dnevniških zapisov je uspelo \n{0}
+plugin.loggingutils.ARCHIVE_MESSAGE_NOTOK=Napaka pri arhviranju dnevniških zapisov \n{0}
 
 # dns config plugin
+plugin.dnsconfig.TITLE=DNS
+plugin.dnsconfig.DNSSEC=Varni DNS (DNSSEC)
+plugin.dnsconfig.PARALLEL_DNS=Vzporedni DNS
+plugin.dnsconfig.border.TITLE=Rezervni razreševalnik
+plugin.dnsconfig.chkBackupDnsEnabled.text=Omogoči paralelno razreševanje DNS
+plugin.dnsconfig.lblBackupResolver.text=Ime gostitelja
+plugin.dnsconfig.lblBackupResolverFallbackIP.text=Nadomestni IP
+plugin.dnsconfig.lblBackupPort.text=Vrata
+plugin.dnsconfig.lblRedemption.text=Nazaj k glavnemu razreševalniku
+plugin.dnsconfig.lblRedemption.description=<html>število odzivov, ki jih mora nuditi glavni razreševelnaik, da ponovo izključimo rezervnega</html>
+plugin.dnsconfig.lblPatience.text=Zaženi rezervni razreševalnik po
+plugin.dnsconfig.lblPatience.description=<html>število ms, ko čakamo na odziv glavnega  DNS preden preidemo na rezervni razreševalnik</html>
+plugin.dnsconfig.dnssec.chkEnabled=Omogoči razreševalnik DNSSEC
+plugin.dnsconfig.dnssec.lblDefault=Privzeto obnašanje
+plugin.dnsconfig.dnssec.DOMAIN_NAME=Domena
+plugin.dnsconfig.dnssec.MODE=Obnašanje
+net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=Prezri
+net.java.sip.communicator.util.dns.SecureResolveMode.SecureOnly=Zahtevano
+util.dns.DNSSEC_ADVANCED_OPTIONS=Pokaži napredne možnosti
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Accept=Sprejmi v vsakem priemeru
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.AlwaysAccept=Vedno sprejmi
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=Ne sprejmi
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.AlwaysDeny=Nikoli ne sprejmi
 
 #plugin spellcheck
+plugin.spellcheck.TITLE=Črkovanje in slovnica
+plugin.spellcheck.MENU=Pokaži črkovanje in slovnico
+plugin.spellcheck.ENABLE_SPELL_CHECK=Omogoči črkovanje
+plugin.spellcheck.dialog.FIND=Najdi naslednje
+plugin.spellcheck.dialog.REPLACE=Zamenjaj
+plugin.spellcheck.dialog.ADD=Dodaj besedo
+plugin.spellcheck.DICT_ERROR_TITLE=Napaka pri spremembi slovarja
+plugin.spellcheck.DICT_ERROR=Ni mogoče spremeniti slovarja
+plugin.spellcheck.DICT_PROCESS_ERROR=Jezikovna oznaka ni poznana
+plugin.spellcheck.UNINSTALL_DICTIONARY=Odstrani
+plugin.spellcheck.DICT_ERROR_DELETE_TITLE=Napaka pri odstranjevanju slovarja
+plugin.spellcheck.DICT_ERROR_DELETE=Slovarja ni mogoče odstraniti
+plugin.spellcheck.SPELLCHECK=Črkovanje
 
 
 #Certificate configuration plugin
+plugin.certconfig.JAVA_TRUSTSTORE=Java
+plugin.certconfig.WINDOWS_TRUSTSTORE=Windows
+plugin.certconfig.ALIAS=Vzdevek v shrambi ključev
+plugin.certconfig.KEYSTORE_TYPE=Vrsta
+plugin.certconfig.KEYSTORE=Datoteka
+plugin.certconfig.KEYSTORE_PASSWORD=Geslo
+plugin.certconfig.ALIAS_LOAD_EXCEPTION=Zvdevka ni bilo mogoče pridobiti iz shrambe ključev ({0}).
+plugin.certconfig.INVALID_KEYSTORE_TYPE=Izbrana vrsta shrambe ključev ni veljavna ({0}).
+plugin.certconfig.BROWSE_KEYSTORE=Odpri shrambo ključev
+plugin.certconfig.REVOCATION_TITLE=Možnosti preklica potrdil
+plugin.certconfig.REVOCATION_CHECK_ENABLED=Preverjanje CRL (Seznam preklicanih potrdil) omogočeno
+plugin.certconfig.REVOCATION_OCSP_ENABLED=Preverjanje OCSP (Spletni protokol stanja potrdil) omogočeno
 
 # Phone number contact source plugin
+plugin.phonenumbercontactsource.DISPLAY_NAME=Telefonske številke
 
 # properties editor
+plugin.propertieseditor.TITLE=Urejevalnik lastnosti
+plugin.propertieseditor.NEW_PROPERTY_TITLE=Dodaj lastnost
+plugin.propertieseditor.CHECK_BOX=Prihodnjič še pokaži to opozorilo
+plugin.propertieseditor.IM_AWARE=Razumem tveganje
 
 #Thunderbird address book plugin
+plugin.thunderbird.CONFIG_FORM_TITLE=Thunderbird
+plugin.thunderbird.ENABLED=Omogočen
+plugin.thunderbird.PHONE_PREFIX=Predklicna:
diff --git a/resources/languages/resources_sq.properties b/resources/languages/resources_sq.properties
index 51ca64d..b1bdff8 100644
--- a/resources/languages/resources_sq.properties
+++ b/resources/languages/resources_sq.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,30 +43,23 @@ service.gui.ACCOUNT_ME=Unë
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Rexhistrimi i llogarisë
 service.gui.ACCOUNTS=Llogaritë
 service.gui.ADD=&Shto
-service.gui.ADD_ACCOUNT=Shto llogari
 service.gui.ADD_CONTACT=&Shto kontakt
 service.gui.ADD_CONTACT_TO=&Shto kontakt
 service.gui.ADD_CONTACT_ERROR=Dështoj në shtimin e kontaktit me id: {0}
 service.gui.ADD_CONTACT_ERROR_TITLE=Gabim gjatë shtimit të kontaktit
 service.gui.ADD_CONTACT_EXIST_ERROR=Kontakti {0} ekziston në listën tuaj të kontakteve
-service.gui.ADD_CONTACT_IDENTIFIER=Futni në fushën e mëposhtme informacionet e kontaktit të cilin ju dëshironi të shtoni.
-service.gui.ADD_CONTACT_WIZARD=Ndihmesa për shtimin e kontaktit
 service.gui.ADD_GROUP_LOCAL_ERROR=Dështoj për të shtuar grupin me emrin: {0}. Problemi ka ndodhur gjatë një l/O (disku i plotë? Mungesa e të drejtave?).
 service.gui.ADD_GROUP_EXIST_ERROR=Grupi {0} ekziston në listën tuaj të kontaktit. Ju lutem zgjidhni një tjetër emër.
 service.gui.ADD_GROUP_NET_ERROR=Dështoj për të shtuar grupin me emrin: {0}. Problemi ka ndodhur për shkak të dështimit të rrjetit. Ju lutem kontrolloni lidhjen e rrjetit dhe provoni përsëri.
 service.gui.ADD_GROUP_ERROR=Dështoj për të shtuar grupin me emrin: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Grupit duhet patjetër t´´i ipet një emër. 
-service.gui.ADD_GROUP=Krijo grup
-service.gui.ADD_SUBCONTACT=&Shto subkontakt
 service.gui.ADMINISTRATOR=Administrator
 service.gui.ADVANCED=&Përparuar
-service.gui.ALL=&Të gjitha
 service.gui.ALL_CONTACTS=&Të gjitha kontaktet
 service.gui.APPLY=&Apliko
 service.gui.ARE_NOW=Ju jeni tani {0}
 service.gui.AT=në
 service.gui.AUTHENTICATION_FAILED=Identifikimi ka dështuar. Fjalëkalimi që futët nuk është i vlefshëm
-service.gui.AUTHENTICATION_REQUESTED=Kërkohet identifikimi
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Serveri {0} ka kërkuar identifikimin tuaj.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} identifikimi
 service.gui.AUTHORIZATION_REQUESTED=Kërkohet autorizimi
@@ -95,12 +99,10 @@ service.gui.CHAT_ROOM_USER_KICKED=është përjashtuar nga {0}
 service.gui.CHAT_ROOM_USER_QUIT=ka lënë {0}
 service.gui.CHAT_ROOM_NAME=Emri i dhomës së chat-it
 service.gui.ROOM_NAME=Dhoma e chat-it
-service.gui.AUTOJOIN=Vetbashkim
 service.gui.CHAT_ROOM_NAME_INFO=Shkruani në fushën e mëposhtme emrin e dhomës chat, të cilën ju dëshironi për të krijuar.
 service.gui.CHAT_ROOM_NOT_EXIST=Dhoma {0} nuk u gjet në server {1}. Ju lutem verifikoni nëse emri që keni shtypur është i saktë.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Ju duhet të hyni brenda (log in), në mënyrë që t''i bashkangjiteni dhomës së chat-it {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Ju duhet të hyni brenda (log in), për të lënë një chat-dhomë
-service.gui.CHAT_ROOM_NOT_JOINED=Ju duhet t''i bashkangjiteni chat-dhomës, në mënyrë që të bëni operacione të mëtejshme në të.
 service.gui.CHAT_ROOM_OPTIONS=Mundësitë e chat-dhomës 
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED=Chat-dhoma {0} kërkon që të regjistroheni, nëse doni t''i bashkangjiteni.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Chat-dhoma {0} kërkon një fjalkalim.
@@ -114,9 +116,7 @@ service.gui.CONNECTING=Lidh...
 service.gui.CONNECTING_STATUS=Lidh
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Lidh*
 service.gui.CONNECTION=Lidhje
-service.gui.CONNECTION_FAILED_MSG=Lidhja SSL dështoi për këtë llogari: Emri i përdoruesit: {0}, emri i Server: {1}. Ju lutem kontrolloni lidhjen e rrjetit ose kontaktoni administratorin e rrjetit për më shumë informacion.
 service.gui.CONNECTION_EXPIRED_MSG=Ju jeni shkyçur aktualisht nga server {0}.
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Kontakti i zgjedhur {0} nuk mbështetë telefoninë
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Kontakti i zgjedhur {0} nuk përkrah chat konferenca.
 service.gui.CONTACT_PAUSED_TYPING={0} ka ndaluar së shkruari mesazhin.
 service.gui.CONTACT_TYPING={0} është duke shkruar mesazh
@@ -129,13 +129,10 @@ service.gui.CREATE_CHAT_ROOM=&Krijo chat-dhomë...
 service.gui.CREATE_CHAT_ROOM_ERROR=Nuk arriti të krijoj chat-dhomën {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Krijo chat-dhomë
 service.gui.CREATE_CONFERENCE_CALL=&Krijo një thirrje-konferencë...
-service.gui.CREATE_CONFERENCE_CHAT=&Krijo një chat-konferencë...
 service.gui.CREATE_GROUP=&Krijo grup...
 service.gui.CREATE_GROUP_NAME=Në fushën e mëposhtme, shkruani emrin e grupit që doni të krijoni.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Lista juaj e kontakteve nuk përmban asnjë grup. Ju lutem krijoni një grup të parë (Skedar/Krijo grup).
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Ky kontakt nuk mbështet informacionet e web-kontaktit
 service.gui.CUT=&Prerje
-service.gui.DATE=Data
 service.gui.DELETE=Fshij
 service.gui.DESKTOP_SHARING_WARNING=<b> Jeni i sigurt se doni te filloni ndarjen e ekranit? </ b> <br> Duke klikuar OK, ju do lejoni të njerëzit e kësaj thirrjeje që të shohin ekranin tuaj.
 service.gui.DIALPAD=Tastiera për thirrje
@@ -154,7 +151,6 @@ service.gui.ERROR_WAS=Gabimi ishte: {0}
 service.gui.ESTIMATED_TIME=koha e parashikuar:
 service.gui.EVENTS=Ndodhi
 service.gui.EXIT=D&alje
-service.gui.EXTENDED_CRITERIA=Kritere të zgjëruara
 service.gui.GENERAL_ERROR=Gabim i përgjithshëm
 service.gui.GROUP_NAME=Emri i grupit
 service.gui.FAILED_STATUS=Thirrja dështoi
@@ -207,7 +203,6 @@ service.gui.HIDE_OFFLINE_CONTACTS=Fshih kontaktet jashtë linje
 service.gui.HIDE_MAIN_WINDOW=<DIV> Duke klikuar butonin X, nuk do të dilni nga programi, por vetëm <BR> fshehni atë. Nëse ju dëshironi të dilni nga programi zgjidhni Skedë/Dalje. </ DIV>
 service.gui.HISTORY=&Kronologjia
 service.gui.HISTORY_CONTACT=Kronologjia - {0}
-service.gui.HOUR=Ora
 service.gui.IDENTIFIER=Identifikues
 service.gui.IGNORE=&Injorim
 service.gui.INSERT_SMILEY=Fut "smiley"
@@ -225,7 +220,6 @@ service.gui.INVITE_REASON=Arsyeja e ftesës
 service.gui.IS_NOW={0} është tani {1}
 service.gui.JOIN=&Bashkangjitem
 service.gui.JOIN_AS=B&ashkangjitu si...
-service.gui.CLOSE_CHAT_ROOM_DIALOG=M&byll
 service.gui.JOIN_CHAT_ROOM=&Bashkohu në chat-dhomë...
 service.gui.JOIN_CHAT_ROOM_TITLE=Bashkohu në chat-dhomë
 service.gui.JOIN_CHAT_ROOM_NAME=Ju lutem shkruani emrin e chat-dhomës ku ju doni për t''u bashkuar.
@@ -235,7 +229,6 @@ service.gui.KICK_FAILED=Përjashtimi dështoi
 service.gui.KICK_FAILED_GENERAL_ERROR=Nuk arriti të përjashtoi {0}. Ka ndodhur një gabim i përgjithshëm në server.
 service.gui.KICK_FAILED_NOT_ALLOWED=Nuk arriti të përjashtoi {0}. Pronari dhe administratori i dhomës nuk mund të përjashtohen.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Nuk arriti të përjashtoi {0}. Ju nuk posedoni të drejtat për të bërë këtë.
-service.gui.LAST=I fundit
 service.gui.LEAVE=&Lë
 service.gui.LIMIT_REACHED_FOR_IP=Ju keni shumë regjistrime ekzistuese nga IP-adresa lokale dhe serveri {0} nuk lejon për të hapur më shumë prej tyre.
 service.gui.LOADING_ROOMS=Ngarkimi i dhomave...
@@ -250,7 +243,6 @@ service.gui.MESSAGE=Mesazh
 service.gui.MISSED_CALLS_TOOL_TIP=Thirrjet e humbura nga:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= dhe {0} më shumë
 service.gui.MODERATOR=moderator
-service.gui.MORE=Më shumë
 service.gui.MOVE=Çvendos
 service.gui.MOVE_SUBCONTACT=Çv&endos kontaktin
 service.gui.MOVE_SUBCONTACT_MSG=Zgjidhni kontaktin ose grupin, ku ju doni të çvendosni kontaktin e zgjedhur.
@@ -258,7 +250,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Kontakti që ju keni zgjedhur është e njëj
 service.gui.MOVE_SUBCONTACT_QUESTION=Jeni i sigurt se doni të çvendosni {0} në {1}?
 service.gui.MOVE_TO_GROUP=Ç&vendose në grup
 service.gui.MOVE_CONTACT=Çvendos kontaktin
-service.gui.MOVE_CONTACT_ERROR=&Kontakti nuk mund të çvendoset
 service.gui.MSG_DELIVERY_FAILURE=Mesazhi i mësipërm nuk u dorëzua
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Protokolli që ju jeni duke përdorur, nuk mbështet mesazhe offline. Ju mund të përpiqeni të dërgoni mesazhin me një tjetër protokoll ose prisni deri sa ai/ajo të vijë online.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Ka ndodhur një gabim intern. Kjo është me siguri një difekt. Ju lutem raportoni ketu: http://www.sip-communicator.org/index.php/Development/BugsAndIssues.
@@ -269,7 +260,6 @@ service.gui.MSG_NOT_POSSIBLE=Mesazhimi nuk është i mundur për këtë kontakt
 service.gui.MSG_RECEIVED={0} shkroi
 service.gui.MSG_SEND_CONNECTION_PROBLEM=Ju duhet të jeni i lidhur, për të qenë në gjendje që të dërgoni mesazhe.
 service.gui.MULTIPLE_LOGINS=Ju keni hyrë më shumë se një herë me të njëjtën llogari. Llogaria: Emri i përdoruesit: {0}, emri i server: {1} është shkëputur për momentin.
-service.gui.MUTE=Pa zë
 service.gui.MUTUALLY_ON_HOLD_STATUS=Reciprokisht në pritje
 service.gui.NETWORK=Rrjeti
 service.gui.NETWORK_FAILURE=Gabim në rrjet
@@ -289,7 +279,6 @@ service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=Ju doni të mbyllni bisedën dhe një me
 service.gui.NON_EXISTING_USER_ID=Serveri {0} nuk njeh përdoruesin e specifikuar.
 service.gui.OFFLINE=Jashtë linje
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Thirrjet e vjetra
 service.gui.ONLINE=Në linjë
 service.gui.OPEN=Hap
 service.gui.OPEN_FILE_FROM_IMAGE=Klikody herë për të hap skedarin.
@@ -297,7 +286,6 @@ service.gui.OPEN_FOLDER=Hap dosjen
 service.gui.OPEN_IN_BROWSER=Hape në &shfletues
 service.gui.OPTIONS=Mundësitë
 service.gui.OR=ose
-service.gui.OR_ENTER_PHONE_NUMBER=Ose shkruani numrin e telefonit këtu ...
 service.gui.OWNER=Pronar i dhomës
 service.gui.PASSWORD=Fjalëkalimi
 service.gui.PASTE=&Ngjit
@@ -305,7 +293,6 @@ service.gui.PORT=Porti
 service.gui.PRESENCE=Prania
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' për sygjerime
 service.gui.PREVIOUS=I mëparshëm
-service.gui.PREVIOUS_TOOLTIP=Shfleto biseda të vjetra
 service.gui.PRINT=&Shtyp
 service.gui.PROACTIVE_NOTIFICATION=është duke shkruar mesath
 service.gui.PROTOCOL=Protokolli
@@ -341,24 +328,16 @@ service.gui.REVOKE_ADMIN=Heqja e administratorit
 service.gui.REVOKE_MODERATOR=Heqja e moderatorit
 service.gui.REVOKE_MEMBERSHIP=Heqja e anëtarësimit
 service.gui.REVOKE_VOICE=Heqja e zërit
-service.gui.ROOT_GROUP=Grupi bazë
 service.gui.SAVE=&Ruaj
 service.gui.SEARCH=&Kërko
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Klikoni butonin më poshtë për të treguar të gjithë chat-dhomat ekzistuese në serverin e përzgjedhur. Atëherë zgjidhni atë që ju doni t''i bashkoheni dhe klikoni butonin "Bashkangjitu".
-service.gui.SELECT_ACCOUNT=Përzgjedh llogarinë
 service.gui.SELECT_COLOR=Përzgjedh ngjyrën
 service.gui.SELECT_GROUP=Përzgjedh grupin
-service.gui.SELECT_GROUP_WIZARD_MSG=Lista e mëposhtme përmban të gjitha grupet në listën tuaj të kontaktit. Përzgjidhni një, ku ju dëshironi të shtoni kontakt të ri.
 service.gui.SELECT_NO_GROUP=S''ka grup
-service.gui.SELECT_GROUP_WIZARD=Specifikoni grupin
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Lista e mëposhtme përmban të gjitha llogaritë që mbështesin funksionin e chat-iti për shumë përdorues. Përzgjedh llogarinë me të cilin ju dëshironi t''a krijoni chat-dhomën tuaj.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Lista e mëposhtme përmban të gjitha llogaritë e regjistruar. Përzgjedh llogarinë të cilën dëshironi t''a përdorni për të komunikuar me kontakt të ri.
-service.gui.SELECT_PROVIDERS_WIZARD=Përzgjedh llogarinë
 service.gui.SEND=&Dërgo
 service.gui.SEND_FILE=Dërgo &skedar
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Nuk ka asnjë informacion për këtë kontakt.
 service.gui.SEND_MESSAGE=&Dërgo një mesazh
-service.gui.SEND_AS_SMS=Dërgo si SMS
 service.gui.SEND_SMS=Dë&rgo SMS
 service.gui.SEND_SMS_DETAILS=Mos harroni se ju duhet të shkruani numrin në format ndërkombëtare p.sh. duke filluar me 355 për Shqipëri për shembull, 35577000000
 service.gui.SEND_SMS_NOT_SUPPORTED=Protokolli i përzgjedhur nuk mbështet dërgimin e mesazheve SMS.
@@ -390,15 +369,18 @@ service.gui.STATUS_MESSAGE_INFO=Në fushën e mëposhtme ju mund të specifikoni
 service.gui.STOP_SHARING=Ndal ndarjen
 service.gui.SUBJECT=Subjekti
 service.gui.SUMMARY=Përmbledhje
-service.gui.TODAY=Sot
 service.gui.VOICEMAIL_NO_MESSAGES=Asnjë mesazh
 
 
 
 
+#enum values from IceProcessingState
+
+
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 
 
-service.gui.security.COMPARE_WITH_PARTNER=Krahaso me partnerin dhe klikoni dryrin për të konfirmuar.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Krahaso me partnerin: {0}
 
@@ -407,9 +389,6 @@ service.gui.avatar.imagepicker.CANCEL=&Anulo
 
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
 
 # systray
@@ -418,17 +397,19 @@ service.gui.avatar.imagepicker.CANCEL=&Anulo
 
 # LDAP
 impl.ldap.EDIT=&Redakto
-impl.ldap.REMOVE=&Largo
 impl.ldap.SAVE=&Ruaj
 impl.ldap.CANCEL=&Anulo
 impl.ldap.SERVER_PORT=Porti
 impl.ldap.PASSWORD=Fjalëkalimi
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 
 # Google Contacts
 impl.googlecontacts.EDIT=&Redakto
-impl.googlecontacts.REMOVE=&Largo
 impl.googlecontacts.SAVE=&Ruaj
 impl.googlecontacts.CANCEL=&Anulo
 impl.googlecontacts.PASSWORD=Fjalëkalimi
@@ -444,9 +425,6 @@ impl.googlecontacts.PASSWORD=Fjalëkalimi
 # branding
 plugin.branding.ABOUT_MENU_ENTRY=&Rreth
 
-# Dict protocol
-
-# facebookaccregwizz
 
 # generalconfig
 plugin.generalconfig.SHOW_HISTORY=Shfaq
@@ -459,22 +437,16 @@ plugin.generalconfig.SHOW_HISTORY=Shfaq
 
 # jabber accregwizz
 
-# mailbox
-
-# msn accregwizz
-
 # plugin manager
 
 # simple accregwizz
 
 # sipaccregwizz
 plugin.sipaccregwizz.XCAP_PASSWORD=Fjalëkalimi
+#used from SecurityPanel
 
 # skin manager
 
-# ssh accregwizz
-plugin.sshaccregwizz.OPTIONAL=Mundësitë
-
 # status update
 
 # updatechecker
@@ -487,26 +459,23 @@ plugin.whiteboard.OPEN=Hap
 plugin.whiteboard.COLOR=Me ngjyra
 plugin.whiteboard.DELETE=Fshij
 
-# yahoo accregwizz
-
-# zero accregwizz
-
 # gtalk accregwizz
 
 # iptel accregwizz
 
-# sip2sip accregwizz
-
 # ippi accregwizz
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_COPY=&Kopjo
 plugin.keybindings.CHAT_CUT=&Prerje
 plugin.keybindings.CHAT_PASTE=&Ngjit
 plugin.keybindings.MAIN_RENAME=Rie&mërto kontaktin
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chat
 
 # Notification Configuration Form
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Thirrje e ardhur
 plugin.notificationconfig.event.IncomingFile=Thirrje e ardhur
 plugin.notificationconfig.event.HangUp=Ul receptorin e telefonit
@@ -522,6 +491,7 @@ impl.media.security.zrtp.TITLE=Thirrje
 
 
 
+#in JNIEncoder
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
@@ -530,7 +500,6 @@ impl.media.security.zrtp.TITLE=Thirrje
 plugin.securityconfig.masterpassword.TITLE=Fjalëkalimi
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Mbaj mend fjalëkalimin
 plugin.securityconfig.masterpassword.COL_PASSWORD=Fjalëkalimi
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=&Largo
 
 # otr plugin
 plugin.otr.authbuddydialog.CANCEL=&Anulo
@@ -559,7 +528,6 @@ plugin.dnsconfig.lblBackupPort.text=Porti
 net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=&Injorim
 
 #plugin spellcheck
-plugin.spellcheck.EDIT_PERSONAL_DICT=&Redakto
 
 
 #Certificate configuration plugin
diff --git a/resources/languages/resources_sr.properties b/resources/languages/resources_sr.properties
index 3c9e19d..24c9b05 100644
--- a/resources/languages/resources_sr.properties
+++ b/resources/languages/resources_sr.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Ја
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Чаробњак за регистрацију налога
 service.gui.ACCOUNTS=Налози
 service.gui.ADD=&Додај
-service.gui.ADD_ACCOUNT=Додај налог
 service.gui.ADD_CONTACT=&Додај контакт
 service.gui.ADD_AUTHORIZED_CONTACT=Додај {0}у листу контаката
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Додај контакт на листу контаката
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Грешка код додавања кон�
 service.gui.ADD_CONTACT_EXIST_ERROR=Контакт {0} већ постоји у листи контаката.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Сервер није препознао захтев за додавање контакта са ид: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Неуспело додавење контаката са ид: {0}. Операција није подржана.
-service.gui.ADD_CONTACT_IDENTIFIER=У поље испод унесите идентификацију контакта кога желите додати.
-service.gui.ADD_CONTACT_WIZARD=Чаробњак за додавање контакта
 service.gui.ADD_CONTACT_NOT_CONNECTED=Морате бити повезани да би додали контакт. Повежите се на одабраног провајдера и пробајте поново.
 service.gui.ADD_GROUP_LOCAL_ERROR=Неуспело додавање групе са именом: {0}. Проблем се догодио током локален ИО операције.
 service.gui.ADD_GROUP_EXIST_ERROR=Група {0} већ постоји у вашој контакт листи. Молим одаберите друго име.
 service.gui.ADD_GROUP_NET_ERROR=Неуспело додавање групе са именом: {0}. Проблем се догодио због лоше везе. Молим проверите вашу мрежу и пробајте поново.
 service.gui.ADD_GROUP_ERROR=Неуспело додавање групе са именом: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Група не мора бити празна.
-service.gui.ADD_GROUP=Направи групу
-service.gui.ADD_SUBCONTACT=&Додај потконтакт
 service.gui.ADDRESS=Адреса
 service.gui.ADMINISTRATOR=администратор
 service.gui.ADVANCED=&Напредно
-service.gui.ALL=&Сви
 service.gui.ALL_CONTACTS=&Сви контакти
 service.gui.ALTERNATE_ADDRESS=Резервна адреса
 service.gui.APPLY=&Примени
@@ -65,7 +70,6 @@ service.gui.AT=у
 service.gui.AUTHORIZE=&Овласти
 service.gui.AUTHORIZATION_ACCEPTED={0} је прихватио захтев за овлашћење.
 service.gui.AUTHENTICATION_FAILED=Пријава је неуспела за {0}. Унета лозинка није исправна.
-service.gui.AUTHENTICATION_REQUESTED=Потребна идентификација
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Сервер {0} захтева вашу идентификацију.
 service.gui.AUTHENTICATION_REJECTED={0} је одбацио ваш захтев за идентификацију.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} идентификација
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=У поље испод можете унети
 service.gui.CHANGE_NICKNAME_ERROR=Грешка код промене надимка
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Надимак већ постоји
 service.gui.CHANGE_VIDEO_QUALITY=Промени квалитет видеа
-service.gui.CHAT_CONFERENCE_LABEL=Конференција
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}''име конференције
 service.gui.CHAT_ROOM_ALREADY_JOINED=Соба {0} за ћаскање је већ приступила.
 service.gui.CHAT_ROOM_CONFIGURATION=Подешавање {0} собе за ћаскање
@@ -121,18 +124,14 @@ 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_SEND_MSG_FORBIDDEN=Слање поруке је забрањено
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Чување собе за ћаскање за будуће коришћење
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Уклоните одабрану собу са листе сачуваних соба
 service.gui.CHAT_ROOM_NAME=Име собе за ћаскање
 service.gui.CLEAR_CUSTOM_MESSAGES=Избриши произвољне поруке
 service.gui.ROOM_NAME=Соба за ћаскање
-service.gui.AUTOJOIN=Ауто-прикључење
 service.gui.CHANGE_PASSWORD=Промена лозинке
 service.gui.CHAT_ROOM_NAME_INFO=У поље испод унесите име собе за ћаскање коју би желели да креирате.
 service.gui.CHAT_ROOM_NOT_EXIST=Соба није нађена на серверу. Молим проверите да ли сте унели исправно име.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Потребно је да будете пријављени да би приступили {0} соби за ћаскање
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Морате бити пријављени да би напустили собу за ћаскање.
-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} за ћаскање захтева лозинку.
@@ -150,21 +149,17 @@ service.gui.CLEAR=Очисти
 service.gui.CLOSE=За&твори
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Не можете примити нову поруку за мање од 2 секунде. Да ли сте сигурни да желите затворити ово ћаскање?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Имате активан пренос фајла. Да ли сте сигурни да желите на прекинете?
-service.gui.CONFIRM=Потврди
 service.gui.CONNECTED_STATUS=Повезан
 service.gui.CONNECTING=Повезивање...
 service.gui.CONNECTING_STATUS=Успостављам везу
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Успостављам везу*
 service.gui.CONNECTION=Веза
-service.gui.CONNECTION_FAILED_MSG=Повезивање није исправно за налог: Корисничко име: {0}, Име сервера: {1}. Молим проверите вашу мрежу или контактирајте администратора за више информација.
 service.gui.CONNECTION_EXPIRED_MSG=Веза са сервером је {0} прекинута.
 service.gui.CONTACT_NAME=ИД или број
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Изабрани {0} контакт не подржава телефонију.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Изабрани {0} контакт не подржава конференције.
 service.gui.CONTACT_PAUSED_TYPING={0} застој код куцања поруке
 service.gui.CONTACT_TYPING={0} куца поруку
 service.gui.CONTACT_INFO=&Контакт подаци
-service.gui.CONTACTLIST=Листа контаката
 service.gui.CONTACTS=Контакти
 service.gui.COPY=&Умножи
 service.gui.COPY_LINK=Умножи &везу
@@ -174,17 +169,14 @@ service.gui.CREATE_CHAT_ROOM=&Креирај собу за ћаскање...
 service.gui.CREATE_CHAT_ROOM_ERROR=Неуспело креирање {0} собе за ћаскање.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Креирај чаробњак собе за ћаскање
 service.gui.CREATE_CONFERENCE_CALL=&Креирај конференцијски позив...
-service.gui.CREATE_CONFERENCE_CHAT=&Креирај конференцијско ћаскање...
 service.gui.CREATE_GROUP=&Креирај групу...
 service.gui.CREATE_GROUP_NAME=У поље испод унеси име групе коју желите да креирате.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Ваша контакт листа не садржи групе. Моли прво креирајте групу (Фајл/Креирај гурпу).
 service.gui.CREATE_VIDEO_BRIDGE=Креирај &видео везу...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Креирај &видео везу
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Креирај / Приступи видео конференцији
 service.gui.CREATE_VIDEO_CONFERENCE=Креирај нову видео конференцију за ову собу 
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Овај контакт не подржава веб контакт податке
 service.gui.CUT=И&сеци
-service.gui.DATE=Датум
 service.gui.DELETE=Обриши
 service.gui.DENY=&Одбиј
 service.gui.DESKTOP_SHARING_WARNING=<b>Да ли сте сигурни да желите дељење екрана?</b> <br> Кликом на У реду особе на овом позиву ће видети ваш екран.
@@ -194,7 +186,6 @@ service.gui.DISCONNECTED_STATUS=Прекинута веза
 service.gui.DND_STATUS=Не узнемиравај
 service.gui.DO_NOT_ASK_AGAIN=Не питај поново
 service.gui.DO_NOT_SHOW_AGAIN=Не показуј ову поруку поново
-service.gui.DOWNLOAD_NOW=&Преузми сада
 service.gui.DRAG_FOR_SHARING=Превуци овде било шта што желиш да делиш...
 service.gui.DURATION=трајање
 service.gui.DESTROY_CHATROOM=Уништи собу за ћаскање
@@ -215,7 +206,6 @@ service.gui.ERROR_RECEIVED_FROM=Грешка је примљена од {0}
 service.gui.ESTIMATED_TIME=Процењено преостало време:
 service.gui.EVENTS=Догађаји
 service.gui.EXIT=И&злаз
-service.gui.EXTENDED_CRITERIA=Проширени критеријуми
 service.gui.GENERAL=Опште
 service.gui.GENERAL_ERROR=Опште грешке
 service.gui.GROUP_NAME=Име групе
@@ -257,7 +247,6 @@ service.gui.FONT_ITALIC=Искошено
 service.gui.FONT_SIZE=Величина
 service.gui.FONT_STYLE=Изглед
 service.gui.FONT_UNDERLINE=Подвучено
-service.gui.FROM={0} од {1}
 service.gui.GRANT_OWNERSHIP=Додели власништво...
 service.gui.GRANT_ADMIN=Додели администратора...
 service.gui.GRANT_MODERATOR=Додели модератора
@@ -283,7 +272,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Да ли сте сигурни да же
 service.gui.HISTORY_REMOVE_ERROR=Грешка код уклањања локално сачуваних порука.
 service.gui.HOME=Лично
 service.gui.HOME_PAGE=Матична страна
-service.gui.HOUR=Сат
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Идентификатор
 service.gui.IGNORE=&Игнориши
@@ -305,13 +293,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Позови контакте за в
 service.gui.INVITE_REASON=Разлог позивања
 service.gui.IS_CALLING={0} позива...
 service.gui.IS_NOW={0} је сад {1}
-service.gui.JITSI_WARNING=SIP комуникатор је недавно преименован у Jitsi.<br/>Ако желите да ваша верзија буде ажурирана, преузмите одмах Jitsi.<br/><br/>Извињавамо се због непријатности коју смо можда изазвали.<br/><br/>Jitsi развојни тим
-service.gui.JITSI_WARNING_TITLE=SIP комуникатор постаје Jitsi
 service.gui.JOIN=&Прикључи
 service.gui.JOIN_AS=П&рикључи ка
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Прикључи се постојећој видео конференцији
 service.gui.JOIN_VIDEO=Прикључи видео
-service.gui.CLOSE_CHAT_ROOM_DIALOG=З&атвори
 service.gui.JOB_TITLE=Занимање
 service.gui.JOIN_CHAT_ROOM=&Придружи се ћаскању...
 service.gui.JOIN_CHAT_ROOM_TITLE=Придружи се ћаскању
@@ -324,7 +309,6 @@ 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.LAST_NAME=Презиме
 service.gui.LEAVE=&Напусти
 service.gui.LIMIT_REACHED_FOR_IP=Имате превише регистрација са локалне ИП адресе и {0} сервер не дозвољава отварање нових адреса.
@@ -344,7 +328,6 @@ service.gui.MESSAGE=Порука
 service.gui.MISSED_CALLS_TOOL_TIP=Пропуштени позив од:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= и {0} више
 service.gui.MODERATOR=модератор
-service.gui.MORE=Погледај више
 service.gui.MORE_LABEL=Више
 service.gui.MOVE=Премести
 service.gui.MOVE_SUBCONTACT=П&ремести контакт
@@ -353,7 +336,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Контакт који сте одабран
 service.gui.MOVE_SUBCONTACT_QUESTION=Да ли сте сигурни да желите преместити {0} за {1}?
 service.gui.MOVE_TO_GROUP=&Премести у групу
 service.gui.MOVE_CONTACT=Премести контакт
-service.gui.MOVE_CONTACT_ERROR=&Контакт не може бити премештен
 service.gui.MSG_DELIVERY_FAILURE=Порука изнад није могла бити испоручена
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Протокол који користите не подржава поруке ван мреже. Пробајте преко {0} другог протокола или чекајте док он/она постане доступан.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Догодила се интерна грешка. Ово је највероватније баг. Молим пријавите овде: https://jitsi.org/Development/BugsAndIssues.
@@ -367,7 +349,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Потребно је да сте пов
 service.gui.MULTIPLE_LOGINS=Ви сте пријављени са више од једног налога. Следећи налог: Корисничко име: {0}, Име сервера: {1} је тренутно искључен.
 service.gui.MY_CHAT_ROOMS=Додај собу за ћаскање
 service.gui.MY_CHAT_ROOMS_TITLE=Додај собу за ћаскање
-service.gui.MUTE=Утишај
 service.gui.NAME=Име
 service.gui.NETWORK=Мрежа
 service.gui.NETWORK_FAILURE=Пад мреже
@@ -397,7 +378,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Нијеуконтактлисти
 service.gui.SD_QUALITY=Стандардан квалитет
 service.gui.OFFLINE=Ван мреже
 service.gui.OK=&У реду
-service.gui.OLDER_CALLS=Старији позиви
 service.gui.ONLINE=На мрежи
 service.gui.OPEN=Отвори
 service.gui.OPEN_FILE_FROM_IMAGE=Двоклик за отварање фајла.
@@ -409,7 +389,6 @@ service.gui.OPEN_ON_ACTIVITY=Отвори на активности
 service.gui.OPEN_ON_MESSAGE=Отвори само на поруке
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Отвори само на важне поруке
 service.gui.OR=или
-service.gui.OR_ENTER_PHONE_NUMBER=Или унеси телефонски број овде...
 service.gui.ORGANIZATION=Организација
 service.gui.OTHER=Друго
 service.gui.OWNER=власник собе
@@ -428,7 +407,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS=Притисни "Ентер" за су�
 service.gui.PRESS_FOR_CALL_INFO=Притисни за податке позива
 service.gui.PRESS_TO_OPEN_CRM=Притисни за отварање ЦРМ апликације
 service.gui.PREVIOUS=Претходно
-service.gui.PREVIOUS_TOOLTIP=Претражи старије конверзације
 service.gui.PRINT=&Штампај
 service.gui.PROACTIVE_NOTIFICATION=је писање поруке
 service.gui.PROBLEMS_ENCOUNTERED=Суочавајући проблеми
@@ -444,7 +422,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Одјављивали и пријављ
 service.gui.RE_REQUEST_AUTHORIZATION=Поново захтевај ауторизацију
 service.gui.REFERRED_STATUS=Препоручено
 service.gui.REJECT=&Одбаци
-service.gui.REMIND_ME_LATER=Подсети ме касније
 service.gui.REMEMBER_PASSWORD=Запамти лозинку
 service.gui.REMOVE=&Уклони
 service.gui.REMOVE_ACCOUNT=&Уклони налог
@@ -470,29 +447,20 @@ service.gui.REVOKE_ADMIN=Опозови администратора
 service.gui.REVOKE_MODERATOR=Опозови модератора
 service.gui.REVOKE_MEMBERSHIP=Опозови чланство
 service.gui.REVOKE_VOICE=Укини глас
-service.gui.ROOT_GROUP=Админ група
 service.gui.SAVE=&Сачувај
-service.gui.SAVE_AS_DEFAULT=Сачувај као подразумевано
 service.gui.SEARCH=&Претражи
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Кликни на дугме испод за приказ свих соба за ћаскање на одабраном серверу. Онда одабери један коме желиш да приступиш и кликни на приступно дугме.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Тражени контакт
 service.gui.SECURITY=Безбедност
-service.gui.SELECT_ACCOUNT=Одабери налог
 service.gui.SELECT_COLOR=Одабери боју
 service.gui.SELECT_GROUP=Одабери групу
-service.gui.SELECT_GROUP_WIZARD_MSG=Листа испод садржи све групе у вашој контакт листи. Одабери једну где желиш да додаш нови контакт.
 service.gui.SELECT_NO_GROUP=Без групе
-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.SELECT_VIDEO_CONFERENCE=Одавери видео конференцију
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Одабери собу за ћаскање са листе и притисни У реду за додавање.
 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_PRIVATE_MESSAGE=Пошаљи приватну поруку
 service.gui.SEND_SMS=П&ошаљи СМС
 service.gui.SEND_SMS_DETAILS=Запамти да је потребно унети број у интернационалном формату, нпр. почети са +44 за UK као пример, +447777000000
@@ -531,7 +499,6 @@ service.gui.STREET=Улица
 service.gui.SUBJECT=Субјект
 service.gui.SUMMARY=Сажетак
 service.gui.TELEPHONY=Телефонија
-service.gui.TODAY=Данас
 service.gui.TOOLS=&Алати
 service.gui.TRANSFER=Прен&ос
 service.gui.TO=&За:
@@ -541,7 +508,6 @@ service.gui.TRANSFER_CALL_TO=Пренос за:
 service.gui.TRANSPARENCY_NOT_ENABLED=Провидност није подржана за ваше тренутне поставке.
 service.gui.TYPE_YOUR_REQUEST=Укуцајте захтев овде
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Није могуће променити квалитет видеа за овај позив.
-service.gui.UNMUTE=Укључи звук
 service.gui.USER_IDENTIFIER=Идентификатор корисника:
 service.gui.USER_EXISTS_ERROR=Корисник већ постоји на одабраној мрежи. Молим одаберите другог корисника или мрежу
 service.gui.USERNAME_NULL=Молим попуните ваше корисничко име и лозинку.
@@ -554,7 +520,6 @@ service.gui.USE_PROVISIONING=Користи провизију преко мре
 service.gui.VALUE=Вредност
 service.gui.VIDEO_CALL=&Видео позив
 service.gui.VIA=преко
-service.gui.VIA_SMS=преко СМС
 service.gui.VIEW=&Приказ
 service.gui.VIEW_HISTORY=Приказ &историје
 service.gui.VIEW_SMILEYS=Приказ &емотикона
@@ -574,9 +539,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Подеси јачину звука
 service.gui.WAITING_AUTHORIZATION=Чекам за ауторизацију
 service.gui.WARNING=Упозорење
 service.gui.YES=Да
-service.gui.YESTERDAY=Јуче
-service.gui.EXISTING_ACCOUNT_ERROR=Налог који сте унели је већ инсталиран.
-service.gui.NEW_MAIL=<b>Имате нову е-пошту!</b><br/><b>Од:</b> {0} {1} <br/><b>Субјект:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Примили сте нову поруку е-поште у сату {0} <a href="{1}">примљено</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Примили сте {2} нову поруку е-поште у сату {0} <a href="{1}">примљено</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=једна непрочитана порука у твом <a href="{0}">примљеном</a>.<br/>
@@ -600,7 +562,6 @@ service.gui.SECURITY_ERROR=Безбедоносна грешка
 service.gui.SPEED=Брзина:
 service.gui.SILENT_MEMBER=тихи члан
 service.gui.NON_SECURE_CONNECTION=Небезбедне конекције могу бити направљене за овај налог {0}. Ако желите повезивање са небезбедним сервером, молим проверите "Омогући небезбедне конекције" у вашим поставкама налога.
-service.gui.UPDATE=Ажурирај
 service.gui.MOBILE_PHONE=Мобилни
 service.gui.VIDEO_PHONE=Видео
 service.gui.WORK_PHONE=Посао
@@ -635,7 +596,6 @@ service.gui.callinfo.CALL_INFORMATION=Подаци позива
 service.gui.callinfo.CALL_IDENTITY=Идентитет
 service.gui.callinfo.PEER_COUNT=Број учесника
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Фокус конференције
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Омогућено шифрофање
 service.gui.callinfo.CALL_TRANSPORT=Сигнализација у току позива
 service.gui.callinfo.CALL_DURATION=Трајање позива
 service.gui.callinfo.TLS_PROTOCOL=ТЛС протокол
@@ -649,7 +609,6 @@ service.gui.callinfo.AUDIO_INFO=Звучни подаци
 service.gui.callinfo.VIDEO_INFO=Видео подаци
 service.gui.callinfo.LOCAL_IP=Локална ИП / Порт
 service.gui.callinfo.REMOTE_IP=Удаљена ИП / Порт
-service.gui.callinfo.BANDWITH=Проток
 service.gui.callinfo.LOSS_RATE=Ниска стопа
 service.gui.callinfo.RTT=РТТ
 service.gui.callinfo.JITTER=Померање
@@ -659,9 +618,12 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=СРТП
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Кључ размене протокола
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE кандидат проширеног типа
 service.gui.callinfo.ICE_STATE=ICE обрада
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.RUNNING=Провера повезивања
 service.gui.callinfo.ICE_STATE.COMPLETED=Завршено
 service.gui.callinfo.ICE_STATE.FAILED=Неуспело
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Локални рачунар ИП / Порт
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Даљински пренета ИП / Порт
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Локални ИП / Порт
@@ -683,6 +645,8 @@ service.gui.CERT_DIALOG_TITLE=Преглед сертификата
 service.gui.CONTINUE_ANYWAY=Ипак настави
 service.gui.CERT_INFO_CHAIN=Ланац сертификата:
 service.gui.CERT_INFO_ISSUED_TO=Издато за
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Средње име:
 service.gui.CERT_INFO_O=Организација:
 service.gui.CERT_INFO_C=Назив државе:
@@ -701,12 +665,10 @@ service.gui.CERT_INFO_SIGN_ALG=Алгоритам потписа:
 service.gui.CERT_INFO_PUB_KEY_INFO=Подаци о јавном кључу
 service.gui.CERT_INFO_ALG=Алгоритам:
 service.gui.CERT_INFO_PUB_KEY=Јавни кључ:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} бајтова: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} битова
 service.gui.CERT_INFO_EXP=Изложилац:
 service.gui.CERT_INFO_KEY_SIZE=Величина кључа:
 service.gui.CERT_INFO_SIGN=Потпис:
-service.gui.CONTINUE=Настави
 service.gui.SHOW_CERT=Прикажи сертификат
 service.gui.HIDE_CERT=Сакриј сертификат
 
@@ -728,12 +690,9 @@ service.gui.security.SECURE_AUDIO=Бесбедан звук
 service.gui.security.AUDIO_NOT_SECURED=Звук није безбедан
 service.gui.security.SECURE_VIDEO=Безбедан видео
 service.gui.security.VIDEO_NOT_SECURED=Видео није безбедан
-service.gui.security.NO_VIDEO=Без видеа
-service.gui.security.CIPHER=Шифра: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Позив је безбедан. За више података притисни овде.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Позив није безбедан.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Притисни овде да упоредити безбедоносну тајну са партнером.
-service.gui.security.COMPARE_WITH_PARTNER=Упореди са партнером и кликни катанац за потврду.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Упореди са партнером:
 service.gui.security.SECURITY_ALERT=Покушавам да обезбедим позив. Искључење у
@@ -749,19 +708,13 @@ service.gui.avatar.imagepicker.CLICK=Клик и емотикон
 service.gui.avatar.imagepicker.IMAGE_FILES=Фајлови слика
 service.gui.avatar.imagepicker.IMAGE_PICKER=Слика
 service.gui.avatar.imagepicker.IMAGE_SIZE=Величина слике
-service.gui.avatar.imagepicker.INITIALIZING=Покрећем
 service.gui.avatar.imagepicker.RESET=Поврати
 service.gui.avatar.imagepicker.SET=Подеси
 service.gui.avatar.imagepicker.TAKE_PHOTO=Сними фотографију
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Грешка веб камере
 
 service.gui.security.encryption.required=Захтева се шифровање!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Грешка у СИП складишту контакт листи
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Ресурс се не чита {0}. За {1}
@@ -791,9 +744,7 @@ impl.ldap.QUERY_CUSTOM=Прилагођени упит
 impl.ldap.QUERY_CUSTOM_HINT=Користи {0} као чиновника за термин претраге.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Аутоматски додај џокере за термин упита
 impl.ldap.QUERY_PHOTO_INLINE=Донеси слику са другим атрибутима
-impl.ldap.NEW=Нова
 impl.ldap.EDIT=уреди
-impl.ldap.REMOVE=Уклони
 impl.ldap.ENABLED=Омогућен
 impl.ldap.SERVER_NAME=Име сервера
 impl.ldap.SERVER_NAME_EXAMPLE=Мој ЛДАП сервер
@@ -826,6 +777,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=кућнителефон
 impl.ldap.PHONE_PREFIX=Префикс телефона
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ex.: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Адресар
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Омогући претрагу за MacOSX адресар
@@ -839,9 +794,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Направи Outlook подр
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google контакти
-impl.googlecontacts.NEW=Ново
 impl.googlecontacts.EDIT=уреди
-impl.googlecontacts.REMOVE=Уклони
 impl.googlecontacts.ENABLED=Омогућен
 impl.googlecontacts.ACCOUNT_NAME=Име налога
 impl.googlecontacts.SAVE=Сачувај
@@ -879,11 +832,8 @@ plugin.accountinfo.ORGANIZATION=Назив организације:
 plugin.accountinfo.JOB_TITLE=Назив посла:
 plugin.accountinfo.ABOUT_ME=О мени:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Корисничке слике
 plugin.accountinfo.GLOBAL_ICON=Користи општу икону
 plugin.accountinfo.LOCAL_ICON=Користи ову икону:
-plugin.accountinfo.CHANGE=Промени
-plugin.accountinfo.ONLY_MESSAGE=Само поруке
 
 # connection info
 plugin.connectioninfo.TITLE=Инфо повезивања
@@ -903,49 +853,12 @@ plugin.aimaccregwizz.USERNAME=AIM надимак:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Надимак и лозинка
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Региструј нови налог
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=У случају да немате AIM налог, кликните на дугме за креирање новог.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Препиши подразумеване поставке сервера
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=О {0}
 plugin.branding.LOGO_MESSAGE=VoIP && инстант поруке отвореног кода
-plugin.branding.LOADING=Учитавам
 plugin.branding.ABOUT_MENU_ENTRY=&О
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>Тренутно {1} је под активним развојем. Верзија коју сте поктенули је експериментална и МОЖДА НЕЋЕ радити као што очекујете. Молим погледајте {2} за више информација.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Сва права задржана. Посетите <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> је дистрибуиран под условима LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Речници
-plugin.dictaccregwizz.ANY_DICTIONARY=Било који речник
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Било који речник од {0}
-plugin.dictaccregwizz.FIRST_MATCH=Први погодак
-plugin.dictaccregwizz.NO_MATCH=Без подударања
-plugin.dictaccregwizz.MATCH_RESULT=Без дефиниције нађене за "{0}", можда сте мислили:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Тренутни речник "{0}" не постоји било где на серверу.
-plugin.dictaccregwizz.INVALID_STRATEGY=Тренутна стратегија није доступна на серверу.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Протокол Dict сервиса
-plugin.dictaccregwizz.HOST=Рачунар
-plugin.dictaccregwizz.SERVER_INFO=Подаци сервера
-plugin.dictaccregwizz.STRATEGY_SELECTION=Strategy селекција
-plugin.dictaccregwizz.STRATEGY_LIST=Листа стратегија:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Претрага стратегија
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Стратегија се користи за тражење сличних речи, ако превод није пронађен, захваљујући различитим приступима. На пример, префикс стратегије ће потражити речи које почињу као реч коју би превели.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict подаци о налогу
-plugin.dictaccregwizz.FIRST_ACCOUNT=Чаробњак ће креирати ваш први Dict налог за dict.org.\n\nМожете додати нови речник преко чаробњака за регистрацију. Попуните поље са речником који желите да додате.
-plugin.dictaccregwizz.THREAD_CONNECT=Повезивање са сервером
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Неуспео покушај повезивања, то није dict сервер или је сервер ван мреже.
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Довлачим стратегије
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Стратегија није нађена на серверу
-plugin.dictaccregwizz.POPULATE_LIST=Листа насељавања
-plugin.dictaccregwizz.CLOSING_CONNECTION=Затварање повезивања
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Да би користили Facebook ћаскање потребно је креирати "Корисничко име" <br>на вашем "Подешавању налога" на Facebook.</a><br><br>Напомена: Кад креирате корисничко име морате се одјавити са веб стране <br>и то може потрајати пре него што се пријавите са својим новим корисничким именом!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Протокол Facebook ћаскања
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Корисничко име:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Корисничко име и лозинка
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Аутоматски покрени {0} када се рачунар поново покреће
@@ -956,9 +869,6 @@ plugin.generalconfig.SHOW_HISTORY=Прикажи
 plugin.generalconfig.HISTORY_SIZE=недавне поруке у новим ћаскањима
 plugin.generalconfig.SEND_MESSAGES_WITH=Пошаљи поруке са:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Постави напред прозор за ћаскање
-plugin.generalconfig.ERROR_PERMISSION=Немате довољно овлашћења у уклоните аутостарт
-plugin.generalconfig.TRANSPARENCY=Провидност
-plugin.generalconfig.ENABLE_TRANSPARENCY=Омогући провидност
 plugin.generalconfig.DEFAULT_LANGUAGE=Језик сучеља
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Ваше промене ће бити примењене при следећем покретању.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% преведено
@@ -1006,11 +916,9 @@ plugin.ircaccregwizz.IRC_SERVER=Сервер
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Користи безбедну везу
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=XMPP протокол
 plugin.jabberaccregwizz.USERNAME=XMPP надимак
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Потврди лозинку
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ИД или лозинка
 plugin.jabberaccregwizz.CSERVER=Сервер
 plugin.jabberaccregwizz.SERVER=Повезивање са сервером
 plugin.jabberaccregwizz.ENABLE_GMAIL_NOTIFICATIONS=Омогући Gmail обавештења за нове поруке
@@ -1025,13 +933,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Напомена
 plugin.jabberaccregwizz.RESOURCE=Ресурс
 plugin.jabberaccregwizz.AUTORESOURCE=Аутоматски генериши ресурсе
 plugin.jabberaccregwizz.PRIORITY=Приоритет
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP грешка
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Непозната XMPP грешка ({0}). Провери да ли је име сервера исправно.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Ваше лозинке се не подударају.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Препиши подразумеване поставке сервера
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Напредне поставке
 plugin.jabberaccregwizz.USE_ICE=Користи ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Користи Google's Jingle/ICE (експериментално)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Аутоматска претрага STUN/TURN сервера
 plugin.jabberaccregwizz.SUPPORT_TURN=TURN подршка
 plugin.jabberaccregwizz.TURN_USERNAME=TURN корисничко име
@@ -1055,11 +959,8 @@ plugin.jabberaccregwizz.ALLOW_NON_SECURE=Омогући небезбедна п�
 plugin.jabberaccregwizz.DTMF_AUTO=Ауто: одаберите аутоматски између RTP и Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Опције сервера
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Промени лозинку налога
-plugin.jabberaccregwizz.NEW_PASSWORD=Нова лозинка
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Потврди нову лозинку
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Молим попуните исправан број порта како би наставили.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Ваш налог мога бити пријављен пре промене лозинке.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Лозинка је празна.
 plugin.jabberaccregwizz.TLS_REQUIRED=Веза не користи TLS, неће покушати промену лозинке.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Лозинка је успешно промењена
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Ваш XMPP сервер не подржава промену лозинке.
@@ -1073,24 +974,9 @@ plugin.jabberaccregwizz.RESET=Поврати
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Ресетуј општа подешавања
 plugin.jabberaccregwizz.DISABLE_JINGLE=Онемогући Jingle (звучни и видо позиви са XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Одлазна порука:
-plugin.mailbox.INCOMING=Долазна порука:
-plugin.mailbox.MAX_MESSAGE_TIME=Максимално трајање долазних порука
-plugin.mailbox.CONFIRM=Потврди
-plugin.mailbox.DEFAULTS=Подразумевано
-plugin.mailbox.MAILBOX=Сандуче
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=МСН
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Протокол за повезивање и ћаскање на МСН сервису.
-plugin.msnaccregwizz.USERNAME=Е-пошта:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ИД и лозинка
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Инсталирај
 plugin.pluginmanager.UNINSTALL=Деинсталирај
-plugin.pluginmanager.UPDATE=Ажурирај
 plugin.pluginmanager.PLUGINS=Прикључци
 plugin.pluginmanager.URL=Адреса
 plugin.pluginmanager.CHOOSE_FILE=Одабери фајл
@@ -1115,7 +1001,6 @@ plugin.sipaccregwizz.SERVER_PORT=Порт сервера
 plugin.sipaccregwizz.PROXY=Прокси
 plugin.sipaccregwizz.PROXY_PORT=Прокси порт
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Жељени превоз
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Напредне опције
 plugin.sipaccregwizz.PROXY_OPTIONS=Опције проксија
 plugin.sipaccregwizz.PROXY_AUTO=Подеси прокси аутоматски
 plugin.sipaccregwizz.ENABLE_PRESENCE=Омогући присуство (ЈЕДНОСТАВНО)
@@ -1133,8 +1018,6 @@ plugin.sipaccregwizz.DTMF_METHOD=ДТМФ метод
 plugin.sipaccregwizz.DTMF_AUTO=Ауто: Одаберите аутоматски између RTP и Inband (без SIP инфа)
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP подаци
-plugin.sipaccregwizz.REGISTER=РЕГИСТАР
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Препиши подразумеване опције сервера
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Омогући подршку за заштићене позиве
 plugin.sipaccregwizz.AUTH_NAME=Име за пријаву
 plugin.sipaccregwizz.DISPLAY_NAME=Приказно име
@@ -1154,6 +1037,7 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Повера URI говорном по�
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Ваша лозинка се не подудара.
 plugin.sipaccregwizz.NO_CERTIFICATE=<ништа> (користи званичну идентификацију)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP индикација
+#used from SecurityPanel
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Изаберите омогућене протоколе шифровања и њихов приоритет (прво горњи протокол):
 plugin.sipaccregwizz.CIPHER_SUITES=Омогућено шифровање:
 plugin.sipaccregwizz.SHOW_ADVANCED=Напредна подешавања енкрипције
@@ -1166,15 +1050,6 @@ plugin.skinmanager.DEFAULT_SKIN=Подразумевани мотив
 plugin.skinmanager.ADD_NEW_SKIN=Додај нови мотив...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Подразумевани мотив апликације.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=ССХ
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Протокол за повезивање удаљеног рачунара преко ССХ.
-plugin.sshaccregwizz.USERNAME=ИД налога:
-plugin.sshaccregwizz.IDENTITY_FILE=Идентификациони фајл:
-plugin.sshaccregwizz.KNOWN_HOSTS=Позната имена рачунара:
-plugin.sshaccregwizz.OPTIONAL=Опционо
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Детаљи налога
-
 # status update
 plugin.autoaway.AUTO_STATUS=Аутоматска одсутност
 plugin.autoaway.ENABLE_CHANGE_STATUS=Промени статус у одсутности
@@ -1220,22 +1095,6 @@ plugin.whiteboard.DESELECT=Поништи избор
 plugin.whiteboard.DELETE=Обриши
 plugin.whiteboard.PROPERTIES=Својства
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Протоко за повезивање и ћаскање на Yahoo! сервису.
-plugin.yahooaccregwizz.USERNAME=Корисничко име:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ИД и лозинка
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Zeroconf (Bonjour) протокол сервиса.
-plugin.zeroaccregwizz.FIRST_NAME=Име:
-plugin.zeroaccregwizz.LAST_NAME=Презиме:
-plugin.zeroaccregwizz.EMAIL=Е-пошта:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Запамти Bonjour контакти?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ИД и Лозинка
-plugin.zeroaccregwizz.USERID=Корисников ИД
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Google Talk протокол
@@ -1249,19 +1108,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, ИП телекомуни
 plugin.iptelaccregwizz.USERNAME=Корисничко име
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Претплата на iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.подаци
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP и ћаскање
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Корисничко име
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Потврда лозинке
 plugin.sip2sipaccregwizz.EMAIL=Адреса е-поште
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=За помоћ за овај сервис посетите<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Адреса е-поште се користи за слање гласовних порука, <br>пропуштених позива и опоравак изгубљених лозинки</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>За помоћ у вези овог сервиса посетите <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Постојећи sip2sip.info налог
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Креирај бесплатан sip2sip.info налог
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && инстант поруке
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=За помоћ око овог сервиса посетите<br>http://ippi.fr
@@ -1270,6 +1121,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Постојећи ippi налог
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Креирај бесплатан ippi налог
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Затвори прозор за ћаскање
 plugin.keybindings.CHAT_COPY=Умножи
 plugin.keybindings.CHAT_CUT=Исеци
@@ -1292,10 +1144,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Име
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Примарна пречица
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Секундарна пречица
 plugin.keybindings.globalchooser.PRESS_BTN=Притисни за подешавање пречице
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Чекање
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Гурни за разговор
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Омогући детекцију специјалног кључа
 plugin.keybindings.PLUGIN_NAME=Пречице
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Ћаскање
 plugin.keybindings.MAIN=Главно
 plugin.keybindings.GLOBAL=Опште пречице
@@ -1323,6 +1175,7 @@ plugin.notificationconfig.tableheader.SOUND=Пусти звук преко ур�
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Пусти звук преко уређаја за емитовање
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Пусти збук преко ПЦ звучника
 plugin.notificationconfig.tableheader.DESCRIPTION=Опис догађаја
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Долазни позив
 plugin.notificationconfig.event.SecurityMessage=Безбедна порука
 plugin.notificationconfig.event.IncomingFile=Долазни фајл
@@ -1419,6 +1272,7 @@ impl.neomedia.configform.VIDEO=Видео
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Периодично освежавање
 impl.neomedia.configform.H264.defaultProfile=Подразумевани профил за декодирање у:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Подножје
 impl.neomedia.configform.H264.defaultProfile.high=Високо
 impl.neomedia.configform.H264.defaultProfile.main=Главно
@@ -1448,7 +1302,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Тренутна лози�
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Унеси нову лозинку:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Поново унеси лозинку:
 plugin.securityconfig.masterpassword.MP_TITLE=Главна лозинка
-plugin.securityconfig.masterpassword.MP_NOT_SET=(није подешено)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Нисте унели исправну главну лозинку. Молим пробајте поново.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Главна лозинка није исправна!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Неуспела промена лозинке
@@ -1464,7 +1317,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Лозинка
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(непознато)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(не може да дешифрује)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Сачуване лозинке
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Уклони
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Уклони све
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Да ли сте сигурни да желите да уклоните све лозинке?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Уклони све лозинке
@@ -1549,7 +1401,6 @@ plugin.globalproxy.PROXY_ADDRESS=Прокси сервер
 plugin.globalproxy.PROXY_PORT=Прокси порт
 plugin.globalproxy.PROXY_USERNAME=Прокси корисничко име
 plugin.globalproxy.PROXY_PASSWORD=Прокси лозинка
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Прокси ДНС
 plugin.globalproxy.FWD_DNS_ADDR=ДНС прокси адреса
@@ -1585,7 +1436,6 @@ plugin.provisioning.RESTART_WARNING=Напомена да ће промене б
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Умноћи UUID у клипборд
 plugin.provisioning.CLIPBOARD_FAILED=Неуспело умножавање UUID у клипборд
-plugin.provisioning.EXIT_ON_FAIL=Затвори апликацију ако не успе резервисање
 plugin.provisioning.CREDENTIALS=Последњи сачувани резервни акредитиви
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Да ли сте сигурни да желите да уклоните резервну лозинку?
 plugin.provisioning.PROV_FAILED=Резервисање није успело
@@ -1644,8 +1494,6 @@ net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult
 #plugin spellcheck
 plugin.spellcheck.TITLE=Провера писања и правописа
 plugin.spellcheck.MENU=Прикажи проверу писања и правописа
-plugin.spellcheck.LANG=Језик
-plugin.spellcheck.EDIT_PERSONAL_DICT=Уреди
 plugin.spellcheck.ENABLE_SPELL_CHECK=Омогући проверу правописа
 plugin.spellcheck.dialog.FIND=Пронађи следеће
 plugin.spellcheck.dialog.REPLACE=Замени
diff --git a/resources/languages/resources_sv.properties b/resources/languages/resources_sv.properties
index f0ce7a6..cd9ba06 100644
--- a/resources/languages/resources_sv.properties
+++ b/resources/languages/resources_sv.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Jag
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Registreringsguide
 service.gui.ACCOUNTS=Konton
 service.gui.ADD=&Lägg till
-service.gui.ADD_ACCOUNT=Lägg till konto
 service.gui.ADD_CONTACT=&Lägg till kontakt
 service.gui.ADD_AUTHORIZED_CONTACT=Lägg till {0} i din kontaktlista
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Lägg till kontakten i din kontaktlista
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Fel när kontakt lades till
 service.gui.ADD_CONTACT_EXIST_ERROR={0} finns redan i din kontaktlista.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Servern svarade inte vid begäran om att lägga till kontakten {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Kunde inte lägga till kontakt med id: {0}. Åtgärden stöds inte.
-service.gui.ADD_CONTACT_IDENTIFIER=Ange identifierare för den kontakt du vill lägga till i fältet nedan.
-service.gui.ADD_CONTACT_WIZARD=Guide för att lägga till kontakt
 service.gui.ADD_CONTACT_NOT_CONNECTED=Du måste vara ansluten för att lägga till kontakter. Logga in hos den valda leverantören och försök igen.
 service.gui.ADD_GROUP_LOCAL_ERROR=Kunde inte lägga till gruppnamnet: {0}. Problemet uppstod under en lokal I/O-åtgärd.
 service.gui.ADD_GROUP_EXIST_ERROR={0} finns redan i din kontaktlista. Välj ett annat gruppnamn.
 service.gui.ADD_GROUP_NET_ERROR=Kunde inte lägga till gruppnamnet: {0}. Problemet uppstod på grund av ett nätverksfel. Kontrollera din nätverksanslutning och försök igen.
 service.gui.ADD_GROUP_ERROR=Kunde inte lägga till grupp med namn: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Gruppnamnet får inte lämnas tomt.
-service.gui.ADD_GROUP=Skapa grupp
-service.gui.ADD_SUBCONTACT=&Lägg till underkontakt
 service.gui.ADDRESS=Adress
 service.gui.ADMINISTRATOR=administratör
 service.gui.ADVANCED=&Avancerat
-service.gui.ALL=&Alla
 service.gui.ALL_CONTACTS=&Alla kontakter
 service.gui.ALTERNATE_ADDRESS=Alternativ adress
 service.gui.APPLY=&Verkställ
@@ -65,7 +70,6 @@ service.gui.AT=på
 service.gui.AUTHORIZE=&Auktorisera
 service.gui.AUTHORIZATION_ACCEPTED={0} har godkänt din auktoriseringsbegäran.
 service.gui.AUTHENTICATION_FAILED=Autentisering av {0} misslyckades. Lösenordet är felaktigt.
-service.gui.AUTHENTICATION_REQUESTED=Auktorisering begärd
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Servern {0} begär att du autentiserar dig.
 service.gui.AUTHENTICATION_REJECTED={0} har nekat din begäran om auktorisering.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} autentisering
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=I nedanstående fält kan du ange ditt nya anv
 service.gui.CHANGE_NICKNAME_ERROR=Kunde inte byta användarnamn
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Användarnamnet finns redan
 service.gui.CHANGE_VIDEO_QUALITY=Ändra videokvalitet
-service.gui.CHAT_CONFERENCE_LABEL=Konferenser
 service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}s konferens
 service.gui.CHAT_ROOM_ALREADY_JOINED={0} är redan anslutet.
 service.gui.CHAT_ROOM_CONFIGURATION=Konfiguration för {0}
@@ -121,18 +124,14 @@ service.gui.CHAT_ROOM_USER_LEFT=har lämnat {0}
 service.gui.CHAT_ROOM_USER_KICKED=har kickats från {0}
 service.gui.CHAT_ROOM_USER_QUIT=har kopplat ner {0}
 service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=Skicka meddelanden är inte tillåtet (återkallat)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Sparar chattrummet för framtida bruk
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Ta bort markerat rum från listan över sparade chattrum
 service.gui.CHAT_ROOM_NAME=Namn på chattrum
 service.gui.CLEAR_CUSTOM_MESSAGES=Rensa anpassade meddelanden
 service.gui.ROOM_NAME=Chattrum
-service.gui.AUTOJOIN=Anslut automatiskt
 service.gui.CHANGE_PASSWORD=Ändra lösenord
 service.gui.CHAT_ROOM_NAME_INFO=Ange namnet på det chattrum du vill skapa, i nedanstående fält.
 service.gui.CHAT_ROOM_NOT_EXIST={0} kunde inte hittas på {1}. Kontrollera att du angett rätt namn.
 service.gui.CHAT_ROOM_NOT_CONNECTED=Du måste vara inloggad för att kunna ansluta till {0}.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Du måste vara inloggad för att kunna lämna ett chattrum.
-service.gui.CHAT_ROOM_NOT_JOINED=Du måste vara ansluten till ett chattrum för att kunna vidta ytterligare åtgärder med det.
 service.gui.CHAT_ROOM_OPTIONS=Alternativ för chattrum
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED={0} kräver registrering för att ansluta.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD=Chattrummet {0} begär ett lösenord.
@@ -151,22 +150,18 @@ service.gui.CLEAR=Rensa
 service.gui.CLOSE=St&äng
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=Det kom ett nytt meddelande för mindre än 2 sekunder sedan. Vill du verkligen stänga den här chatten?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=En eller flera filöverföringar pågår. Vill du verkligen avbryta?
-service.gui.CONFIRM=Bekräfta
 service.gui.CONNECTED_STATUS=Ansluten
 service.gui.CONNECTING=Ansluter...
 service.gui.CONNECTING_STATUS=Ansluter
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Ansluter*
 service.gui.CONNECTION=Anslutning
-service.gui.CONNECTION_FAILED_MSG=Anslutningen misslyckades för följande konto: {0}, Servernamn: {1}, Kontollera din nätverksanslutning eller kontakta din nätverksadministratör för mer information.
 service.gui.CONNECTION_EXPIRED_MSG=Du är för närvarande bortkopplad från servern {0}.
 service.gui.CONTACT_NAME=ID eller nummer
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY={0} saknar stöd för telefoni.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF={0} saknar stöd för chattkonferenser.
 service.gui.CONTACT_PAUSED_TYPING={0} tog paus i skrivandet
 service.gui.CONTACT_TYPING={0} skriver ett meddelande
 service.gui.CONTACT_TYPING_SEND_FAILED=öööh... vi kunde inte meddela {0} att du skrev
 service.gui.CONTACT_INFO=&Kontaktinfo
-service.gui.CONTACTLIST=Kontaktlista
 service.gui.CONTACTS=Kontakter
 service.gui.COPY=&Kopiera
 service.gui.COPY_LINK=Kopiera &länk
@@ -176,17 +171,14 @@ service.gui.CREATE_CHAT_ROOM=&Skapa chattrum...
 service.gui.CREATE_CHAT_ROOM_ERROR=Kunde inte skapa chattrummet {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Chattrumsguide
 service.gui.CREATE_CONFERENCE_CALL=&Skapa ett konferenssamtal...
-service.gui.CREATE_CONFERENCE_CHAT=&Skapa en konferenschatt...
 service.gui.CREATE_GROUP=&Skapa grupp...
 service.gui.CREATE_GROUP_NAME=Ange namnet på den grupp du vill skapa, i nedanstående fält.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Din kontaktlista innehåller inga grupper. Skapa en grupp först (Arkiv/Skapa grupp).
 service.gui.CREATE_VIDEO_BRIDGE=Skapa en &videolänk...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Skapa en &videolänk
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Skapa / Anslut videokonferens
 service.gui.CREATE_VIDEO_CONFERENCE=Skapa ny videkonferens för detta chattrum
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Den här kontakten saknar stöd för webbkontaktinfo
 service.gui.CUT=K&lipp ut
-service.gui.DATE=Datum
 service.gui.DELETE=Ta bort
 service.gui.DENY=&Neka
 service.gui.DESKTOP_SHARING_WARNING=<b>Vill du verkligen starta skärmdelning?</b> <br>Klickar du OK, kommer deltagare i den här konversationen att kunna se din skärm.
@@ -197,7 +189,6 @@ service.gui.DISCONNECTED_STATUS=Frånkopplad
 service.gui.DND_STATUS=Stör ej
 service.gui.DO_NOT_ASK_AGAIN=Fråga inte igen
 service.gui.DO_NOT_SHOW_AGAIN=Visa inte det här meddelandet igen
-service.gui.DOWNLOAD_NOW=&Ladda ner nu
 service.gui.DRAG_FOR_SHARING=Dra och släpp det du vill dela...
 service.gui.DURATION=varaktighet
 service.gui.DESTROY_CHATROOM=Ta bort chattrum
@@ -218,7 +209,6 @@ service.gui.ERROR_RECEIVED_FROM=Fel från {0}
 service.gui.ESTIMATED_TIME=Uppskattad tid:
 service.gui.EVENTS=Händelser
 service.gui.EXIT=A&vsluta
-service.gui.EXTENDED_CRITERIA=Utökade kriterier
 service.gui.GENERAL=Allmänt
 service.gui.GENERAL_ERROR=Allmänt fel
 service.gui.GROUP_NAME=Gruppnamn
@@ -260,7 +250,6 @@ service.gui.FONT_ITALIC=Kursiv
 service.gui.FONT_SIZE=Storlek
 service.gui.FONT_STYLE=Stil
 service.gui.FONT_UNDERLINE=Understruken
-service.gui.FROM={0} från {1}
 service.gui.GRANT_OWNERSHIP=Bevilja ägarskap...
 service.gui.GRANT_ADMIN=Bevilja administratörsbefogenhet...
 service.gui.GRANT_MODERATOR=Bevilja moderatorsbefogenhet
@@ -286,7 +275,6 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Vill du verkligen ta bort alla lokalt lag
 service.gui.HISTORY_REMOVE_ERROR=Kunde inte ta bort lokalt lagrade meddelanden.
 service.gui.HOME=Hem
 service.gui.HOME_PAGE=Hemsida
-service.gui.HOUR=Timma
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Identifierare
 service.gui.IGNORE=&Ignorera
@@ -310,13 +298,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Bjud in kontakter till videolänk
 service.gui.INVITE_REASON=Inbjudningsorsak
 service.gui.IS_CALLING={0} ringer...
 service.gui.IS_NOW={0} är nu {1}
-service.gui.JITSI_WARNING=SIP Communicator har nyligen bytt namn till Jitsi.<br/>Ladda ner Jitsi nu, om du vill att din version skall vara fortsatt aktuell.<br/><br/>Vi är ledsna för alla eventuella besvär som detta kan orsaka dig. <br/><br/>The Jitsi Dev Team
-service.gui.JITSI_WARNING_TITLE=SIP Communicator blir Jitsi
 service.gui.JOIN=&Anslut
 service.gui.JOIN_AS=A&nslut som
 service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=Anslut till en pågående videokonferens
 service.gui.JOIN_VIDEO=Anslut video
-service.gui.CLOSE_CHAT_ROOM_DIALOG=S&täng
 service.gui.JOB_TITLE=Yrkestitel
 service.gui.JOIN_CHAT_ROOM=&Anslut till chattrum...
 service.gui.JOIN_CHAT_ROOM_TITLE=Anslut till chattrum
@@ -329,7 +314,6 @@ service.gui.KICK_FAILED=Det gick inte att kicka
 service.gui.KICK_FAILED_GENERAL_ERROR=Kunde inte kicka {0}. Ett allmänt serverfel uppstod.
 service.gui.KICK_FAILED_NOT_ALLOWED=Kunde inte kicka {0}. Ägare och administratörer i chattrummet kan inte kickas.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS=Kunde inte kicka {0}. Du har inte tillräcklig behörighet för att göra det.
-service.gui.LAST=Senast
 service.gui.LAST_NAME=Senaste namnet
 service.gui.LEAVE=&Lämna
 service.gui.LIMIT_REACHED_FOR_IP=Du har för många befintliga registreringar från din IP-adress och servern {0} tillåter inte att du öppnar fler av dem.
@@ -349,7 +333,6 @@ service.gui.MESSAGE=Meddelande
 service.gui.MISSED_CALLS_TOOL_TIP=Missade samtal från:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= och {0} till
 service.gui.MODERATOR=moderator
-service.gui.MORE=Läs mer
 service.gui.MORE_LABEL=Mer
 service.gui.MOVE=Flytta
 service.gui.MOVE_SUBCONTACT=F&lytta kontakt
@@ -358,7 +341,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Den valda kontakten är densamma som källan.
 service.gui.MOVE_SUBCONTACT_QUESTION=Vill du verkligen flytta {0} till {1}?
 service.gui.MOVE_TO_GROUP=&Flytta till grupp
 service.gui.MOVE_CONTACT=Flytta kontakt
-service.gui.MOVE_CONTACT_ERROR=&Kontakten kan inte flyttas
 service.gui.MSG_DELIVERY_FAILURE=Meddelandet ovan kunde inte levereras
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Det protokoll du använder, stöder inte offline-meddelanden. Du kan försöka nå {0} genom ett annat protokoll eller vänta tills han/hon är online.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Ett internt fel uppstod. Det är troligen en bugg. Rapportera den gärna här: https://jitsi.org/Development/BugsAndIssues.
@@ -372,7 +354,6 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=Du måste vara ansluten för att skicka
 service.gui.MULTIPLE_LOGINS=Du har loggat in mer än en gång med samma konto. Följande konto är nu nerkopplat: Användarnamn: {0}, Servernamn: {1}
 service.gui.MY_CHAT_ROOMS=Lägg till chattrum
 service.gui.MY_CHAT_ROOMS_TITLE=Lägg till chattrum
-service.gui.MUTE=Ljud av
 service.gui.MUTUALLY_ON_HOLD_STATUS=Ömsesidigt parkerad
 service.gui.NAME=Namn
 service.gui.NETWORK=Nätverk
@@ -404,7 +385,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Inte på kontaktlistan
 service.gui.SD_QUALITY=Standardkvalitet
 service.gui.OFFLINE=Offline
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Äldre samtal
 service.gui.ONLINE=Online
 service.gui.OPEN=Öppna
 service.gui.OPEN_FILE_FROM_IMAGE=Dubbelklicka för att öppna en fil.
@@ -416,7 +396,6 @@ service.gui.OPEN_ON_ACTIVITY=Öppna vid aktivitet
 service.gui.OPEN_ON_MESSAGE=Öppna enbart vid nytt meddelande
 service.gui.OPEN_ON_IMPORTANT_MESSAGE=Öppna enbart vid viktiga meddelanden
 service.gui.OR=eller
-service.gui.OR_ENTER_PHONE_NUMBER=Eller ange telefonnummer här...
 service.gui.ORGANIZATION=Organisation
 service.gui.OTHER=Annat
 service.gui.chat.role.OWNER=Ägare
@@ -442,7 +421,6 @@ service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Retur' för förslag
 service.gui.PRESS_FOR_CALL_INFO=Tryck för samtalsinfo
 service.gui.PRESS_TO_OPEN_CRM=Klicka för att öppna CRM-program
 service.gui.PREVIOUS=Föregående
-service.gui.PREVIOUS_TOOLTIP=Bläddra bland äldre konversationer
 service.gui.PRINT=&Skriv ut
 service.gui.PROACTIVE_NOTIFICATION=skriver ett meddelande
 service.gui.PROBLEMS_ENCOUNTERED=Problem som uppstått
@@ -458,7 +436,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Du har kopplat ner och återanslutit fö
 service.gui.RE_REQUEST_AUTHORIZATION=Begär auktorisering igen
 service.gui.REFERRED_STATUS=Hänvisning
 service.gui.REJECT=&Avböj
-service.gui.REMIND_ME_LATER=Påminn mig senare
 service.gui.REMEMBER_PASSWORD=Kom ihåg lösenordet
 service.gui.REMOVE=&Ta bort
 service.gui.REMOVE_ACCOUNT=&Ta bort konto
@@ -484,29 +461,20 @@ service.gui.REVOKE_ADMIN=Återkalla administratörstatus
 service.gui.REVOKE_MODERATOR=Återkalla moderatorstatus
 service.gui.REVOKE_MEMBERSHIP=Återkalla medlemskap
 service.gui.REVOKE_VOICE=Återkalla röst
-service.gui.ROOT_GROUP=Root-grupp
 service.gui.SAVE=&Spara
-service.gui.SAVE_AS_DEFAULT=Spara som standard
 service.gui.SEARCH=&Sök
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Klicka på knappen nedan för att visa alla chattrum på den valda servern. Markera sedan det du vill ansluta till, och tryck på 'Anslut'.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Sökt kontakt
 service.gui.SECURITY=Säkerhet
-service.gui.SELECT_ACCOUNT=Välj konto
 service.gui.SELECT_COLOR=Välj färg
 service.gui.SELECT_GROUP=Välj grupp
-service.gui.SELECT_GROUP_WIZARD_MSG=Nedanstående lista innehåller alla grupper i din kontaktlista. Välj i vilken grupp du vill lägga till den nya kontakten.
 service.gui.SELECT_NO_GROUP=Ingen grupp
-service.gui.SELECT_GROUP_WIZARD=Specificera grupp
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Nedanstående lista innehåller alla konton som stöder fleranvändarchatt. Välj vilket du vill använda för att skapa ditt chattrum.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Nedanstående lista innehåller alla registrerade konton. Välj vilket du vill använda för att kommunicera med den nya kontakten.
-service.gui.SELECT_PROVIDERS_WIZARD=Välj konto
 service.gui.SELECT_VIDEO_CONFERENCE=Välj videokonferens
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=Välj chatt från listan och tryck OK för att lägga till den.
 service.gui.SEND=&Skicka
 service.gui.SEND_FILE=Skicka &fil
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Det finns ingen info om den här kontakten.
 service.gui.SEND_MESSAGE=&Skicka ett meddelande
-service.gui.SEND_AS_SMS=Skicka som SMS
 service.gui.SEND_PRIVATE_MESSAGE=Skicka privat meddelande
 service.gui.SEND_SMS=S&kicka SMS
 service.gui.SEND_SMS_DETAILS=Kom ihåg att du måste ange numret i internationellt format med inledande landskod (+46 för Sverige). Exempel: +4670123456
@@ -545,7 +513,6 @@ service.gui.STREET=Gatuadress
 service.gui.SUBJECT=Ämne
 service.gui.SUMMARY=Sammandrag
 service.gui.TELEPHONY=Telefoni
-service.gui.TODAY=I dag
 service.gui.TOOLS=&Verktyg
 service.gui.TRANSFER=&Överför
 service.gui.TO=&Till:
@@ -555,7 +522,6 @@ service.gui.TRANSFER_CALL_TO=Överför till:
 service.gui.TRANSPARENCY_NOT_ENABLED=Transparens stöds inte av din aktuella konfiguration.
 service.gui.TYPE_YOUR_REQUEST=Ange din begäran här
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Videokvaliteten kunde inte ändras för det här samtalet.
-service.gui.UNMUTE=Ljud på
 service.gui.USER_IDENTIFIER=Användaridentifierare:
 service.gui.USER_EXISTS_ERROR=Den här användaren finns redan på det valda nätverket. Välj annan användare eller nätverk.
 service.gui.USERNAME_NULL=Ange användarnamn och lösenord.
@@ -568,7 +534,6 @@ service.gui.USE_PROVISIONING=Använd online-etablering
 service.gui.VALUE=Värde
 service.gui.VIDEO_CALL=&Videosamtal
 service.gui.VIA=via
-service.gui.VIA_SMS=Via SMS
 service.gui.VIEW=&Visa
 service.gui.VIEW_HISTORY=Visa &historik
 service.gui.VIEW_SMILEYS=Visa &smileys
@@ -588,9 +553,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Justera volymen
 service.gui.WAITING_AUTHORIZATION=Väntar på auktorisation
 service.gui.WARNING=Varning
 service.gui.YES=Ja
-service.gui.YESTERDAY=I går
-service.gui.EXISTING_ACCOUNT_ERROR=Kontot du angett är redan installerat.
-service.gui.NEW_MAIL=<b>Du har ett nytt e-postmeddelande!</b><br/><b>Från:</b> {0} {1} <br/><b>Ämne:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Det finns ett nytt e-postmeddelande i din {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Det finns {2} nya e-postmeddelande i din {0} <a href="{1}">inbox</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=ett till oläst meddelande i din <a href="{0}">inbox</a>.<br/>
@@ -602,6 +564,8 @@ service.gui.ENTER_FULL_SCREEN_TOOL_TIP=Helskärmsläge
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=Fönsterläge
 service.gui.HOLD_BUTTON_TOOL_TIP=Parkera/Återuppta
 service.gui.MUTE_BUTTON_TOOL_TIP=Använd paus eller parkeringsknappen för att aktivera/avaktivera mikrofonljudet
+service.gui.PARK=Parkera
+service.gui.PARK_BUTTON_TOOL_TIP=Parkera samtal
 service.gui.RECORD_BUTTON_TOOL_TIP=Spela in/Stoppa
 service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=Video på/av
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=Visa/Dölj lokal video
@@ -614,7 +578,6 @@ service.gui.SECURITY_ERROR=Säkerhetsfel
 service.gui.SPEED=Hastighet:
 service.gui.SILENT_MEMBER=tyst medlem
 service.gui.NON_SECURE_CONNECTION=Säker anslutning kan inte skapas för {0}. Om du vill ansluta till en icke säker server, måste du bocka för "Tillåt osäkra anslutningar" i dina kontoinställningar
-service.gui.UPDATE=Uppdatera
 service.gui.MOBILE_PHONE=Mobil
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=Arbete
@@ -649,12 +612,10 @@ service.gui.callinfo.CALL_INFORMATION=Samtalsinformation
 service.gui.callinfo.CALL_IDENTITY=Identitet
 service.gui.callinfo.PEER_COUNT=Antal deltagare
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Konferensfokus
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Kryptering aktiverad
 service.gui.callinfo.CALL_TRANSPORT=Signalerar samtalsöverföring
 service.gui.callinfo.CALL_DURATION=Samtalets varaktighet
 service.gui.callinfo.TLS_PROTOCOL=TLS-protokoll
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS-chifferlista
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=Certifikatkedja för TLS-server
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=Innehållet i TLS servercertifikatet visas nedan.
 service.gui.callinfo.VIEW_CERTIFICATE=Visa certifikat
 service.gui.callinfo.CODEC=Codec /Frekvens
@@ -664,7 +625,6 @@ service.gui.callinfo.AUDIO_INFO=Ljudinfo
 service.gui.callinfo.VIDEO_INFO=Videoinfo
 service.gui.callinfo.LOCAL_IP=Lokalt IP / Port
 service.gui.callinfo.REMOTE_IP=Fjärr-IP / Port
-service.gui.callinfo.BANDWITH=Bandbredd
 service.gui.callinfo.LOSS_RATE=Förlustfrekvens
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Jitter
@@ -674,10 +634,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Key exchange protocol
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE-kandidat utökad typ
 service.gui.callinfo.ICE_STATE=ICE processtatus
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Insamlingskandidater
 service.gui.callinfo.ICE_STATE.RUNNING=Anslutningskontroller
 service.gui.callinfo.ICE_STATE.COMPLETED=Slutförd
 service.gui.callinfo.ICE_STATE.FAILED=Misslyckades
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Lokalt värd-IP / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Lokalt reflexivt IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Lokalt reläat IP / Port
@@ -698,11 +661,12 @@ service.gui.ALWAYS_TRUST=Lita alltid på det här certifikatet
 service.gui.CERT_DIALOG_TITLE=Verifiera certifikat
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} kan inte verifiera serverns identitet vid anslutning till<br><b>{1}</b>.<br><br>Certifikatet är inte betrott, vilket innebär att serverns identitet inte kan verifieras automatiskt<br><br>Vill du tillåta anslutningen?<br>Klicka på ''Visa certifikat'' för mer information.</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} kan inte verifiera serverns certifikat.<br><br>Certifikatet är inte betrott, vilket innebär att serverns identitet inte kan verifieras automatiskt. <br>Vill du tillåta anslutningen?<br><br>Klicka på ''Visa certifikat'' för mer information.</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} kan inte verifiera identiteten för anslutande klient.<br><br>Certifikatet är inte betrott, vilket innebär att klientens identitet inte kan<br>verifieras automatiskt. Vill du tillåta anslutningen?<br><br>Klicka på ''Visa certifikat'' för mer information.</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} kan inte verifiera identiteten för {1}.<br><br>Certifikatet är inte betrott, vilket innebär att peer-identitet inte kan<br>verifieras automatiskt. Vill du tillåta anslutningen?<br><br>Klicka på ''Visa certifikat'' för mer information.</html>
 service.gui.CONTINUE_ANYWAY=Fortsätt ändå
 service.gui.CERT_INFO_CHAIN=Certifikatkedja:
 service.gui.CERT_INFO_ISSUED_TO=Utfärdat till
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Nätverksnamn:
 service.gui.CERT_INFO_O=Organisation:
 service.gui.CERT_INFO_C=Land:
@@ -721,12 +685,10 @@ service.gui.CERT_INFO_SIGN_ALG=Signaturalgoritm:
 service.gui.CERT_INFO_PUB_KEY_INFO=Information om publik nyckel
 service.gui.CERT_INFO_ALG=Algoritm:
 service.gui.CERT_INFO_PUB_KEY=Publik nyckel:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} byte: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bitar
 service.gui.CERT_INFO_EXP=Exponent:
 service.gui.CERT_INFO_KEY_SIZE=Nyckelstorlek:
 service.gui.CERT_INFO_SIGN=Signatur:
-service.gui.CONTINUE=Fortsätt
 service.gui.SHOW_CERT=Visa certifikat
 service.gui.HIDE_CERT=Dölj certifikat
 
@@ -749,12 +711,9 @@ service.gui.security.SECURE_AUDIO=Säker ljudlänk
 service.gui.security.AUDIO_NOT_SECURED=Ljudlänk ej säker
 service.gui.security.SECURE_VIDEO=Säker videolänk
 service.gui.security.VIDEO_NOT_SECURED=Videolänk ej säker
-service.gui.security.NO_VIDEO=Ingen video
-service.gui.security.CIPHER=Kryptering: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Samtalsöverföring säker. Klicka här för mer information.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Samtalsöverföring ej säker.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Tryck här för att jämföra säkerhetssträng med din partner.
-service.gui.security.COMPARE_WITH_PARTNER=Jämför med din partner och klicka på hänglåset för att bekräfta.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Jämför med partner:
 service.gui.security.STRING_COMPARED=Autentiseringssträngar jämförda!
@@ -772,20 +731,14 @@ service.gui.avatar.imagepicker.CLICK=Klicka ock le
 service.gui.avatar.imagepicker.IMAGE_FILES=Bildfiler
 service.gui.avatar.imagepicker.IMAGE_PICKER=Bild
 service.gui.avatar.imagepicker.IMAGE_SIZE=Bildstorlek
-service.gui.avatar.imagepicker.INITIALIZING=Påbörjar
 service.gui.avatar.imagepicker.RESET=Återställ
 service.gui.avatar.imagepicker.SET=Verkställ
 service.gui.avatar.imagepicker.TAKE_PHOTO=Ta ett foto
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Webbkamerafel
 
 service.gui.security.encryption.required=Kryptering krävs!
 
 service.protocol.ICE_FAILED=Kunde inte upprätta anslutningen (ICE misslyckades och ingen relay hittades)
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Fel i lagringen av SIP-kontaktlista
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Resursen kan inte läsas {0}. För {1}
@@ -815,9 +768,7 @@ impl.ldap.QUERY_CUSTOM=Anpassad fråga
 impl.ldap.QUERY_CUSTOM_HINT=Använd {0} som platshållare för sökbegreppet.
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=Lägg automatiskt till jokertecken till sökbegreppet
 impl.ldap.QUERY_PHOTO_INLINE=Hämta bild tillsammans med övriga attribut
-impl.ldap.NEW=Nytt
 impl.ldap.EDIT=Redigera
-impl.ldap.REMOVE=Ta bort
 impl.ldap.ENABLED=Aktiverad
 impl.ldap.SERVER_NAME=Servernamn
 impl.ldap.SERVER_NAME_EXAMPLE=Min LDAP-server
@@ -850,6 +801,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=Hemtelefon
 impl.ldap.PHONE_PREFIX=Telefonprefix
 impl.ldap.PHONE_PREFIX_EXAMPLE=Exempel: 00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Adressbok
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Aktivera Mac OS X adressboksökning
@@ -864,9 +819,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=Gör Outlook till förvald e-po
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google-kontakter
-impl.googlecontacts.NEW=Nytt
 impl.googlecontacts.EDIT=Redigera
-impl.googlecontacts.REMOVE=Ta bort
 impl.googlecontacts.ENABLED=Aktiverad
 impl.googlecontacts.ACCOUNT_NAME=Kontonamn
 impl.googlecontacts.SAVE=Spara
@@ -905,11 +858,8 @@ plugin.accountinfo.ORGANIZATION=Organisation:
 plugin.accountinfo.JOB_TITLE=Titel:
 plugin.accountinfo.ABOUT_ME=Om mig:
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=Användarbilder
 plugin.accountinfo.GLOBAL_ICON=Använd standardbild
 plugin.accountinfo.LOCAL_ICON=Använd denna bild:
-plugin.accountinfo.CHANGE=Ändra
-plugin.accountinfo.ONLY_MESSAGE=Endast meddelanden
 
 # connection info
 plugin.connectioninfo.TITLE=Anslutningsinformation
@@ -929,49 +879,13 @@ plugin.aimaccregwizz.USERNAME=AIM skärmnamn:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Skärmnamn och lösenord
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Registrera nytt konto
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Om du inte har något AIM-konto kan du klicka på denna knapp och skapa ett nytt.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Åsidosätt serverns standardalternativ
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Om {0}
 plugin.branding.LOGO_MESSAGE=VoIP && IM som öppen källkod
-plugin.branding.LOADING=Läser in
 plugin.branding.ABOUT_MENU_ENTRY=&Om
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} är under aktiv utveckling. Versionen du kör är endast experimentell och KANSKE INTE fungerar som förväntat. Se {2} för mer information.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>. Alla rättigheter reserverade. Besök <a href="https://jitsi.org">https://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> distribueras under villkoren för LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Ordböcker
-plugin.dictaccregwizz.ANY_DICTIONARY=Valfri ordbok
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Valfri ordbok från {0}
-plugin.dictaccregwizz.FIRST_MATCH=Första träffen
-plugin.dictaccregwizz.NO_MATCH=Inga träffar
-plugin.dictaccregwizz.MATCH_RESULT=Inga definitioner hittades för "{0}", du kanske menade:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Ordboken "{0}" finns inte längre på den här servern.
-plugin.dictaccregwizz.INVALID_STRATEGY=Aktuell strategi är inte tillgänglig på den här servern
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Dict-protokollet
-plugin.dictaccregwizz.HOST=Värd
-plugin.dictaccregwizz.SERVER_INFO=Serverinformation
-plugin.dictaccregwizz.STRATEGY_SELECTION=Strategival
-plugin.dictaccregwizz.STRATEGY_LIST=Strategilista:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Sökstrategier
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Strategi används för att söka efter liknande ord, om en översättning inte hittas tack vare olika synsätt. Som exempel, kommer prefixstrategierna att söka efter ord med samma inledning som det ord du vill översätta.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict-kontoinformation
-plugin.dictaccregwizz.FIRST_ACCOUNT=Den här guiden kommer att skapa ditt första Dict-konto på dict.org.\n\nDu kan lägga till nya ordböcker via kontoregistreringsguiden. I värdfältet anger du vilka ordböcker du vill lägga till.
-plugin.dictaccregwizz.THREAD_CONNECT=Försöker ansluta till servern
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Anslutningsförsöket misslyckades. Det här är ingen Dict-server eller servern är offline.
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Hämtar strategier
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Ingen strategi hittades på servern
-plugin.dictaccregwizz.POPULATE_LIST=Fyller listan
-plugin.dictaccregwizz.CLOSING_CONNECTION=Stänger anslutningen
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">För att använda Facebook-chatten måste du skapa ett "Användarnamn" <br>via dina "Kontoinställningar" på Facebook.</a><br><br>OBS! När du skapar användarnamn måste du logga ut från webbsidan <br>och det kan ta en stund innan du kan logga in med ditt nya användarnamn!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Facebook chattprotokoll
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Användarnamn:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Användarnamn och lösenord
+
+plugin.busylampfield.PICKUP=Återuppta samtal
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Starta {0} automatiskt vid systemstart
@@ -982,9 +896,6 @@ plugin.generalconfig.SHOW_HISTORY=Visa
 plugin.generalconfig.HISTORY_SIZE=tidigare meddelanden i nya chattar
 plugin.generalconfig.SEND_MESSAGES_WITH=Skicka meddelanden med:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Visa chattfönster överst
-plugin.generalconfig.ERROR_PERMISSION=Du har inte tillräcklig behörighet för att ta bort autostart
-plugin.generalconfig.TRANSPARENCY=Transparens
-plugin.generalconfig.ENABLE_TRANSPARENCY=Aktivera transparens
 plugin.generalconfig.DEFAULT_LANGUAGE=Språk
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Ändringar verkställs vid nästa programstart.
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% översatt
@@ -1043,13 +954,13 @@ plugin.ircaccregwizz.EXAMPLE_SERVER=T.ex. chat.freenode.net
 plugin.ircaccregwizz.USE_SECURE_CONNECTION=Använd säker anslutning
 plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=Aktivera kontaktnärvaro
 plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=Möjliggör närvaro i chattrum
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} autentisering
+plugin.ircaccregwizz.SASL_USERNAME=Användarnamn
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=XMPP-protokollet
 plugin.jabberaccregwizz.USERNAME=XMPP användarnamn
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Bekräfta lösenord
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=ID och lösenord
 plugin.jabberaccregwizz.CSERVER=Server
 plugin.jabberaccregwizz.SERVER=Anslut server
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Aktivera "Håll vid liv"
@@ -1065,13 +976,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Kommentar
 plugin.jabberaccregwizz.RESOURCE=Resurs
 plugin.jabberaccregwizz.AUTORESOURCE=Autogenerera resurs
 plugin.jabberaccregwizz.PRIORITY=Prioritet
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP-fel
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Okänt XMPP-fel ({0}). Kontrollera att servernamnet är rätt.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Dina lösenord är inte lika.
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Åsidosätt serverns standardalternativ
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Avancerat
 plugin.jabberaccregwizz.USE_ICE=Använd ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Använd Googles Jingle/ICE (Experimentell)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Hitta STUN-/TURN-servrar automatiskt
 plugin.jabberaccregwizz.SUPPORT_TURN=Stöd TURN
 plugin.jabberaccregwizz.TURN_USERNAME=TURN-användarnamn
@@ -1099,11 +1006,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=Inaktivera meddelandekopia
 plugin.jabberaccregwizz.DTMF_AUTO=Auto: Välj automatiskt mellan RTP och In-band
 plugin.jabberaccregwizz.SERVER_OPTIONS=Serveralternativ
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Ändra kontolösenord
-plugin.jabberaccregwizz.NEW_PASSWORD=Nytt lösenord
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Bekräfta nytt lösenord
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Ange ett giltigt portnummer för att fortsätta.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Kontot var inloggat före lösenordsändringen.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Lösenord saknas.
 plugin.jabberaccregwizz.TLS_REQUIRED=Anslutningen använder inte TLS. Lösenordsändring kommer inte att utföras.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Lösenordet har ändrats
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Din XMPP-server stöder inte lösenordsändring.
@@ -1117,25 +1021,9 @@ plugin.jabberaccregwizz.RESET=Återställ
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Återställ till globala inställningar
 plugin.jabberaccregwizz.DISABLE_JINGLE=Inaktivera Jingle (röst och videosamtal med XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Utgående meddelande:
-plugin.mailbox.INCOMING=Inkommande meddelande:
-plugin.mailbox.WAIT_TIME=Fördröjning innan samtal vidarekopplas till röstbrevlåda
-plugin.mailbox.MAX_MESSAGE_TIME=Maxlängd på inkommande meddelande
-plugin.mailbox.CONFIRM=Bekräfta
-plugin.mailbox.DEFAULTS=Standard
-plugin.mailbox.MAILBOX=Brevlåda
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Protokoll för att ansluta och chatta på MSN.
-plugin.msnaccregwizz.USERNAME=E-post:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID och lösenord
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Installera
 plugin.pluginmanager.UNINSTALL=Avinstallera
-plugin.pluginmanager.UPDATE=Uppdatera
 plugin.pluginmanager.PLUGINS=Insticksprogram
 plugin.pluginmanager.URL=URL
 plugin.pluginmanager.CHOOSE_FILE=Välj fil
@@ -1160,7 +1048,6 @@ plugin.sipaccregwizz.SERVER_PORT=Serverport
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxyport
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Föredragen transport
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Avancerat
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxyalternativ
 plugin.sipaccregwizz.PROXY_AUTO=Automatiska proxyinställningar
 plugin.sipaccregwizz.ENABLE_PRESENCE=Aktivera närvaro (ENKEL)
@@ -1180,8 +1067,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Auto: Välj automatiskt mellan RTP och In-band (i
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP-INFO
 plugin.sipaccregwizz.DTMF_INBAND=In-band
-plugin.sipaccregwizz.REGISTER=REGISTRERA
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Åsidosätt serverns standardalternativ
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Aktivera stöd för samtalskryptering
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Indikera stöd för ZRTP i signalprotokoll
 plugin.sipaccregwizz.AUTH_NAME=Auktoriseringsnamn
@@ -1202,10 +1087,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Adress till röstbrevlåda
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Dina lösenord är olika.
 plugin.sipaccregwizz.NO_CERTIFICATE=<none> (använd reguljär autentisering)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP-indikation
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Av (indikera endast RTP/AVP) 
 plugin.sipaccregwizz.SAVP_OPTION_1=Obligatorisk (erbjud och acceptera endast RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Tillval (erbjud RTP/SAVP först, sen RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Aktivera S-Descriptor (också känd som SDES eller SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Välj aktiverade krypteringsprotokoll och dess prioritet (översta protokollet först):
 plugin.sipaccregwizz.CIPHER_SUITES=Aktiverade krypteringssviter:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} försöker automatiskt säkra alla dina samtal med ZRTP och du kommer att både se och höra ett meddelande när en säker anslutning etablerats. Du bör inte ändra nedanstående avancerade inställningar om du inte vet exakt vad du gör.</div></html>
@@ -1219,15 +1104,6 @@ plugin.skinmanager.DEFAULT_SKIN=Standardtema
 plugin.skinmanager.ADD_NEW_SKIN=Lägg till nytt tema...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Standardtema för programmet.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Protokoll för att ansluta till fjärrdatorer över SSH.
-plugin.sshaccregwizz.USERNAME=Konto-ID:
-plugin.sshaccregwizz.IDENTITY_FILE=Identitetsfil:
-plugin.sshaccregwizz.KNOWN_HOSTS=Kända värdar:
-plugin.sshaccregwizz.OPTIONAL=Tillval
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Kontoinformation
-
 # status update
 plugin.autoaway.AUTO_STATUS=Auto-status
 plugin.autoaway.ENABLE_CHANGE_STATUS=Ändra status vid "Ej närvarande"
@@ -1275,22 +1151,6 @@ plugin.whiteboard.DESELECT=Avmarkera
 plugin.whiteboard.DELETE=Ta bort
 plugin.whiteboard.PROPERTIES=Egenskaper
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Protokoll för att ansluta och chatta på Yahoo!
-plugin.yahooaccregwizz.USERNAME=Användarnamn:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID och lösenord
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Protokoll för Zeroconf (Bonjour).
-plugin.zeroaccregwizz.FIRST_NAME=Förnamn:
-plugin.zeroaccregwizz.LAST_NAME=Efternamn:
-plugin.zeroaccregwizz.EMAIL=E-post:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Kom ihåg Bonjour-kontakter?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID och lösenord
-plugin.zeroaccregwizz.USERID=Användar-ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Google Talk-protokollet
@@ -1304,19 +1164,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, IP Telecommunications Por
 plugin.iptelaccregwizz.USERNAME=Användarnamn
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Abonnera på iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP och chat
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Användarnamn
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Upprepa lösenordet
 plugin.sip2sipaccregwizz.EMAIL=E-postadress
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=För hjälp med den tjänsten, besök<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>E-postadressen används för att skicka röstmeddelanden,<br>meddelanden om missade samtal och för att återställa förlorade lösenord</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>För hjälp med den här tjänsten, besök <a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Befintligt sip2sip-konto
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Skapa ett gratis sip2sip-konto
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Snabbmeddelande
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=För hjälp med den tjänsten, besök<br>http://ippi.fr
@@ -1325,6 +1177,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Befintligt ippi-konto
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Skapa ett gratis ippi-konto
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Stäng chattfönstret
 plugin.keybindings.CHAT_COPY=Kopiera
 plugin.keybindings.CHAT_CUT=Klipp ut
@@ -1347,10 +1200,10 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Namn
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Primär genväg
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Sekundär genväg
 plugin.keybindings.globalchooser.PRESS_BTN=Tryck för att ange genväg
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Väntar
 plugin.keybindings.globalchooser.PUSH_TO_TALK=Tryck för att prata
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Aktivera snabbtangentupptäckt
 plugin.keybindings.PLUGIN_NAME=Snabbtangenter
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Chatt
 plugin.keybindings.MAIN=Grundläggande
 plugin.keybindings.GLOBAL=Globala genvägar
@@ -1378,6 +1231,7 @@ plugin.notificationconfig.tableheader.SOUND=Spela upp ett ljud genom meddelandee
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Spela upp ett ljud genom uppspelningsenheten
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Spela upp ett ljud genom datorhögtalarna
 plugin.notificationconfig.tableheader.DESCRIPTION=Händelsebeskrivning
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Inkommande samtal
 plugin.notificationconfig.event.SecurityMessage=Säkerhetsmeddelande
 plugin.notificationconfig.event.IncomingFile=Inkommande fil
@@ -1479,6 +1333,7 @@ impl.neomedia.configform.VIDEO=Video
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=Periodic Intra Refresh
 impl.neomedia.configform.H264.defaultProfile=Standardprofil för kodning:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Bas
 impl.neomedia.configform.H264.defaultProfile.high=Hög
 impl.neomedia.configform.H264.defaultProfile.main=Medel
@@ -1509,7 +1364,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Aktuellt lösenord:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Ange nytt lösenord:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Upprepa lösenordet:
 plugin.securityconfig.masterpassword.MP_TITLE=Masterlösenord
-plugin.securityconfig.masterpassword.MP_NOT_SET=(ej angivet)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Du angav inte rätt Masterlösenord. Försök igen.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Masterlösenordet är felaktigt!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Lösenordsändringen misslyckades
@@ -1525,7 +1379,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Lösenord
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(okänd)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(kan inte dekryptera)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Lagrade lösenord
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Ta bort
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Ta bort alla
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Vill du verkligen ta bort alla lösenord?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Ta bort alla lösenord
@@ -1621,7 +1474,6 @@ plugin.globalproxy.PROXY_PORT=Port
 plugin.globalproxy.PROXY_USERNAME=Användarnamn
 plugin.globalproxy.PROXY_PASSWORD=Lösenord
 plugin.globalproxy.DESCRIPTION={0} kommer att använda ovanstående proxyinställningar för alla nätverk du ansluter till, från och med nu.\nProxy-stödet är fortfarande experimentellt och fungerar bara med vissa protokoll. Se nedanstående tabell för ytterligare info:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=Också proxy-DNS
 plugin.globalproxy.FWD_DNS_NOTE=Användbart med Tor. Hjälper dig att undvika DNS-läckage genom att vidarebefordra all DNS-trafik till Tor-proxyn. Kräver omstart.
@@ -1659,7 +1511,6 @@ plugin.provisioning.RESTART_WARNING=Notera att dina ändringar verkställs förs
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Kopiera UUID till Urklipp
 plugin.provisioning.CLIPBOARD_FAILED=Kunde inte kopiera UUID till Urklipp
-plugin.provisioning.EXIT_ON_FAIL=Avsluta programmet om nättjänsten misslyckas
 plugin.provisioning.CREDENTIALS=Senast lagrade nättjänstreferenser
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Vill du verkligen ta bort nättjänstlösenordet?
 plugin.provisioning.PROV_FAILED=Nättjänsten misslyckades
@@ -1726,8 +1577,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} har försökt ansluta till se
 #plugin spellcheck
 plugin.spellcheck.TITLE=Stavning och gramatik
 plugin.spellcheck.MENU=Visa stavning och gramatik
-plugin.spellcheck.LANG=Språk
-plugin.spellcheck.EDIT_PERSONAL_DICT=Redigera
 plugin.spellcheck.ENABLE_SPELL_CHECK=Aktivera stavningskontroll
 plugin.spellcheck.dialog.FIND=Sök nästa
 plugin.spellcheck.dialog.REPLACE=Ersätt   
diff --git a/resources/languages/resources_tr.properties b/resources/languages/resources_tr.properties
index 474bf3a..1fc3ca6 100644
--- a/resources/languages/resources_tr.properties
+++ b/resources/languages/resources_tr.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -26,52 +37,49 @@
 # ant -Duser.language=xx run
 
 service.gui.ABOUT=Hakkında
-service.gui.ACCEPT=Cevapla
+service.gui.ACCEPT=&Kabul Et
 service.gui.ACCOUNT=Hesap
 service.gui.ACCOUNT_ME=Kendim
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Hesap Kayıt Sihirbazı
 service.gui.ACCOUNTS=Hesaplar
 service.gui.ADD=Ekle
-service.gui.ADD_ACCOUNT=Hesap Ekle
 service.gui.ADD_CONTACT=Kişi Ekle
 service.gui.ADD_AUTHORIZED_CONTACT={0} Kişilere ekle
-service.gui.ADD_CONTACT_TO=Şuraya Kişi Ekle
-service.gui.ADD_CONTACT_ERROR={0} nolu kişi ekleyemedi
+service.gui.ADD_CONTACT_TO_CONTACTLIST=Bu numarayı kişilere ekle
+service.gui.ADD_CONTACT_TO=Kişi ekle
+service.gui.ADD_CONTACT_ERROR={0} nolu kişi eklenemedi
 service.gui.ADD_CONTACT_ERROR_TITLE=Kişi Ekleme Hatası
 service.gui.ADD_CONTACT_EXIST_ERROR={0} zaten kişi listesinde var.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Sunucu {0} nolu kişiyi ekleme isteğine cevap vermedi.
-service.gui.ADD_CONTACT_NOT_SUPPORTED={0} nolu kişi ekleyemedi. İşlem desteklenmiyor.
-service.gui.ADD_CONTACT_IDENTIFIER=Eklemek istediğiniz kişinin tanıtıcı kimliğini aşağıdaki bölüme giriniz.
-service.gui.ADD_CONTACT_WIZARD=Kişi Ekleme Sihirbazı
+service.gui.ADD_CONTACT_NOT_SUPPORTED={0} nolu kişi eklenemedi. İşlem desteklenmiyor.
 service.gui.ADD_CONTACT_NOT_CONNECTED=Kişi eklemek için bağlı olmalısınız. Lütfen seçili sağlayıcıya giriş yapın ve tekrar deneyin.
-service.gui.ADD_GROUP_LOCAL_ERROR={0} isimli grubu ekleyemedi. Yerel yazım işlemi sırasında bir hata oluştu.
-service.gui.ADD_GROUP_EXIST_ERROR={0} isimli grup zaten arkadaş listesinde mevcut. Lütfen başka bir grup ismi seçiniz.
+service.gui.ADD_GROUP_LOCAL_ERROR={0} isimli grup eklenemedi. Yerel Giriş/Çıkış işlemi sırasında bir hata oluştu.
+service.gui.ADD_GROUP_EXIST_ERROR={0} isimli grup zaten kişi listesinde mevcut. Lütfen başka bir grup ismi seçiniz.
 service.gui.ADD_GROUP_NET_ERROR={0} isimli grubu ekleyemedi. Ağ bağlantısından dolayı bir hata oluştu. Lütfen ağ bağlantınızı kontrol edin ve tekrar deneyin.
 service.gui.ADD_GROUP_ERROR={0} isimli grubu ekleyemedi.
 service.gui.ADD_GROUP_EMPTY_NAME=Grup ismi boş olamaz.
-service.gui.ADD_GROUP=Grup oluştur
-service.gui.ADD_SUBCONTACT=İkincil Kişi Ekle
 service.gui.ADDRESS=Adres
 service.gui.ADMINISTRATOR=yönetici
 service.gui.ADVANCED=Gelişmiş
-service.gui.ALL=Hepsi
 service.gui.ALL_CONTACTS=Bütün kişiler
+service.gui.ALTERNATE_ADDRESS=İkinci adres
 service.gui.APPLY=Uygula
-service.gui.ARE_CALLING=arıyor...
+service.gui.ARE_CALLING={0} arıyor...
 service.gui.ARE_NOW=Siz şu an {0}
 service.gui.AT=de
 service.gui.AUTHORIZE=Yetkilendir
-service.gui.AUTHORIZATION_ACCEPTED=kişi sizin izin isteğinizi kabul etti.
+service.gui.AUTHORIZATION_ACCEPTED={0}, yetkilendirme isteğinizi kabul etti.
 service.gui.AUTHENTICATION_FAILED=Kimlik {0} için başarısız oldu. Girdiğiniz şifre geçerli değil.
-service.gui.AUTHENTICATION_REQUESTED=Onay istendi
 service.gui.AUTHENTICATION_REQUESTED_SERVER={0} sunucusu sizin onaylanmanızı istiyor.
-service.gui.AUTHENTICATION_REJECTED=kişi sizin izin isteğinizi reddetti.
+service.gui.AUTHENTICATION_REJECTED={0}, yetkilendirme isteğinizi reddetti.
 service.gui.AUTHENTICATION_WINDOW_TITLE={0} onaylama
 service.gui.AUTHORIZATION_REQUESTED=İzin istendi
-service.gui.AUTHORIZATION_REQUESTED_INFO={0} arkadaş sizin izninizi istiyor.
+service.gui.AUTHORIZATION_REQUESTED_INFO={0} kişi sizin izninizi istiyor.
 service.gui.AUTHORIZATION_RESPONSE=İzin cevabı
 service.gui.AWAY_STATUS=Dışarda
+service.gui.EXTENDED_AWAY_STATUS=Uzun Süre Uzakta
 service.gui.BAN=Yasakla
+service.gui.BANNED=yasaklı
 service.gui.BAN_FAILED=Yasaklanamandı
 service.gui.BAN_FAILED_GENERAL_ERROR={0} yasaklanamadı. Genel bir sunucu hatası oluştu.
 service.gui.BAN_FAILED_NOT_ALLOWED={0} yasaklanamadı. Oda sahibi ve oda yöneticisi yasaklanamaz.
@@ -81,13 +89,17 @@ service.gui.BROWSE=Göz at
 service.gui.BUSY_MESSAGE=Üzgünüm, şu an meşgulum.
 service.gui.BUSY_STATUS=Meşgul
 service.gui.CALL=Ara
-service.gui.CALL_CONTACT=Kişi ara
+service.gui.CALL_CONTACT=Kişiyi ara
 service.gui.CALL_FAILED=Arama başarısız oldu
 service.gui.CALL_HISTORY_TOOL_TIP=Arama geçmişi için buraya tıkla
+service.gui.CALL_HISTORY_GROUP_NAME=Arama geçmişi
 service.gui.CALL_VIA=Bunla ara:
 service.gui.CALL_NAME_OR_NUMBER=İsim veya numara gir
 service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=Bu arama sadece {0} ağından katılımcıları ve sizin {1} hesabınızı destekler. {2} bu ağdan veya hesabınızdan adres içermemektedir.
 service.gui.CALL_WITH=Şununla ara
+service.gui.CALL_NO_AUDIO_DEVICE=Yapılandırılmış bir ses aygıtınız yok.
+service.gui.CALL_NO_AUDIO_CODEC=Yapılandırılmış bir ses çözücünüz yok.
+service.gui.CALL_NO_DEVICE_CODECS_Q=Aramayı sürdürmek ister misiniz?
 service.gui.CANCEL=İptal et
 service.gui.CHAT=Sohbet
 service.gui.CHANGE_FONT=Fontu değiştir
@@ -96,10 +108,13 @@ service.gui.CHANGE_ROOM_SUBJECT_LABEL=Aşağıdaki bölümde, odanın yeni konus
 service.gui.CHANGE_NICK=Takma ismi değiştir
 service.gui.CHANGE_NICKNAME=Takma ismi değiştir...
 service.gui.CHANGE_NICKNAME_LABEL=Aşağıdaki bölümde, yeni takma isminizi girebilirsiniz.
-service.gui.CHANGE_VIDEO_QUALITY=Video kalitesini değişitir
+service.gui.CHANGE_NICKNAME_ERROR=Takma adı değiştirirken sorun oluştu
+service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Takma ad zaten var
+service.gui.CHANGE_VIDEO_QUALITY=Uzak video kalitesini değiştir
+service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}''ın konferansı
 service.gui.CHAT_ROOM_ALREADY_JOINED={0} sohbet odasına zaten katılındı.
-service.gui.CHAT_ROOM_CONFIGURATION={0} sohbet odası konfigürasyonu
-service.gui.CHAT_ROOM_CONFIGURATION_FAILED={0} sohbet odası konfigürasyon formu alınamadı.
+service.gui.CHAT_ROOM_CONFIGURATION={0} sohbet odası ayarları
+service.gui.CHAT_ROOM_CONFIGURATION_FAILED={0} sohbet odası ayarları formu alınamadı.
 service.gui.CHAT_ROOM_CONFIGURATION_SUBMIT_FAILED={0} sohbet odası konfigürasyonu kaydedilirken bir hata oluştu.
 service.gui.CHAT_ROOM_USER_JOINED={0} katıldı
 service.gui.CHAT_ROOM_USER_LEFT={0} ayrıldı
@@ -108,18 +123,16 @@ service.gui.CHAT_ROOM_USER_QUIT={0} çıktı
 service.gui.CHAT_ROOM_NAME=Sohbet odası ismi
 service.gui.CLEAR_CUSTOM_MESSAGES=Kişiselleştirilmiş mesajları temizle
 service.gui.ROOM_NAME=Sohbet Odası
-service.gui.AUTOJOIN=Otomatik katıl
 service.gui.CHANGE_PASSWORD=Şİfre değiştir
 service.gui.CHAT_ROOM_NAME_INFO=Aşağıdaki bölümde, oluşturmak istediğiniz sohbet odasının ismini giriniz.
 service.gui.CHAT_ROOM_NOT_EXIST={0} odası {1} sunucusunda bulunamadı. Lütfen girdiğiniz ismin doğruluğunu kontrol ediniz
 service.gui.CHAT_ROOM_NOT_CONNECTED={0} sohbet odasına katılabilmek için önce oturum açmalısınız.
 service.gui.CHAT_ROOM_LEAVE_NOT_CONNECTED=Sohbet odasından ayrılabilmek için önce oturum açmalısınız.
-service.gui.CHAT_ROOM_NOT_JOINED=Bir sohbet odasında işlem yapmak için önce o odaya katılmanız gerekir.
 service.gui.CHAT_ROOM_OPTIONS=Sohbet odası seçenekleri
 service.gui.CHAT_ROOM_REGISTRATION_REQUIRED={0} sohbet odası katılmak için kayıt gerektirmektedir.
 service.gui.CHAT_ROOM_REQUIRES_PASSWORD={0} sohbet odası şifre gerektirmektedir.
 service.gui.CHAT_ROOMS=Sohbet odaları
-service.gui.CHAT_ROOM=Sohbet odaları
+service.gui.CHAT_ROOM=Sohbet odası
 service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} konuyu {1}"e çevirdi.
 service.gui.CHOOSE_CONTACT=Kişi seç
 service.gui.CHOOSE_ACCOUNT=Lütfen listedeki hesaplardan birini seçiniz
@@ -130,22 +143,18 @@ service.gui.CLEAR=Temizle
 service.gui.CLOSE=Kapat
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=2 saniyeden az bir süre önce bir mesaj aldınız? Bu sohbeti kapatmak istiyor musunuz?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=Aktif dosya transferleriniz var. Bunları iptal etmek istiyor musunuz?
-service.gui.CONFIRM=Onayla
 service.gui.CONNECTED_STATUS=Bağlandı
 service.gui.CONNECTING=Bağlanıyor...
 service.gui.CONNECTING_STATUS=Bağlantı
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Bağlanıyor*
 service.gui.CONNECTION=Bağlantı
-service.gui.CONNECTION_FAILED_MSG=Bu hesap için bağlantı sağlanmadı: Kullanıcı adı: {0}, Sunucu adı: {1}. Lütfen ağ bağlantılarınızı kontrol ediniz veya daha fazla bilgi için ağ yöneticinizle görüşünüz.
 service.gui.CONNECTION_EXPIRED_MSG={0} sunucusundan koptunuz.
 service.gui.CONTACT_NAME=ID veya Numara
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Seçilen {0} kişinin telefonu desteklemiyor.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Seçilen {0} kişi sohbeti desteklemiyor.
 service.gui.CONTACT_PAUSED_TYPING={0} mesaj yazmaya ara verdi
 service.gui.CONTACT_TYPING={0} mesaj yazıyor
 service.gui.CONTACT_TYPING_SEND_FAILED=eyvah... {0}'a yazmakta olduğunuzu söyleyemedik
 service.gui.CONTACT_INFO=Kişi bilgisi
-service.gui.CONTACTLIST=Kişilistesi
 service.gui.CONTACTS=Kişiler
 service.gui.COPY=Kopyala
 service.gui.COPY_LINK=Linki kopyala
@@ -155,25 +164,21 @@ service.gui.CREATE_CHAT_ROOM=Sohbet odası oluştur...
 service.gui.CREATE_CHAT_ROOM_ERROR={0} sohbet odası oluşturulamadı.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Sohbet odası sihirbazı oluştur
 service.gui.CREATE_CONFERENCE_CALL=Konferans arama oluştur...
-service.gui.CREATE_CONFERENCE_CHAT=Konferans sohbet oluştur...
 service.gui.CREATE_GROUP=Grup oluştur...
 service.gui.CREATE_GROUP_NAME=Aşağıdaki bölümde oluşturmak istediğiniz grubun adını giriniz.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Kişi listeniz hiç grup içermemektedir. Lütfen önce bir grup oluşturunuz(Dosya/Grup Oluştur).
 service.gui.CREATE_VIDEO_BRIDGE=Bir &video köprüsü oluştur...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Bir &video köprüsü oluştur
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Bu kişi  ağ arkadaş bilgisini desteklememektedir
 service.gui.CUT=Kes
-service.gui.DATE=Tarih
 service.gui.DELETE=Sil
 service.gui.DENY=Reddet
-service.gui.DESKTOP_SHARING_WARNING=<b>Ekran paylaşımını başlatmak istediğinizden emin misiniz</b> <br> Tamam'a basmak bu aramadaki insanların ekranınızı görmesini sağlar
+service.gui.DESKTOP_SHARING_WARNING=<b>Ekran paylaşımını başlatmak istediğinizden emin misiniz</b> <br> Bu aramadaki insanların ekranınızı görmesi için Tamam''a tıklayın.
 service.gui.DIALPAD=Tuş takımı
 service.gui.DISPLAY_NAME=Gösterilen isim
 service.gui.DISCONNECTED_STATUS=Bağlantı kesildi
 service.gui.DND_STATUS=Rahatsız etme
 service.gui.DO_NOT_ASK_AGAIN=Tekrar sorma
 service.gui.DO_NOT_SHOW_AGAIN=Bu mesajı tekrar gösterme
-service.gui.DOWNLOAD_NOW=Şimdi indir
 service.gui.DRAG_FOR_SHARING=Buraya paylaşmak istediğinizi sürükleyerek bırakınız....
 service.gui.DURATION=süre
 service.gui.EDIT=Düzenle
@@ -190,7 +195,6 @@ service.gui.ERROR_WAS={0} hatası çıktı
 service.gui.ESTIMATED_TIME=Tahmin edilen süre:
 service.gui.EVENTS=Aktiviteler
 service.gui.EXIT=Çık
-service.gui.EXTENDED_CRITERIA=Genişletilmiş kriter
 service.gui.GENERAL=Genel
 service.gui.GENERAL_ERROR=Genel Hata
 service.gui.GROUP_NAME=Grup ismi
@@ -224,7 +228,7 @@ service.gui.FOLDER_DOES_NOT_EXIST=Bu dosyayı içeren dizin bulunamadı. Silinmi
 service.gui.FOLDER_OPEN_FAILED=Dizin açılamadı.
 service.gui.FOLDER_OPEN_NO_PERMISSION=Bu dizini açmak için yeterli izniniz yok. Lütfen okuma izinlerinizi kontrol edip tekrar deneyiniz.
 service.gui.FOLDER_OPEN_NO_APPLICATION=Bu dizini açabilecek program bulunamadı.
-service.gui.FONT=Punto
+service.gui.FONT=Yazıtipi
 service.gui.FONT_BOLD=Kalın
 service.gui.FONT_COLOR=Renk
 service.gui.FONT_FAMILY=Aile
@@ -246,14 +250,15 @@ service.gui.HIDE_OFFLINE_CONTACTS=Çevrimdışı kişileri gizle
 service.gui.HIDE_MAIN_WINDOW=<DIV>X pencere butonuna tıklamak programı kapatmaz, sadece gizler.<BR> Eğer kapatmak istiyorsanız Dosya/Çık seçilmeli.</DIV>
 service.gui.HISTORY=Geçmiş
 service.gui.HISTORY_CONTACT=Geçmiş - {0}
+service.gui.HISTORY_ERASE_PER_CHATROOM=Bu sohbet odasındaki bütün eski yazışmaları sil
 service.gui.HOME=Ev
 service.gui.HOME_PAGE=Ana sayfa
-service.gui.HOUR=Saat
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Belirleyici kimlik
 service.gui.IGNORE=Yoksay
 service.gui.INSERT_SMILEY=Gülücük koy
 service.gui.INCOMING_CALL={0}"dan gelen arama alındı
+service.gui.INCOMING_SCREEN_SHARE={0}''dan gelen ekran paylaşımı alındı
 service.gui.INCOMING_CALL_STATUS=Gelen arama
 service.gui.INSTANT_MESSAGINGS=IM'ler
 service.gui.INITIATING_CALL_STATUS=Başlatılan arama
@@ -267,13 +272,10 @@ service.gui.INVITE_CONTACT_TO_CHAT=Kişileri sohbete davet et
 service.gui.INVITE_CONTACT_TO_CALL=Kişileri konuşmaya davet et
 service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Kişileri video köprüsüne davet et
 service.gui.INVITE_REASON=Davet nedeni
-service.gui.IS_CALLING=arıyor...
+service.gui.IS_CALLING={0} arıyor...
 service.gui.IS_NOW={0} şu an {1}
-service.gui.JITSI_WARNING=SIP Communicatorın ismi Jitsi olarak değişti.<br/>Eğer sürümünüzü güncellemek istiyorsanız Jitsi'yi indirebilirsiniz..<br/><br/>Sizi rahatsız ettiğimiz için özür dileriz.<br/><br/>The Jitsi Dev Team
-service.gui.JITSI_WARNING_TITLE=SIP Communicator Jitsi oluyor
 service.gui.JOIN=Katıl
 service.gui.JOIN_AS=Şu şekilde katıl
-service.gui.CLOSE_CHAT_ROOM_DIALOG=Kapat
 service.gui.JOB_TITLE=İş tanımı
 service.gui.JOIN_CHAT_ROOM=Sohbet odasına katıl...
 service.gui.JOIN_CHAT_ROOM_TITLE=Sohbet odasına katıl
@@ -284,11 +286,10 @@ service.gui.KICK_FAILED=Atma başarısız
 service.gui.KICK_FAILED_GENERAL_ERROR={0} atılamadı. Genel bir sunucu hatası oluştu.
 service.gui.KICK_FAILED_NOT_ALLOWED={0} atılamadı. Odanın sahibi ve yöneticisi atılamaz.
 service.gui.KICK_FAILED_NOT_ENOUGH_PERMISSIONS={0} atılamadı. Bu yapmak için yeterli izniniz yok.
-service.gui.LAST=Son
 service.gui.LAST_NAME=Soyad
 service.gui.LEAVE=Terk et
 service.gui.LIMIT_REACHED_FOR_IP=Yerel IP adresinden çok fazla kaydınız var ve {0} sunucusu daha fazla açmanıza izin vermeyecek.
-service.gui.LIST=Son
+service.gui.LIST=Listele
 service.gui.LOADING_ROOMS=Odalar yükleniyor...
 service.gui.LOADING=Yükleniyor...
 service.gui.LOCALLY_ON_HOLD_STATUS=Yerel olarak beklemede
@@ -304,8 +305,7 @@ service.gui.MESSAGE=Mesaj
 service.gui.MISSED_CALLS_TOOL_TIP=Cevapsız çağrılar:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= ve {0} daha fazla
 service.gui.MODERATOR=moderatör
-service.gui.MORE=Daha fazla gör
-service.gui.MORE_LABEL=Taşı
+service.gui.MORE_LABEL=Daha
 service.gui.MOVE=Taşı
 service.gui.MOVE_SUBCONTACT=Kişi taşı
 service.gui.MOVE_SUBCONTACT_MSG=Seçtiğiniz kişiyi taşıyacağınız kişi veya grup seçiniz.
@@ -313,7 +313,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Seçtiğiniz kişi taşımak istediğiniz ki�
 service.gui.MOVE_SUBCONTACT_QUESTION={0}"ı {1}"e taşımak istediğinizden emin misiniz?
 service.gui.MOVE_TO_GROUP=Gruba taşı
 service.gui.MOVE_CONTACT=Kişi Taşı
-service.gui.MOVE_CONTACT_ERROR=Kişi taşınamaz
 service.gui.MSG_DELIVERY_FAILURE=Yukarıdaki mesaj iletilemedi
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Kullandığınız protokol çevrimdışı mesajları desteklememektedir. {0}'a başka bir protokolden ulaşmayı deneyebilir veya kişi çevrimiçi olana kadar bekleyebilirsiniz.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Dahili bir hata oluştu. Bu büyük bir ihtimalle program hatası. Lütfen şuraya bildiriniz: http://jitsi.org/index.php/Development/BugAndIssues.
@@ -324,7 +323,6 @@ service.gui.MSG_NOT_POSSIBLE=Mesajlaşma bu kişi için imkansız(protokol taraf
 service.gui.MSG_RECEIVED={0} yazdı
 service.gui.MSG_SEND_CONNECTION_PROBLEM=Mesaj gönderebilmek için çevrimiçi olmalısınız.
 service.gui.MULTIPLE_LOGINS=Aynı hesap ile birden fazla oturum açtınız. Şu hesabın bağlantısı koptu: Kullanıcı adı: {0}, Sunucu adı: {1}.
-service.gui.MUTE=Sessiz
 service.gui.MUTUALLY_ON_HOLD_STATUS=Sessizce beklemede
 service.gui.NAME=İsim
 service.gui.NETWORK=Ağ
@@ -335,6 +333,7 @@ service.gui.NEW_MESSAGE=Yeni mesaj
 service.gui.NEW_NAME=Yeni isim
 service.gui.NEW_STATUS_MESSAGE=Yeni durum mesajı
 service.gui.NEW_STATUS_MESSAGE_SAVE=Kişiselleştirilmiş mesaj olarak kaydet
+service.gui.NICKNAME=Rumuz
 service.gui.NO=Hayır
 service.gui.NONE=Hiç
 service.gui.NO_CAMERA_AVAILABLE=Kamera yok
@@ -353,8 +352,7 @@ service.gui.NON_EXISTING_USER_ID={0} sunucusu belirtilen kullanıcı numarasın�
 service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Kişilistesindedeğil
 service.gui.SD_QUALITY=Standart kalite
 service.gui.OFFLINE=Çevrimdışı
-service.gui.OK=Tamam
-service.gui.OLDER_CALLS=Daha eski aramalar
+service.gui.OK=&Tamam
 service.gui.ONLINE=Çevrimiçi
 service.gui.OPEN=Aç
 service.gui.OPEN_FILE_FROM_IMAGE=Dosyayı açmak için çift tıklayınız.
@@ -362,9 +360,12 @@ service.gui.OPEN_FOLDER=Dizini aç
 service.gui.OPEN_IN_BROWSER=Web tarayıcısında aç
 service.gui.OPTIONS=Ayarlar
 service.gui.OR=veya
-service.gui.OR_ENTER_PHONE_NUMBER=Veya telefon numarasını buraya giriniz...
 service.gui.ORGANIZATION=Organizasyon
 service.gui.OTHER=Diğer
+service.gui.chat.role.ADMINISTRATOR=Yönetici
+service.gui.chat.role.MODERATOR=Moderatör
+service.gui.chat.role.MEMBER=Üye
+service.gui.chat.role.SILENT_MEMBER=Sessiz üye
 service.gui.OWNER=odanın sahibi
 service.gui.PASSWORD=Şifre
 service.gui.PASSWORD_CHANGE_FAILURE=Şifre değiştirme başarısız oldu
@@ -378,7 +379,6 @@ service.gui.PRESENCE=Durum
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS=Öneriler için 'Enter'
 service.gui.PRESS_FOR_CALL_INFO=Arama bilgisi için tıkla
 service.gui.PREVIOUS=Önceki
-service.gui.PREVIOUS_TOOLTIP=Daha eski konuşmalara göz at
 service.gui.PRINT=Yazdır
 service.gui.PROACTIVE_NOTIFICATION=mesaj yazıyor
 service.gui.PROTOCOL=Protokol
@@ -391,7 +391,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Çok hızlı bir şekilde sunucudan kopu
 service.gui.RE_REQUEST_AUTHORIZATION=Re-İzin iste
 service.gui.REFERRED_STATUS=Başvuruldu
 service.gui.REJECT=Reddet
-service.gui.REMIND_ME_LATER=Daha sonra hatırlat
 service.gui.REMEMBER_PASSWORD=Şifreyi hatırla
 service.gui.REMOVE=Sil
 service.gui.REMOVE_ACCOUNT=Hesabı sil
@@ -416,27 +415,18 @@ service.gui.REVOKE_ADMIN=Yöneticiliği geri al
 service.gui.REVOKE_MODERATOR=Moderatörlüğü geri al
 service.gui.REVOKE_MEMBERSHIP=Üyeliği geri al
 service.gui.REVOKE_VOICE=Sesi geri al
-service.gui.ROOT_GROUP=Temel grup
 service.gui.SAVE=Kaydet
-service.gui.SAVE_AS_DEFAULT=Varsayılan olarak kaydet
 service.gui.SEARCH=Ara
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Seçili sunucudaki bütün sohbet odalarını listelemek için aşağıdaki butona tıklayınız. Daha sonra katılmak istediğinizi seçiniz ve katıl butonuna tıklayınız
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Kişi arandı
 service.gui.SECURITY=Güvenlik
-service.gui.SELECT_ACCOUNT=Hesap seç
 service.gui.SELECT_COLOR=Renk seç
 service.gui.SELECT_GROUP=Grup seç
-service.gui.SELECT_GROUP_WIZARD_MSG=Aşağıdaki liste sizin kişi listenizdeki bütün grupları içermektedir. Yeni kişi eklemek istediğiniz grubu seçiniz.
 service.gui.SELECT_NO_GROUP=Grup yok
-service.gui.SELECT_GROUP_WIZARD=Grubu belirtiniz
 service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=Aşağıdaki liste çoklu kullanıcı sohbet modunu destekleyen bütün hesapları göstermektedir. Sohbet odası oluştururken kullanmak istediğiniz bir hesap seçiniz.
-service.gui.SELECT_PROVIDERS_WIZARD_MSG=Aşağıdaki liste bütün kayıtlı hesapları içermektedir. Yeni kişi ile iletişim kurmak için kullanacağınız bir hesap seçiniz.
-service.gui.SELECT_PROVIDERS_WIZARD=Hesap seç
 service.gui.SEND=Gönder
 service.gui.SEND_FILE=Dosya gönder
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=Bu arkadaş için bilgi yok.
 service.gui.SEND_MESSAGE=Mesaj gönder
-service.gui.SEND_AS_SMS=SMS olarak gönder
 service.gui.SEND_SMS=SMS gönder
 service.gui.SEND_SMS_DETAILS=Numarayı uluslararası formatta gireceğinizi unutmayın örneğin Birleşik Krallık için +44 ile başlıyor +447777000000
 service.gui.SEND_SMS_NOT_SUPPORTED=Seçtiğiniz protokol SMS mesajlarını desteklemiyor.
@@ -471,7 +461,6 @@ service.gui.STREET=Sokak
 service.gui.SUBJECT=Konu
 service.gui.SUMMARY=Özet
 service.gui.TELEPHONY=Telefon
-service.gui.TODAY=Bugün
 service.gui.TOOLS=Araçlar
 service.gui.TRANSFER=Transfer
 service.gui.TO=Şu kişiye:
@@ -481,7 +470,6 @@ service.gui.TRANSFER_CALL_TO=Şu kişiye transfer et:
 service.gui.TRANSPARENCY_NOT_ENABLED=Saydamlık şuanki konfigürasyonunuz tarafından desteklenmemektedir.
 service.gui.TYPE_YOUR_REQUEST=İsteğinizi buraya giriniz
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Bu çağrı için video kalitesini değiştiremiyoruz
-service.gui.UNMUTE=Sessiz modunu kapat
 service.gui.USER_IDENTIFIER=Kullanıcı tanıtıcı kimlik:
 service.gui.USER_EXISTS_ERROR=Bu kullanıcı seçilen ağda zaten mevcut. Lütfen başka bir kullanıcı veya ağ seçiniz.
 service.gui.USERNAME_NULL=Lütfen kullanıcı adınızı ve şifrenizi doldurunuz
@@ -490,9 +478,8 @@ service.gui.UNKNOWN=Bilinmeyen kullanıcı
 service.gui.UNKNOWN_STATUS=Bilinmeyen durum
 service.gui.UNREGISTERED_MESSAGE=Şu hesaba bağlanılamadı: Kullanıcı adı : {0}, Sunucu adı: {1}. Şu an çevrimdışısınız.
 service.gui.USE_PROVISIONING=Online provizyon kullan
-service.gui.VALUE=Değer:
+service.gui.VALUE=Değer
 service.gui.VIDEO_CALL=Video araması
-service.gui.VIA_SMS=SMS ile gönder
 service.gui.VIEW=Görünüm
 service.gui.VIEW_HISTORY=Geçmiş görünümü
 service.gui.VIEW_SMILEYS=Yüzler görünümü
@@ -512,9 +499,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Ses ayarla
 service.gui.WAITING_AUTHORIZATION=Yetki için bekleniyor
 service.gui.WARNING=Uyarı
 service.gui.YES=Evet
-service.gui.YESTERDAY=Dün
-service.gui.EXISTING_ACCOUNT_ERROR=Girdiğiniz hesap zaten yüklendi.
-service.gui.NEW_MAIL=<b>Bir yeni maliniz var!</b><br/><b>Den:</b> {0} {1} <br/><b>Konu:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Sizin {0} <a href="{1}">gelen kutunuzda</a>, yeni bir mail mesajı aldınız:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Sizin {0} <a href="{1}">gelen kutunuzda</a>, {2} tane yeni mail mesajı aldınız:<br/>
 service.gui.NEW_GMAIL_FOOTER=Sizin <a href="{0}">gelen kutunuzda</a> bir tane daha okunmamış konuşma bulunmaktadır.<br/>
@@ -537,7 +521,6 @@ service.gui.SECURITY_ERROR=Güvenlik hatası
 service.gui.SPEED=Hız:
 service.gui.SILENT_MEMBER=sessiz üye
 service.gui.NON_SECURE_CONNECTION={0} hesabı için güvenli bağlantı oluşturulamadı. Eğer güvensiz sunucuyabağlanmak istiyorsanız hesabınız ayarlarında "Güvensiz bağlantılara izin}seçiniz
-service.gui.UPDATE=Güncelle
 service.gui.MOBILE_PHONE=Mobil
 service.gui.VIDEO_PHONE=Video
 service.gui.WORK_PHONE=İş
@@ -549,7 +532,7 @@ service.gui.ZID_NAME_SET=ZRTP tanımlayıcısının ismi:
 service.gui.ZID_NAME_NOT_SET=ZRTP tanımlayıcısının ismi konulmamış.
 service.gui.ZID_NAME_BUTTON=Bir ZRTP tanımlayıcısı ismi koymak için tıklayın.
 service.gui.ZID_NAME_DIALOG=ZRTP tanımlayıcısının ismini düzenle
-service.gui.ZID_NAME_UNEXPECTED=<html>ZRTP tanımlayıcı ismi eşleşmiyor.<br><b>Doğrulama metni partneriniz ile karşılaştırın ve kontrol edin!</b><br>ZRTP tanımlayıcısının ismini düzenle ve sadece doğrulama metni tutuyorsa sakla.</html>
+service.gui.ZID_NAME_UNEXPECTED=<html>ZRTP tanımlayıcı ismi eşleşmiyor.<br><b>Doğrulama metni partneriniz ile karşılaştırın ve kontrol edin!</b><br>ZRTP tanımlayıcısının ismini düzenleyin ve sadece doğrulama metni tutuyorsa saklayın.</html>
 
 service.gui.JANUARY=Oca
 service.gui.FEBRUARY=Şub
@@ -569,7 +552,6 @@ service.gui.callinfo.CALL_INFORMATION=Arama bilgisi
 service.gui.callinfo.CALL_IDENTITY=Kimlik
 service.gui.callinfo.PEER_COUNT=Katılımcı sayısı
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Konferans odağı
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Şifreleme etkin
 service.gui.callinfo.CALL_TRANSPORT=Çağrı ulaştırma sinyalleniyor
 service.gui.callinfo.CALL_DURATION=Arama süresi
 service.gui.callinfo.VIEW_CERTIFICATE=Sertifikayı göster
@@ -580,7 +562,6 @@ service.gui.callinfo.AUDIO_INFO=Ses bilgisi
 service.gui.callinfo.VIDEO_INFO=Vieo bilgisi
 service.gui.callinfo.LOCAL_IP=Yerel IP/ Port
 service.gui.callinfo.REMOTE_IP=Uzak IP/ Port
-service.gui.callinfo.BANDWITH=Bandwith
 service.gui.callinfo.LOSS_RATE=Kayıp oranı
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Seğirme
@@ -590,10 +571,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Anahtar değiştirme protokolü
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE adayı genişletilmiş türü
 service.gui.callinfo.ICE_STATE=ICE işleme durumu
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Adayları topla
 service.gui.callinfo.ICE_STATE.RUNNING=Bağlantı durumu kontrolleri
 service.gui.callinfo.ICE_STATE.COMPLETED=Tamamlandı
 service.gui.callinfo.ICE_STATE.FAILED=Başarısız oldu
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Yerel istemci IP / Port
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Yerel yansımalı IP / Port
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Yerel aktarmalı IP / Port
@@ -612,11 +596,12 @@ service.gui.callinfo.JITTER_BUFFER_DELAY=Jitter önbelleği
 
 service.gui.ALWAYS_TRUST=Bu sertifikaya her zaman güven
 service.gui.CERT_DIALOG_TITLE=Sertifikayı doğrula
-service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html><br>{0}, {1}:{2}"e bağlanırken sunucunun kimliğini belirleyemez.<br> <br> Sertifika güvenilir değil, bunun anlamı sunucunun kimliği otomatik olarak belirlenemez. Bağlanmaya devam etmek istiyor musunuz?<br><br> Daha fazla bilgi için, "Sertifikayı göster" e tıklayınız.</html>
+service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} sunucunun kimliğini doğrulayamadı <br><b>{1}</b>''e bağlanırken.<br><br>Sertifika güvenilir değil, bunun anlamı sunucunun kimliği otomatik olarak doğrulanamaz.<br><br> Bağlanmaya devam etmek istiyor musunuz?<br> Daha fazla bilgi için, "Sertifikayı göster" e tıklayınız.</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html><br>{0}, {1}:{2}"e bağlanırken sunucunun kimliğini belirleyemez.<br> <br> Sertifika güvenilir değil, bunun anlamı sunucunun kimliği otomatik olarak belirlenemez. Bağlanmaya devam etmek istiyor musunuz?<br><br> Daha fazla bilgi için, "Sertifikayı göster" e tıklayınız.</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html><br>{0}, {1}:{2}"e bağlanırken sunucunun kimliğini belirleyemez.<br> <br> Sertifika güvenilir değil, bunun anlamı sunucunun kimliği otomatik olarak belirlenemez. Bağlanmaya devam etmek istiyor musunuz?<br><br> Daha fazla bilgi için, "Sertifikayı göster" e tıklayınız.</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html><br>{0}, {1}:{2}"e bağlanırken sunucunun kimliğini belirleyemez.<br> <br> Sertifika güvenilir değil, bunun anlamı sunucunun kimliği otomatik olarak belirlenemez. Bağlanmaya devam etmek istiyor musunuz?<br><br> Daha fazla bilgi için, "Sertifikayı göster" e tıklayınız.</html>
 service.gui.CONTINUE_ANYWAY=Yine de devam et
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Yaygın isim:
 service.gui.CERT_INFO_O=Organizasyon:
 service.gui.CERT_INFO_C=Ülke ismi:
@@ -625,18 +610,16 @@ service.gui.CERT_INFO_L=İlçe/Mahalle ismi:
 service.gui.CERT_INFO_OU=Organizasyon birimi:
 service.gui.CERT_INFO_ISSUED_ON=Şu zamanda yayıldı:
 service.gui.CERT_INFO_EXPIRES_ON=Şu zamanda bitiyor:
-service.gui.CERT_INFO_FINGERPRINTS=Parmak İzi
+service.gui.CERT_INFO_FINGERPRINTS=Parmak izleri
 service.gui.CERT_INFO_SER_NUM=Seri Numarası:
 service.gui.CERT_INFO_VER=Versiyon:
 service.gui.CERT_INFO_SIGN_ALG=İmza Algoritması:
 service.gui.CERT_INFO_ALG=Algoritma:
 service.gui.CERT_INFO_PUB_KEY=Genel Anahtar:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} byte: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bit
 service.gui.CERT_INFO_EXP=Üst:
 service.gui.CERT_INFO_KEY_SIZE=Anahtar Boyutu:
 service.gui.CERT_INFO_SIGN=İmza:
-service.gui.CONTINUE=Devam et
 service.gui.SHOW_CERT=Sertifikayı göster
 service.gui.HIDE_CERT=Sertifikayı gizle
 
@@ -657,12 +640,9 @@ service.gui.security.SECURE_AUDIO=Güvenli ses
 service.gui.security.AUDIO_NOT_SECURED=Ses güvenli değil
 service.gui.security.SECURE_VIDEO=Güvenli video
 service.gui.security.VIDEO_NOT_SECURED=Video güvenli değil
-service.gui.security.NO_VIDEO=Video yok
-service.gui.security.CIPHER=Şifre: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Arama güvenlileştirildi. Daha fazla bilgi için buraya tıklayın.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Arama güvenli değil.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Güvenlik sırrını partneriniz ile karşılaştırmak için buraya tıklayın.
-service.gui.security.COMPARE_WITH_PARTNER=Partneriniz ile karşılaştırınız ve onaylamak için kilite tıklayınız
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Partneriniz ile karşılaştırın:
 service.gui.security.STRING_COMPARED=Metin karşılaştırıldı!
@@ -679,19 +659,13 @@ service.gui.avatar.imagepicker.CLICK=Tıkla ve Gülümse
 service.gui.avatar.imagepicker.IMAGE_FILES=Resim dosyaları
 service.gui.avatar.imagepicker.IMAGE_PICKER=Resim
 service.gui.avatar.imagepicker.IMAGE_SIZE=Resim boyutu
-service.gui.avatar.imagepicker.INITIALIZING=Başlatılıyor
 service.gui.avatar.imagepicker.RESET=Sıfırla
 service.gui.avatar.imagepicker.SET=Ayarla
 service.gui.avatar.imagepicker.TAKE_PHOTO=Resim çek
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Webcam hatası
 
 service.gui.security.encryption.required=Şifrleme gerekli!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=SIP kişi listesi depolamada hata
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Kaynak okunamadı {0}. {1} için
@@ -714,9 +688,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=ağ seç
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=LDAP ayarları
 impl.ldap.GENERAL=Genel
-impl.ldap.NEW=Yeni
 impl.ldap.EDIT=düzenle
-impl.ldap.REMOVE=Sil
 impl.ldap.ENABLED=Aktif et
 impl.ldap.SERVER_NAME=Sunucu adı
 impl.ldap.SERVER_NAME_EXAMPLE=LDAP sunucum
@@ -749,6 +721,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=ev telefonu
 impl.ldap.PHONE_PREFIX=Telefon öneki
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ör:00
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Adres defteri
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=MacOSX Adres Defterini aramayı etkinleştir
@@ -759,9 +735,7 @@ plugin.addrbook.PREFIX_EXAMPLE=Ör.:00
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google Kişiler
-impl.googlecontacts.NEW=Yeni
 impl.googlecontacts.EDIT=düzenle
-impl.googlecontacts.REMOVE=Sil
 impl.googlecontacts.ENABLED=Aktif et
 impl.googlecontacts.ACCOUNT_NAME=Hesap Adı
 impl.googlecontacts.SAVE=Kaydet
@@ -775,7 +749,7 @@ impl.googlecontacts.WRONG_CREDENTIALS={0} Google hesabı için yanlış kimlik b
 plugin.accountinfo.TITLE=Hesap Bilgisi
 plugin.accountinfo.EXTENDED=Genişletilmiş
 plugin.accountinfo.NOT_SUPPORTED=Hesap bilgisi yok.
-plugin.accountinfo.DISPLAY_NAME=Gösterilen isim
+plugin.accountinfo.DISPLAY_NAME=Görünen isim:
 plugin.accountinfo.FIRST_NAME=İsim:
 plugin.accountinfo.MIDDLE_NAME=İkinci İsim:
 plugin.accountinfo.LAST_NAME=Soy İsim:
@@ -783,16 +757,13 @@ plugin.accountinfo.NICKNAME=Takma ad:
 plugin.accountinfo.AGE=Yaş:
 plugin.accountinfo.BDAY=Doğum Tarihi:
 plugin.accountinfo.GENDER=Cinsiyet:
-plugin.accountinfo.CITY=Şehir
-plugin.accountinfo.POST=Posta kodu
-plugin.accountinfo.COUNTRY=Ülke
+plugin.accountinfo.CITY=Şehir:
+plugin.accountinfo.POST=Posta kodu:
+plugin.accountinfo.COUNTRY=Ülke:
 plugin.accountinfo.EMAIL=E-mail Adresi:
 plugin.accountinfo.PHONE=Telefon:
 plugin.accountinfo.MOBILE_PHONE=cep telefonu
 plugin.accountinfo.JOB_TITLE=İş tanımı
-plugin.accountinfo.USER_PICTURES=Kullanıcı Resimleri
-plugin.accountinfo.CHANGE=Değiştir
-plugin.accountinfo.ONLY_MESSAGE=Sadece mesajlar
 
 # connection info
 
@@ -811,49 +782,12 @@ plugin.aimaccregwizz.USERNAME=AIM Ekran İsmi
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Ekran İsmi ve Şifre
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Yeni hesap kaydet
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Eğer AIM hesabınız yoksa, bu butona tıklayarak yeni bir hesap alabilirsiniz.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Sunucu varsayılan ayarlarını üzerine yaz
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE={0} hakkında
 plugin.branding.LOGO_MESSAGE=Açık kaynak kodlu VoIP && Anlık Mesajlaşma 
-plugin.branding.LOADING=Yükleniyor
 plugin.branding.ABOUT_MENU_ENTRY=Hakkında
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} aktif olarak geliştirilmektedir. Şu an kullanmakta olduğunuz versiyon test aşamasındadır ve beklendiği gibi ÇALIŞMAYABİLİR. Lütfen daha fazla bilgi için {2}.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>Bütün hakları gizlidir. Ziyaret et <a href="http://jitsi.org">http://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}> <b>Jitsi</b> LGPL lisansı koşulları altında dağıtılmaktadır(<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Sözlükler
-plugin.dictaccregwizz.ANY_DICTIONARY=Herhangi bir sözlük
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM={0}"dan herhangi bir sözlük
-plugin.dictaccregwizz.FIRST_MATCH=İlk Eşleşen
-plugin.dictaccregwizz.NO_MATCH=Eşleşen yok
-plugin.dictaccregwizz.MATCH_RESULT="{0}" için tanım bulunamadı, belki bunu demek istediniz:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Şuanki sözlük "{0}" artık sunucuda bulunmamaktadır.
-plugin.dictaccregwizz.INVALID_STRATEGY=Şuanki arama kriteri sunucuda hazır değildir.
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=Dict servis protokolü
-plugin.dictaccregwizz.HOST=Servis sağlayıcı
-plugin.dictaccregwizz.SERVER_INFO=Sunucu bilgileri
-plugin.dictaccregwizz.STRATEGY_SELECTION=Arama kriteri seçimi
-plugin.dictaccregwizz.STRATEGY_LIST=Arama kriterleri listesi
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Arama kriterlerini ara
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Arama kriteri, eğer çviri yoksa benzer kelimeleri bulmak için kullanılır. Örneğin önden arama kriteri, sizin çevireceğiniz kelimenin ilk harfiyle başlayan kelimeleri arayacak.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict Hesap Bilgileri
-plugin.dictaccregwizz.FIRST_ACCOUNT=Bu sihirbaz sizin için dict.org'da bir Dict hesabı açacaktır.\n\nHesap Kayıt Sihirbazına giderek yeni bir sözlük ekleyebilirsiniz. Servis sağlayıcı kısmını eklemek istediğiniz sözlük ile doldurunuz.
-plugin.dictaccregwizz.THREAD_CONNECT=Sunucuya bağlanmaya çalışıyor
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Bağlanamadı, bu dict sunucusu değil veya sunucu çevrim dışı
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Arama kriterleri alınıyor
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Sunucuda arama kriteri bulunamadı
-plugin.dictaccregwizz.POPULATE_LIST=Liste dolduruluyor
-plugin.dictaccregwizz.CLOSING_CONNECTION=Bağlantı kapatılıyor
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Facebook sohbeti kullanabilmek için Hesap Ayarları sayfasından bir kullanıcı ismi oluşturmalısınız.a><br><br>Not: Kullanıcı ismi aldıktan sonra oturum kapatmalısınız ve yeni kullanıcı isminizle oturum açmak biraz zaman alabilir.</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Facebook Sohbet Protokolü
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Kullanıcı Adı:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Kullanıcı Adı ve Şifre
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Bilgisayar baştan başladığında otomatik başlat {0}.
@@ -864,9 +798,6 @@ plugin.generalconfig.SHOW_HISTORY=Göster
 plugin.generalconfig.HISTORY_SIZE=Yeni sohbetlerdeki son mesajlar
 plugin.generalconfig.SEND_MESSAGES_WITH=Mesajları şunla gönder:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Sohbet penceresini öne getir
-plugin.generalconfig.ERROR_PERMISSION=Otomatik başlatı silmek için yeterli izniniz yok
-plugin.generalconfig.TRANSPARENCY=Saydamlık
-plugin.generalconfig.ENABLE_TRANSPARENCY=Saydamlığı aktif et
 plugin.generalconfig.DEFAULT_LANGUAGE=Arabirim dili
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Değişiklikler tekrar başladığında aktif olacak.
 plugin.generalconfig.SIP_CLIENT_PORT=SIP istemci portu
@@ -910,19 +841,20 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=Yeni hesap kaydet
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC protokol
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=Kullanıcı ID  ve Şifre
+plugin.ircaccregwizz.USERNAME=Rumuz
 plugin.ircaccregwizz.INFO_PASSWORD=Genellikle IRC sunucuları şifre istemez.
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=Eğer takma ad daha önce kullanıldıysa otomatik olarak değiştir
 plugin.ircaccregwizz.USE_DEFAULT_PORT=Varsayılan portu kullan
 plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=Benim takma adım kimlik tanımlaması gerektirmez
 plugin.ircaccregwizz.HOST=Servis sağlayıcı:
 plugin.ircaccregwizz.IRC_SERVER=Sunucu
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE={0} onaylama
+plugin.ircaccregwizz.SASL_USERNAME=Kullanıcı adı
 
 # jabber accregwizz
-plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=XMPP protokol
 plugin.jabberaccregwizz.USERNAME=XMPP kullanıcı adı
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=Şifreyi onayla
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=Kullanıcı ID ve Şifre
 plugin.jabberaccregwizz.CSERVER=Sunucu
 plugin.jabberaccregwizz.SERVER=Sunucuya Bağlan
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=Bağlantının canlı durmasını aktif et
@@ -938,13 +870,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Yorum
 plugin.jabberaccregwizz.RESOURCE=Kaynak
 plugin.jabberaccregwizz.AUTORESOURCE=Otomatik kaynak oluştur
 plugin.jabberaccregwizz.PRIORITY=Öncelik
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP Hatası
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Bilinmeyen XMPP hatası. Sunucu isminin doğruluğundan emin olunuz.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Şifreler birbiri ile uyumlu değil
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Sunucu varsayılan ayarlarının üstüne yaz
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Gelişmiş ayarlar
 plugin.jabberaccregwizz.USE_ICE=ICE kullan
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Google Jingle/ICE kullan(deneysel)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Otomatik STUN/TURN sunucularını ara
 plugin.jabberaccregwizz.SUPPORT_TURN=TURN destekle
 plugin.jabberaccregwizz.TURN_USERNAME=TURN kullanıcı adı
@@ -971,11 +899,8 @@ plugin.jabberaccregwizz.ALLOW_NON_SECURE=Güvensiz bağlantılara izin ver
 plugin.jabberaccregwizz.DTMF_AUTO=Otomatik: RTP ve Inband arasında seçim yap
 plugin.jabberaccregwizz.SERVER_OPTIONS=Sunucu seçenekleri
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Hesap parolasını değiştir
-plugin.jabberaccregwizz.NEW_PASSWORD=Yeni parola
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Yeni parolayı onayla
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Devam etmek için lütfen geçerli bir port numarası girin.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Parola değiştirmeden önce bu hesaba giriş yapılmalıdır.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Bu parola boş.
 plugin.jabberaccregwizz.TLS_REQUIRED=Bağlantı TLS kullanmıyor, parola değişikliği girişiminde bulunulmayacak.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Parola başarıyla değiştirildi
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Jabber sunucunuz parola değişikliğini desteklemiyor.
@@ -989,25 +914,9 @@ plugin.jabberaccregwizz.RESET=Sıfırla
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Sıfırlayarak evrensel ayarlara dön
 plugin.jabberaccregwizz.DISABLE_JINGLE=Jingle'ı (XMPP ile sesli ve videolu aramalar) devredışı bırak
 
-# mailbox
-plugin.mailbox.OUTGOING=Giden Mesajlar
-plugin.mailbox.INCOMING=Gelen Mesajlar
-plugin.mailbox.WAIT_TIME=Arama sesli mesaja gönderilene kadar beklet
-plugin.mailbox.MAX_MESSAGE_TIME=Maksimum gelen mesaj süresi
-plugin.mailbox.CONFIRM=Onayla
-plugin.mailbox.DEFAULTS=Varsayılan
-plugin.mailbox.MAILBOX=Mail kutusu
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=MSN servise bağlanmak ve sohbet etmek için protokol.
-plugin.msnaccregwizz.USERNAME=E-mail adresi:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=Kullanıcı Adı ve Şifre
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Yükle
 plugin.pluginmanager.UNINSTALL=Kaldır
-plugin.pluginmanager.UPDATE=Güncelle
 plugin.pluginmanager.PLUGINS=Eklentiler
 plugin.pluginmanager.URL=Adresi
 plugin.pluginmanager.CHOOSE_FILE=Dosya Seç
@@ -1032,7 +941,6 @@ plugin.sipaccregwizz.SERVER_PORT=Sunucu portu
 plugin.sipaccregwizz.PROXY=Proxy
 plugin.sipaccregwizz.PROXY_PORT=Proxy port
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Tercih edilen taşıma
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Gelişmiş ayarlar
 plugin.sipaccregwizz.PROXY_OPTIONS=Proxy seçenekleri
 plugin.sipaccregwizz.PROXY_AUTO=Proxy i otomatik ayarla
 plugin.sipaccregwizz.ENABLE_PRESENCE=Durum Bilgisini(SIMPLE) aktif et
@@ -1049,8 +957,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Otomatik: RTP ve Inband arasında otomatik seçim
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP bilgisi
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=KAYDOL
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Varsayılan sunucu ayarlarının üzerine yaz
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Aramaları şifrelemeyi aktif et
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Sinyal protokolünde ZRTP desteğini belirt
 plugin.sipaccregwizz.AUTH_NAME=Yetki ismi
@@ -1068,16 +974,16 @@ plugin.sipaccregwizz.VOICEMAIL=Sesli posta
 plugin.sipaccregwizz.MWI=Mesaj bekleniyor (MWI)
 plugin.sipaccregwizz.VOICEMAIL_URI=Sesli posta Abonelik URI
 plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=Sesli posta kontrol URI
-plugin.sipaccregwizz.NOT_SAME_PASSWORD=Şifrenler biribiri ile uyumlu değil
-plugin.sipaccregwizz.NO_CERTIFICATE=<hiçbiri>(düzenli kimlik bilgilerini kullan)
+plugin.sipaccregwizz.NOT_SAME_PASSWORD=<hiçbiri> (sıradan yetkilendirme kullan)
+plugin.sipaccregwizz.NO_CERTIFICATE=<hiçbiri> (sıradan yetkilendirme kullan)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP işareti
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Kapat(yalnızca RTP/AVP işareti)
 plugin.sipaccregwizz.SAVP_OPTION_1=Zorunlu (yalnızca RTP/SAVP öner ve kabul et)
 plugin.sipaccregwizz.SAVP_OPTION_2=İsteğe bağlı(önce RTP/SAVP öner, sonra RTP/AVP )
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=S-Descriptor etkinleştir (SDES veya SRTP olarakta bilinir)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Devredeki şifreleme protokollerini ve öncelik sırasını seç (üstteki protokol önce gelir):
 plugin.sipaccregwizz.CIPHER_SUITES=Şifre takımlarını etkinleştir 
-plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} ZRTP ile tüm çağrılarınızı otomatik olarak güvene
+plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} tüm çağrılarınızı otomatik olarak ZRTP ile güvenli hale getirecek ve güvenli bağlantı kurulduğunda her iki tarafta da bir bildirim görünecek. Aşağıdaki ayarları yalnızca ne olduklarını biliyorsanız düzenlemelisiniz.</div></html>
 plugin.sipaccregwizz.SHOW_ADVANCED=Gelişmiş şifreleme ayarları
 plugin.sipaccregwizz.ZRTP_OPTION=ZRTP seçeneği
 plugin.sipaccregwizz.SDES_OPTION=SDes seçeneği
@@ -1088,15 +994,6 @@ plugin.skinmanager.DEFAULT_SKIN=Varsayılan tema
 plugin.skinmanager.ADD_NEW_SKIN=Yeni tema ekle
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Programın varsayılan teması
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=SSH üzerinden uzaktaki makinalara bağlanırken kullanılan bir protokol.
-plugin.sshaccregwizz.USERNAME=Hesap ID:
-plugin.sshaccregwizz.IDENTITY_FILE=Kimlik Dosyası:
-plugin.sshaccregwizz.KNOWN_HOSTS=Bilinen Servis Sağlayıcılar
-plugin.sshaccregwizz.OPTIONAL=İsteğe bağlı
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Hesap Detayları
-
 # status update
 plugin.autoaway.AUTO_STATUS=Otomatik olarak uzakta
 plugin.autoaway.ENABLE_CHANGE_STATUS=Uzaktayken durumu değiştir
@@ -1141,27 +1038,11 @@ plugin.whiteboard.DESELECT=Seçme
 plugin.whiteboard.DELETE=Sil
 plugin.whiteboard.PROPERTIES=Özellikler
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Yahoo! servisine bağlanmak ve sohbet etmek için kullanılan bir protokol.
-plugin.yahooaccregwizz.USERNAME=Kullanıcı adı:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=Kullanıcı ID ve Şifre
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Zeroconf(Bonjour) servis protokolü
-plugin.zeroaccregwizz.FIRST_NAME=İsim:
-plugin.zeroaccregwizz.LAST_NAME=Soyisim:
-plugin.zeroaccregwizz.EMAIL=E-mail adresi:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Bonjour kişilerini hatırla
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=Kullanıcı adı ve Şifre
-plugin.zeroaccregwizz.USERID=Kullanıcı ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Google Talk protokolü
 plugin.googletalkaccregwizz.USERNAME=Google Talk kullanıcı adı
-plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Eğer Google Talk hesabınız yoksa, bu butona tıklayarak yeni bir tane alabilirsiniz.
+plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=Eğer Google Talk hesabınız yoksa,<br> bu butona tıklayarak yeni bir tane alabilirsiniz.
 plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE=Google Talk yeni hesap kaydı
 
 # iptel accregwizz
@@ -1170,19 +1051,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, IP telekomüniskasyon por
 plugin.iptelaccregwizz.USERNAME=Kullanıcı adı
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=iptel.org'a abone ol
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=Internet arama ve sohbet
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Kullanıcı adı
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Şifreyi tekrar giriniz
 plugin.sip2sipaccregwizz.EMAIL=Email adresi
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Servis hakkında yardım için <br>http://wiki.sip2sip.info 'yu ziyaret ediniz
-plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Email adresi sesli mesaj göndermek, kaçırılan aramaların hatırlatmaları ve unutulan şifre için kullanılacaktır.</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Servis hakkında yardım için ziyaret ediniz<a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Varolan sip2sip.info hesabı
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Bedava sip2sip.info hesabı oluştur
-
-# ippi accregwizz
+plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Email adresiniz sesli mesaj göndermek, cevapsız çağrı <br>hatırlatmaları ve unutulan şifre için kullanılacaktır.</html>
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Anlık Mesajlaşma
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Servis hakkında yardım için <br>http://ippi.fr 'yu ziyaret ediniz
@@ -1191,6 +1064,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Varolan ippi hesabı
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Bedava ippi hesabı oluştur
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Sohbet penceresini kapat
 plugin.keybindings.CHAT_COPY=Kopyala
 plugin.keybindings.CHAT_CUT=Kes
@@ -1213,9 +1087,9 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=İsim
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Ana kısayol
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=İkinci kısayol
 plugin.keybindings.globalchooser.PRESS_BTN=Kısayolu atamak için bas
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Bekleniyor
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Özel tuş tanımlamayı etkinleştir
 plugin.keybindings.PLUGIN_NAME=Tuş bağlayıcıları
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Sohbet
 plugin.keybindings.MAIN=Ana
 plugin.keybindings.GLOBAL=Genel kısayollar
@@ -1243,6 +1117,7 @@ plugin.notificationconfig.tableheader.SOUND=Bildirim aygıtından bir ses oynat
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Geri oynatma aygıtından bir ses oynat
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=PC speaker aygıtından bir ses oynat
 plugin.notificationconfig.tableheader.DESCRIPTION=Olayın tanımı
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Gelen arama
 plugin.notificationconfig.event.SecurityMessage=Güvenlik mesajı
 plugin.notificationconfig.event.IncomingFile=Gelen dosya
@@ -1340,6 +1215,7 @@ impl.neomedia.configform.VIDEO=Video
 
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultProfile=Kodlama yapılacak varsayılan profil:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Baz Profil
 impl.neomedia.configform.H264.defaultProfile.main=Ana Profil
 impl.neomedia.configform.H264.preferredKeyFrameRequester=Anahtarları talep etmek için seçilen yöntem:
@@ -1368,7 +1244,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Şuanki şifre:
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Yeni şifre giriniz: 
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Şifreyi tekrar giriniz: 
 plugin.securityconfig.masterpassword.MP_TITLE=Ana Şifre
-plugin.securityconfig.masterpassword.MP_NOT_SET=(ayarlanmamış)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Doğru ana şifreyi girmediniz. Lütfen tekrar deneyiniz.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Ana şifre doğru değil!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Şifre değiştirilemedi
@@ -1384,7 +1259,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=Şifre
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(bilinmeyen)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(şifre çözülemiyor)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=Kayıtlı Şifreler
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=Sil
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=Hepsini sil
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=Bütün şifreleri silmek istiyor musunuz?
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=Bütün şifreleri sil
@@ -1403,7 +1277,7 @@ plugin.otr.menu.REFRESH_OTR=Özel konuşmayı tazele
 plugin.otr.menu.AUTHENTICATE_BUDDY=Arkadaşı onayla
 plugin.otr.menu.WHATS_THIS=Bu nedir
 plugin.otr.menu.CB_AUTO=Otomatik olarak özel mesajlaşmayı başlat
-plugin.otr.menu.CB_AUTO_ALL=Otomatik olarak özel mesajlaşmayı başlat
+plugin.otr.menu.CB_AUTO_ALL=Tüm kişilerle özel mesajlaşmayı otomatik olarak başlat
 plugin.otr.menu.CB_ENABLE=Özel mesajlaşmayı aktif et
 plugin.otr.menu.CB_REQUIRE=Özel mesajlaşma iste
 plugin.otr.menu.CB_RESET=Sıfırla
@@ -1448,7 +1322,6 @@ plugin.globalproxy.PROXY_PORT=Proxy Portu
 plugin.globalproxy.PROXY_USERNAME=Proxy Kullanıcı Adı
 plugin.globalproxy.PROXY_PASSWORD=Proxy şifresi
 plugin.globalproxy.DESCRIPTION={0} bundan sonra sizin bağlı olduğunuz ve tekrar bağlandığınız bütün ağlar için yukarıdaki proxy ayarlarını kullanacaktır. \nProxy desteği şu an test aşamasındadır ve sadece bazı bağlantı protokolleri çalışmaktadır Daha fazla bilgi için aşağıdaki tabloyu kontrol ediniz:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -1461,7 +1334,7 @@ plugin.reconnectplugin.NETWORK_DOWN=Ağ bağlantısı koptu!
 plugin.chatconfig.TITLE=Sohbet
 plugin.chatconfig.replacement.TITLE=Resim/Video:
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=Gülücük değişimini etkinleştir
-plugin.chatconfig.replacement.REPLACEMENT_TITLE=Resim/Video değişimini etkinleştir
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=Resim/Video değişimi
 plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=Aktif et
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=Kaynaklar:
 plugin.chatconfig.spellcheck.TITLE=İmla Klavuzu
@@ -1479,7 +1352,6 @@ plugin.provisioning.RESTART_WARNING={0} değişiklikleriniz sonraki programı ye
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=UUID kopyala
 plugin.provisioning.CLIPBOARD_FAILED=UUID kopyalama başarısız
-plugin.provisioning.EXIT_ON_FAIL=Provizyon sağlanamazsa programdan çık
 plugin.provisioning.CREDENTIALS=Son kaydedilen provizyon bilgileri
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Provizyon şifresini silmek istediğinizden emin misiniz?
 plugin.provisioning.PROV_FAILED=Provizyonlama başarısız oldu
@@ -1546,8 +1418,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0}, sunucuya <b>{1}</b>'den bağ
 #plugin spellcheck
 plugin.spellcheck.TITLE=İmla ve Dilbilgisi
 plugin.spellcheck.MENU=İmla ve Dilbilgisi göster
-plugin.spellcheck.LANG=Dil
-plugin.spellcheck.EDIT_PERSONAL_DICT=Düzenle
 plugin.spellcheck.ENABLE_SPELL_CHECK=İmla kontrolünü etkinleştir
 plugin.spellcheck.dialog.FIND=Sonrakini bul
 plugin.spellcheck.dialog.REPLACE=Değiştir
@@ -1592,5 +1462,5 @@ plugin.phonenumbercontactsource.DISPLAY_NAME=Telefon numaraları
 # properties editor
 
 #Thunderbird address book plugin
-plugin.thunderbird.ENABLED=Aktif et
-plugin.thunderbird.PHONE_PREFIX=Telefon öneki
+plugin.thunderbird.ENABLED=Etkin
+plugin.thunderbird.PHONE_PREFIX=Telefon öneki:
diff --git a/resources/languages/resources_uk.properties b/resources/languages/resources_uk.properties
index da09699..53e2064 100644
--- a/resources/languages/resources_uk.properties
+++ b/resources/languages/resources_uk.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -32,7 +43,6 @@ service.gui.ACCOUNT_ME=Я
 service.gui.ACCOUNT_REGISTRATION_WIZARD=Майстер реєстрування облікових записів
 service.gui.ACCOUNTS=Облікові записи
 service.gui.ADD=&Додати
-service.gui.ADD_ACCOUNT=Додати обліковий запис
 service.gui.ADD_CONTACT=&Додати контакт
 service.gui.ADD_AUTHORIZED_CONTACT=Додати {0} до списку контактів
 service.gui.ADD_CONTACT_TO_CONTACTLIST=Додати контакт у ваш список контактів
@@ -42,20 +52,15 @@ service.gui.ADD_CONTACT_ERROR_TITLE=Помилка додавання конта
 service.gui.ADD_CONTACT_EXIST_ERROR=Контакт {0} вже існує у списку контактів.
 service.gui.ADD_CONTACT_NETWORK_ERROR=Сервер не відповів на запит додавання контакту: {0}.
 service.gui.ADD_CONTACT_NOT_SUPPORTED=Не вдалося додати контакт: {0}. Операція не підтримується.
-service.gui.ADD_CONTACT_IDENTIFIER=Введіть ідентифікатор контакту, який хочете додати.
-service.gui.ADD_CONTACT_WIZARD=Майстер додавання контактів
 service.gui.ADD_CONTACT_NOT_CONNECTED=Щоб додати контакт, необхідно підключитися. Будь-ласка, виконайте вхід і спробуйте знову.
 service.gui.ADD_GROUP_LOCAL_ERROR=Не вдалося додати групу: {0}. Відбувся збій операції вводу-виводу.
 service.gui.ADD_GROUP_EXIST_ERROR=Група {0} вже існує у списку контактів. Будьласка, оберіть інше ім’я.
 service.gui.ADD_GROUP_NET_ERROR=Не вдалося додати групу: {0}. Відбулася мережева помилка. Будьласка, перевірте ваше мережеве підключення і спробуйте знову.
 service.gui.ADD_GROUP_ERROR=Не вдалося додати групу: {0}.
 service.gui.ADD_GROUP_EMPTY_NAME=Назва групи не може бути порожньою.
-service.gui.ADD_GROUP=Створити групу
-service.gui.ADD_SUBCONTACT=&Додати додатковий контакт
 service.gui.ADDRESS=Адреса
 service.gui.ADMINISTRATOR=адміністратор
 service.gui.ADVANCED=&Розширені
-service.gui.ALL=&Всі
 service.gui.ALL_CONTACTS=&Всі контакти
 service.gui.ALTERNATE_ADDRESS=Альтернативна адреса
 service.gui.APPLY=&Застосувати
@@ -65,7 +70,6 @@ service.gui.AT=час
 service.gui.AUTHORIZE=&Авторизувати
 service.gui.AUTHORIZATION_ACCEPTED={0} прийняв запит авторизації.
 service.gui.AUTHENTICATION_FAILED=Перевірити справжність {0} не вдалося. Введений пароль невірний.
-service.gui.AUTHENTICATION_REQUESTED=Запит перевірки справжності
 service.gui.AUTHENTICATION_REQUESTED_SERVER=Сервер {0} запитує перевірку справжності.
 service.gui.AUTHENTICATION_REJECTED={0} відхилив запит авторизації.
 service.gui.AUTHENTICATION_WINDOW_TITLE=Ідентифікація {0}
@@ -107,7 +111,6 @@ service.gui.CHANGE_NICKNAME_LABEL=В полі нижче ви можее вве�
 service.gui.CHANGE_NICKNAME_ERROR=Помилка при зміні прізвиська
 service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=Прізвисько вже існує
 service.gui.CHANGE_VIDEO_QUALITY=Змінити якість вхідного відео
-service.gui.CHAT_CONFERENCE_LABEL=Конференції
 service.gui.CHAT_CONFERENCE_ITEM_LABEL=Конференція користувача {0}
 service.gui.CHAT_ROOM_ALREADY_JOINED=Конференція {0} вже підключена.
 service.gui.CHAT_ROOM_CONFIGURATION=Конфігурація конференції {0}
@@ -121,18 +124,14 @@ 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_SEND_MSG_FORBIDDEN=Надсилання повідомлень заборонено (вимкнено звук)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=Зберігає конференцію для подальшого використання
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=Вилучає вибрану конференцію зі списку збережених конференцій
 service.gui.CHAT_ROOM_NAME=Назва конференції
 service.gui.CLEAR_CUSTOM_MESSAGES=Очистити персоналізовані повідомлення
 service.gui.ROOM_NAME=Конференція
-service.gui.AUTOJOIN=Автоматичний вхід
 service.gui.CHANGE_PASSWORD=Змінити пароль
 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_LEAVE_NOT_CONNECTED=Ви повинні бути підключені щоб мати можливість вийти з конференції.
-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} запитує пароль.
@@ -157,16 +156,13 @@ service.gui.CONNECTING=Підключення...
 service.gui.CONNECTING_STATUS=Підключення
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=Підключення*
 service.gui.CONNECTION=З’єднання
-service.gui.CONNECTION_FAILED_MSG=Не вдалося з’єднання для наступного облікового запису: Ім’я користувача: {0}, Назва сервера: {1}. Будьласка перевірте ваше мережеве підключення або звяжіться з вашим мережевим адміністратором для додаткової інформації.
 service.gui.CONNECTION_EXPIRED_MSG=В даний момент ви відключені від сервера {0}.
 service.gui.CONTACT_NAME=ID або номер
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=Вибраний контакт {0} не підтримує голосовий звязок.
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=Вибраний контакт {0} не підтримує чат в конференції.
 service.gui.CONTACT_PAUSED_TYPING={0} переслав друковане повідомлення
 service.gui.CONTACT_TYPING={0} друкує повідомлення
 service.gui.CONTACT_TYPING_SEND_FAILED=співрозмовник {0} не побачить процес створення повідомлення
 service.gui.CONTACT_INFO=&Контактна інформація
-service.gui.CONTACTLIST=Список контактів
 service.gui.CONTACTS=Контакти
 service.gui.COPY=&Копіювати
 service.gui.COPY_LINK=Копіювати &посилання
@@ -176,27 +172,24 @@ service.gui.CREATE_CHAT_ROOM=&Створити конференцію...
 service.gui.CREATE_CHAT_ROOM_ERROR=Не вдалося створити конференцію {0}.
 service.gui.CREATE_CHAT_ROOM_WIZARD=Майстер створення конференцій
 service.gui.CREATE_CONFERENCE_CALL=&Створити багатокористувацький дзвінок...
-service.gui.CREATE_CONFERENCE_CHAT=&Створити багатокористувацький чат...
 service.gui.CREATE_GROUP=&Створити групу...
 service.gui.CREATE_GROUP_NAME=В полі нижче введіть ім’я групи, яку хочете створити.
-service.gui.CREATE_FIRST_GROUP_WIZARD=Ваш список контактів не містить жодної групи. Будьласка, спочатку створіть групу (Файл/Створити групу).
 service.gui.CREATE_VIDEO_BRIDGE=Створити &відеоміст...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=Створити &відеоміст
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=Створити / Долучитись до відео-конференції
 service.gui.CREATE_VIDEO_CONFERENCE=Створити нову відео-конференцію для цієї кімнати
 service.gui.CONTACT_INFO_NOT_SUPPORTED=Даний контакт не підтримує мережеву контактну інформацію
 service.gui.CUT=В&ирізати
-service.gui.DATE=Дата
 service.gui.DELETE=Вилучити
 service.gui.DENY=&Відхилити
 service.gui.DESKTOP_SHARING_WARNING=<b>Ви впевнені, що хочете надати доступ до вашого екрану?</b> <br> Натиснення OK дозволить абонентам, які беруть участину у розмові, бачити вміст вашого екрану.
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=Ви демонструєте ваш екран
 service.gui.DIALPAD=Номеронабирач
 service.gui.DISPLAY_NAME=Відображуване ім’я
 service.gui.DISCONNECTED_STATUS=Роз’єднано
 service.gui.DND_STATUS=Не турбувати
 service.gui.DO_NOT_ASK_AGAIN=Не питати знову
 service.gui.DO_NOT_SHOW_AGAIN=Не показувати це повідомлення знову
-service.gui.DOWNLOAD_NOW=&Завантажити тепер
 service.gui.DRAG_FOR_SHARING=Перенесіть сюди для спільного доступу...
 service.gui.DURATION=тривалість
 service.gui.DESTROY_CHATROOM=Видалити конференцію
@@ -217,7 +210,6 @@ service.gui.ERROR_RECEIVED_FROM=Помилка отримана від {0}
 service.gui.ESTIMATED_TIME=Приблизний час:
 service.gui.EVENTS=Події
 service.gui.EXIT=В&ийти
-service.gui.EXTENDED_CRITERIA=Розширений критерій
 service.gui.GENERAL=Загальні
 service.gui.GENERAL_ERROR=Загальна помилка
 service.gui.GROUP_NAME=Ім’я групи
@@ -259,7 +251,6 @@ service.gui.FONT_ITALIC=Курсив
 service.gui.FONT_SIZE=Розмір
 service.gui.FONT_STYLE=Стиль
 service.gui.FONT_UNDERLINE=Підкреслення
-service.gui.FROM={0} від {1}
 service.gui.GRANT_OWNERSHIP=Додати до власників...
 service.gui.GRANT_ADMIN=Додати до адміністраторів...
 service.gui.GRANT_MODERATOR=Додати до модераторів
@@ -271,7 +262,7 @@ service.gui.HD_QUALITY=HD відео
 service.gui.HELP=&Допомога
 service.gui.HIDE=Приховати
 service.gui.HIDE_OFFLINE_CONTACTS=Приховати контакти не в мережі
-service.gui.HIDE_MAIN_WINDOW=<DIV>Натиснення хрестика у куті вікна не завершить додаток, а тільки <BR> сховає его. Якщо бажаєте завершить додаток, оберіть Файл/Вийти.</DIV>
+service.gui.HIDE_MAIN_WINDOW=<DIV>Натиснення хрестика у куті вікна не завершить додаток, а тільки <BR> сховає його. Якщо бажаєте завершить додаток, оберіть Файл/Вийти.</DIV>
 service.gui.HISTORY=&Історія
 service.gui.HISTORY_CONTACT=Історія - {0}
 service.gui.HISTORY_TOGGLE_PER_CONTACT=Вимкнути історію для цього контакту
@@ -285,12 +276,12 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=Ви дійсно бажаєте наза
 service.gui.HISTORY_REMOVE_ERROR=Помилка під час видалення локально збережених повідомлень.
 service.gui.HOME=Домашній
 service.gui.HOME_PAGE=Домашня сторінка
-service.gui.HOUR=Домашня сторінка
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=Ідентифікатор
 service.gui.IGNORE=&Ігнорувати
 service.gui.INSERT_SMILEY=Вставити смайлик
 service.gui.INCOMING_CALL=Вхідний дзвінок від: {0}
+service.gui.INCOMING_SCREEN_SHARE=Вхідний дзвінок від: {0}
 service.gui.INCOMING_CALL_STATUS=Вхідний дзвінок
 service.gui.INITIATING_CALL_STATUS=Здійснення виклику
 service.gui.INVITATION=Текст запрошення
@@ -305,23 +296,21 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=Запитити контакти д�
 service.gui.INVITE_REASON=Причина запрошення
 service.gui.IS_CALLING=дзвонить...
 service.gui.IS_NOW={0} тепер {1}
-service.gui.JITSI_WARNING=SIP Communicator був перейменований в Jitsi.<br/>Завантажуйте Jitsi, якщо Ви хочете використовувати нову версію програми.<br/><br/>Прийміть наші вибачення за можливі завдані ненезручності. З повагою,<br/><br/>Команда розробників Jitsi
-service.gui.JITSI_WARNING_TITLE=SIP Communicator тепер став Jitsi
 service.gui.JOIN=&Війти
 service.gui.JOIN_AS=В&ійти як
-service.gui.CLOSE_CHAT_ROOM_DIALOG=З&акрити
+service.gui.JOIN_VIDEO=Приєднатися до відео
+service.gui.JOB_TITLE=Посада
 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.JOIN_AUTOMATICALLY=Приєднати автоматично
-service.gui.DONT_JOIN_AUTOMATICALLY=Не приєднувати автоматично
+service.gui.JOIN_AUTOMATICALLY=Приєднуватись автоматично
+service.gui.DONT_JOIN_AUTOMATICALLY=Не приєднуватись автоматично
 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.LAST_NAME=Прізвище:
 service.gui.LEAVE=&Покинути
 service.gui.LIMIT_REACHED_FOR_IP=У вас надто багато реєстрацій з локальної IP-адреси. Сервер {0} більше не дозволяє реєстрування.
@@ -341,7 +330,6 @@ service.gui.MESSAGE=Повідомлення
 service.gui.MISSED_CALLS_TOOL_TIP=Пропущені виклики від:
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= та {0} більше
 service.gui.MODERATOR=модератор
-service.gui.MORE=Переглянути більше
 service.gui.MORE_LABEL=Більше
 service.gui.MOVE=Перемістити
 service.gui.MOVE_SUBCONTACT=П&еремістити контакт
@@ -350,7 +338,6 @@ service.gui.MOVE_SUBCONTACT_FAILED=Вибраний вами контакт то
 service.gui.MOVE_SUBCONTACT_QUESTION=Ви впевнені, що бажаєте перемістити {0} до {1}?
 service.gui.MOVE_TO_GROUP=&Перемістити в групу
 service.gui.MOVE_CONTACT=Перемістити контакт
-service.gui.MOVE_CONTACT_ERROR=&Контакт не може бути переміщений
 service.gui.MSG_DELIVERY_FAILURE=Попереднє повідомлення не може бути доставлено
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=Протокол, який ви використовуєте підтримує offline-повідомлення. Ви можее спробувати зв’язатися з {0} через інший протокол або зачекати доки він/вона подключіться до мережі.
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=Відбулася внутрішня помилка додатку. Будьласка, повідомте про неї на адресу: http://www.jitsi.org/index.php/Development/BugsAndIssues.
@@ -361,7 +348,6 @@ service.gui.MSG_NOT_POSSIBLE=Обмін повідомленнями немож�
 service.gui.MSG_RECEIVED={0} написав
 service.gui.MSG_SEND_CONNECTION_PROBLEM=Ви повинні бути підключені до мережі, щоб мати можливість відправлять повідомлення.
 service.gui.MULTIPLE_LOGINS=Ви підключені більше одного разу тим же обліковим записом. Наступний обліковий запис: Ім’я користувача: {0}, Назва сервера: {1} на даний час відключений.
-service.gui.MUTE=Вимкнути звук
 service.gui.MUTUALLY_ON_HOLD_STATUS=Чекає
 service.gui.NAME=Дія
 service.gui.NETWORK=Мережа
@@ -392,7 +378,6 @@ service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=Не в списку контакті
 service.gui.SD_QUALITY=Стандартна якість
 service.gui.OFFLINE=Не в мережі
 service.gui.OK=&OK
-service.gui.OLDER_CALLS=Старі дзвінки
 service.gui.ONLINE=В мережі
 service.gui.OPEN=Відкрити
 service.gui.OPEN_FILE_FROM_IMAGE=Двічі клацніть, щоб відкрити файл.
@@ -400,7 +385,6 @@ service.gui.OPEN_FOLDER=Відкрити теку
 service.gui.OPEN_IN_BROWSER=Відкрити в &браузері
 service.gui.OPTIONS=Опції
 service.gui.OR=або
-service.gui.OR_ENTER_PHONE_NUMBER=Або введіть номер телефону...
 service.gui.ORGANIZATION=Організація:
 service.gui.OTHER=Інший
 service.gui.chat.role.OWNER=Власник
@@ -424,7 +408,6 @@ service.gui.PRESENCE=Вітання
 service.gui.PRESS_ENTER_FOR_SUGGESTIONS='Enter' для пропозицій
 service.gui.PRESS_FOR_CALL_INFO=Натисніть для отримання інформації про дзвінок
 service.gui.PREVIOUS=Попередній
-service.gui.PREVIOUS_TOOLTIP=Огляд старих розмов
 service.gui.PRINT=&Друк
 service.gui.PROACTIVE_NOTIFICATION=Друкує повідомлення
 service.gui.PROBLEMS_ENCOUNTERED=Виникли проблеми
@@ -439,7 +422,6 @@ service.gui.RECONNECTION_LIMIT_EXCEEDED=Ви були відключені та
 service.gui.RE_REQUEST_AUTHORIZATION=Запит повторної авторизації
 service.gui.REFERRED_STATUS=Переведений
 service.gui.REJECT=&Відхилити
-service.gui.REMIND_ME_LATER=Нагадати мені пізніше
 service.gui.REMEMBER_PASSWORD=Запам’ятати пароль
 service.gui.REMOVE=&Вилучити
 service.gui.REMOVE_ACCOUNT=&Вилучити обліковий запис
@@ -465,9 +447,7 @@ service.gui.REVOKE_ADMIN=Вилучити із адміністраторів
 service.gui.REVOKE_MODERATOR=Вилучити із модераторів
 service.gui.REVOKE_MEMBERSHIP=Анулювати членство
 service.gui.REVOKE_VOICE=Вилучити із голосування
-service.gui.ROOT_GROUP=Коренева група
 service.gui.SAVE=&Зберегти
-service.gui.SAVE_AS_DEFAULT=Зберегти замовчувані
 service.gui.SEARCH=&Пошук
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=Натисніть кнопку ниже, щоб показати всі чати, існуючі на вибраному сервері. Потім оберіть той, до якого хочете приєднатися та натисніть на кнопку з’єднання.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=Пошук контактів
@@ -475,17 +455,11 @@ service.gui.SECURITY=Безпека
 service.gui.SELECT_ACCOUNT=Вибрати обліковий запис
 service.gui.SELECT_COLOR=Вибрати колір
 service.gui.SELECT_GROUP=Вибрати групу
-service.gui.SELECT_GROUP_WIZARD_MSG=Наведений нижче список містить всі групи у списку контактів. Виберіть одну, до якої хочете додати новий контакт.
 service.gui.SELECT_NO_GROUP=Без групи
-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=Надіслати як SMS
 service.gui.SEND_SMS=Надіслати SMS
 service.gui.SEND_SMS_DETAILS=Пам’ятайте, що вам необхідно ввести номер телефону в міжнародном форматі, наприклад, починаючи з +380 для України, +380112233445
 service.gui.SEND_SMS_NOT_SUPPORTED=Вибраний протокол не підтримує SMS повідомлень.
@@ -519,7 +493,6 @@ service.gui.STOP_SHARING=Припинити загальний доступ
 service.gui.SUBJECT=Тема
 service.gui.SUMMARY=Зведення
 service.gui.TELEPHONY=Телефонія
-service.gui.TODAY=Сьогодні
 service.gui.TOOLS=&Інструменти
 service.gui.TRANSFER=Передавання
 service.gui.TO=&Кому:
@@ -529,7 +502,6 @@ service.gui.TRANSFER_CALL_TO=Переведення на:
 service.gui.TRANSPARENCY_NOT_ENABLED=Прозорість не підтримується поточною конфігурацією.
 service.gui.TYPE_YOUR_REQUEST=Введіть запит
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=Не вдалося змінити якість відео для цього виклику.
-service.gui.UNMUTE=Увімкнути звук
 service.gui.USER_IDENTIFIER=Ідентифікатор користувача:
 service.gui.USER_EXISTS_ERROR=Цей користувач вже існує у вибраній мережі. Будь-ласка, оберіть іншого користувача або мережу.
 service.gui.USERNAME_NULL=Будь-ласка, заповніть своє ім’я користувача та пароль.
@@ -541,7 +513,6 @@ service.gui.USE_PROVISIONING=Використовувати автоналашт
 service.gui.VALUE=Значення:
 service.gui.VIDEO_CALL=&Відеовиклик
 service.gui.VIA=через
-service.gui.VIA_SMS=Через SMS
 service.gui.VIEW=&Показати
 service.gui.VIEW_HISTORY=Показати &історію
 service.gui.VIEW_SMILEYS=Показати &смайли
@@ -561,9 +532,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=Регулювання гучності
 service.gui.WAITING_AUTHORIZATION=Чекаємо авторизації
 service.gui.WARNING=Попередження
 service.gui.YES=Так
-service.gui.YESTERDAY=Вчора
-service.gui.EXISTING_ACCOUNT_ERROR=Введенний обліковий запис вже існує.
-service.gui.NEW_MAIL=<b>У Вас один новий лист!</b><br/><b>От:</b> {0} {1} <br/><b>Тема:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER=Ви відримали нового листа до {0} <a href="{1}">вхідні</a>:<br/>
 service.gui.NEW_GMAIL_MANY_HEADER=Ви відримали {2} нових листів до {0} <a href="{1}">вхідні</a>:<br/>
 service.gui.NEW_GMAIL_FOOTER=ще одине непрочитане повідомлення у<a href="{0}">вхідних</a>.<br/>
@@ -586,7 +554,6 @@ service.gui.SECURITY_ERROR=Помилка безпеки
 service.gui.SPEED=Швидкість:
 service.gui.SILENT_MEMBER=мовчазний участник
 service.gui.NON_SECURE_CONNECTION=Неможливо встановити безпечне з’єднання для {0}. Якщо Ви хочете використовувати незахищене підключення, Будь-ласка, встановіть ознаку "Дозволити незахищене з’єднання" в конфігурації облікового запису
-service.gui.UPDATE=Оновити
 service.gui.MOBILE_PHONE=Мобільний
 service.gui.VIDEO_PHONE=Відеовиклики
 service.gui.WORK_PHONE=Робочий
@@ -619,7 +586,6 @@ service.gui.callinfo.CALL_INFORMATION=Інформація про виклик
 service.gui.callinfo.CALL_IDENTITY=Обліковий запис
 service.gui.callinfo.PEER_COUNT=Кількість учасників
 service.gui.callinfo.IS_CONFERENCE_FOCUS=Конференція
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=Шифрування увімкнено
 service.gui.callinfo.CALL_TRANSPORT=Транспорт сигналізації
 service.gui.callinfo.CALL_DURATION=Тривалість виклику
 service.gui.callinfo.VIEW_CERTIFICATE=Показати сертифікат
@@ -630,7 +596,6 @@ service.gui.callinfo.AUDIO_INFO=Аудіо потік
 service.gui.callinfo.VIDEO_INFO=Відео потік
 service.gui.callinfo.LOCAL_IP=Локальний IP / Порт
 service.gui.callinfo.REMOTE_IP=Віддалений IP / Порт
-service.gui.callinfo.BANDWITH=Смуга пропускання
 service.gui.callinfo.LOSS_RATE=Втрата пакетів
 service.gui.callinfo.RTT=RTT
 service.gui.callinfo.JITTER=Джіттер
@@ -640,10 +605,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=Протокол обміну ключами
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE кандидат розширеного типу
 service.gui.callinfo.ICE_STATE=Стан ICE
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=Отримання кандидатів
 service.gui.callinfo.ICE_STATE.RUNNING=Перевірка підключення
 service.gui.callinfo.ICE_STATE.COMPLETED=Завершено
 service.gui.callinfo.ICE_STATE.FAILED=Помилка
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=Локальний IP / Порт
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=Локальний вхідний IP / Порт
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=Локальний вихідний IP / Порт
@@ -662,9 +630,10 @@ service.gui.ALWAYS_TRUST=Завжди довіряти цьому сертифі
 service.gui.CERT_DIALOG_TITLE=Перевірити сертифікат
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} не може перевірити достовірність сервера при підключенні до<br><b>{1}</b>.<br><br>Не довірений сертифікат. Це означає, що сервер не може бути автоматично перевірений.<br><br> Для отримання додаткової інформації, натисніть кнопку "Показати сертифікат".<br><br>Ви хочете продовжити підключення?</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} не може перевірити достовірність сертифіката сервера<br><br>Не довірений сертифікат. Це означає, що сервер не може бути автоматично перевірений.<br><br> Для отримання додаткової інформації, натисніть кнопку "Показати сертифікат".<br><br>Ви хочете продовжити підключення?</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} не може перевірити достовірність клієнта<br><br>Не довірений сертифікат. Це означає, що клієнт не може бути автоматично перевірений.<br><br> Для отримання додаткової інформації, натисніть кнопку "Показати сертифікат".<br><br>Ви хочете дозволити підключення?</html>
 service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} не може перевірити достовірність клієнта {1}<br><br>Не довірений сертифікат. Це означає, що клієнт не може бути автоматично перевірений.<br><br>Для отримання додаткової інформації, натисніть кнопку "Показати сертифікат".<br><br>Ви хочете продовжити підключення?</html>
 service.gui.CONTINUE_ANYWAY=Однак продовжити
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=Назва сертифіката:
 service.gui.CERT_INFO_O=Організація:
 service.gui.CERT_INFO_C=Країна:
@@ -679,12 +648,10 @@ service.gui.CERT_INFO_VER=Версія:
 service.gui.CERT_INFO_SIGN_ALG=Алгоритм підпису:
 service.gui.CERT_INFO_ALG=Алгоритм:
 service.gui.CERT_INFO_PUB_KEY=Відкритий ключ:
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} байт: {1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} біт
 service.gui.CERT_INFO_EXP=Експонента:
 service.gui.CERT_INFO_KEY_SIZE=Розмір ключа:
 service.gui.CERT_INFO_SIGN=Підпис:
-service.gui.CONTINUE=Продовжити
 service.gui.SHOW_CERT=Показати сертифікат
 service.gui.HIDE_CERT=Приховати сертифікат
 
@@ -705,15 +672,12 @@ service.gui.security.SECURE_AUDIO=Аудіопотік захищено
 service.gui.security.AUDIO_NOT_SECURED=Аудіопотік не захищено
 service.gui.security.SECURE_VIDEO=Відеопотік захищено
 service.gui.security.VIDEO_NOT_SECURED=Відеопотік не захищено
-service.gui.security.NO_VIDEO=Без відео
-service.gui.security.CIPHER=Шифр: {0}
 service.gui.security.CALL_SECURED_TOOLTIP=Розмову захищено.
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=Розмову не захищено.
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=Натисніть тут, щоб звірити ключ із співрозмовником.
-service.gui.security.COMPARE_WITH_PARTNER=Звірте ключ із співрозмовником та натисніть замочок для підтвердження.
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=Звірте ключ із співрозмовником:
-service.gui.security.STRING_COMPARED=Ключ пошкоджено!
+service.gui.security.STRING_COMPARED=Ключ перевірено!
 service.gui.security.SECURITY_ALERT=Ініціалізування захисту виклику. Відключення через
 
 service.gui.avatar.CHOOSE_ICON=Вибрати аватар
@@ -727,19 +691,13 @@ service.gui.avatar.imagepicker.CLICK=Зробити знімок
 service.gui.avatar.imagepicker.IMAGE_FILES=Файли зображень
 service.gui.avatar.imagepicker.IMAGE_PICKER=Зображення
 service.gui.avatar.imagepicker.IMAGE_SIZE=Розмір зображення
-service.gui.avatar.imagepicker.INITIALIZING=Ініціалізування
 service.gui.avatar.imagepicker.RESET=Скинути
 service.gui.avatar.imagepicker.SET=Задати
 service.gui.avatar.imagepicker.TAKE_PHOTO=Зробити знімок
-service.gui.avatar.imagepicker.WEBCAM_ERROR=Помилка вебкамери
 
 service.gui.security.encryption.required=Необхідне шифрування!
 
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=~
 
 impl.protocol.sip.XCAP_ERROR_TITLE=Помилка в адресній книзі SIP
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=Неможливо прочитати ресурс {0}. Для {1}
@@ -762,9 +720,7 @@ impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=Оберіть мережу
 # LDAP
 impl.ldap.CONFIG_FORM_TITLE=Налаштування LDAP
 impl.ldap.GENERAL=Загальні
-impl.ldap.NEW=Новий
 impl.ldap.EDIT=змінити
-impl.ldap.REMOVE=Вилучити
 impl.ldap.ENABLED=Активний
 impl.ldap.SERVER_NAME=Коротке ім’я
 impl.ldap.SERVER_NAME_EXAMPLE=Адресна книга LDAP
@@ -797,6 +753,10 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 impl.ldap.PHONE_PREFIX=Телефонний префікс
 impl.ldap.PHONE_PREFIX_EXAMPLE=Наприклад: +380
 
+# SIP Protocol
+
+#Jabber Protocol
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Адресна книга
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=Увімкнути пошук в адресній книзі MacOSX
@@ -807,9 +767,7 @@ plugin.addrbook.PREFIX_EXAMPLE=Наприклад: +380
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Контакти Google
-impl.googlecontacts.NEW=Новий
 impl.googlecontacts.EDIT=Змінити
-impl.googlecontacts.REMOVE=Вилучити
 impl.googlecontacts.ENABLED=Активний
 impl.googlecontacts.ACCOUNT_NAME=Обліковий запис
 impl.googlecontacts.SAVE=Зберегти
@@ -837,9 +795,6 @@ plugin.accountinfo.COUNTRY=Країна
 plugin.accountinfo.EMAIL=Електронна скринька:
 plugin.accountinfo.PHONE=Телефон:
 plugin.accountinfo.MOBILE_PHONE=mobilePhone
-plugin.accountinfo.USER_PICTURES=Фотографії користувача
-plugin.accountinfo.CHANGE=Змінити
-plugin.accountinfo.ONLY_MESSAGE=Тільки повідомлення
 
 # connection info
 
@@ -858,49 +813,12 @@ plugin.aimaccregwizz.USERNAME=AIM Ім’я:
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=Ідентифікатор користувача та пароль
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=Реєстрування нового облікового запису
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=У випадку, якщо ви не маєте облікового запису AIM, натисніть на цю кнопку, щоб створити новий.
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Перевизначити замовчувані параметри сервера
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=Про нас {0}
 plugin.branding.LOGO_MESSAGE=Open Source VoIP && Обмін миттєвими повідомленнями
-plugin.branding.LOADING=Завантаження
 plugin.branding.ABOUT_MENU_ENTRY=&Про програму
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} наразі в стадії активної розробки. Версія, запущена вами, експеріментальна та може працювати не так как ви чекаєте. Будь-ласка, зверніться до {2} для отримання додаткової інформації.</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2012 Copyright <b>jitsi.org</b>. Всі права захищено. Відвідайте <a href="http://jitsi.org">http://jitsi.org</a>.</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> пиширюється за ліцензією LGPL (<a href="http://www.gnu.org">http://www.gnu.org</a>).</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=Словники
-plugin.dictaccregwizz.ANY_DICTIONARY=Будь-який словник
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=Будь-який словник від {0}
-plugin.dictaccregwizz.FIRST_MATCH=Перший збіг
-plugin.dictaccregwizz.NO_MATCH=Збіги відсутні
-plugin.dictaccregwizz.MATCH_RESULT=Визначень для "{0}" не знайдено, можливо, ви маєте на увазі:\n
-plugin.dictaccregwizz.INVALID_DATABASE=Поточного словника "{0}" не існує на сервері.
-plugin.dictaccregwizz.INVALID_STRATEGY=Поточна стратегия відсутня на сервері.
-plugin.dictaccregwizz.PROTOCOL_NAME=DICT
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=DICT протокол
-plugin.dictaccregwizz.HOST=Хост
-plugin.dictaccregwizz.SERVER_INFO=Інформація про сервер
-plugin.dictaccregwizz.STRATEGY_SELECTION=Вибір методу
-plugin.dictaccregwizz.STRATEGY_LIST=Список методів:
-plugin.dictaccregwizz.SEARCH_STRATEGIES=Пошук методів
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=Використовувати метод для пошуку схожих слів, якщо переклад не був знайдений, завдяки різним методам. Наприклад, номери стратегії буде шукати слова, які починаються, как слово, яке бажано перкласти.
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Інформація про обліковий запис
-plugin.dictaccregwizz.FIRST_ACCOUNT=Цей мастер допоможе створити ваш перший обліковий запис на сайте dict.org.\n\nВи можете додати новий словник зареєструвавши обліковий запис у майстрі. Заповніть поля словника який ви хочете додати.
-plugin.dictaccregwizz.THREAD_CONNECT=Спроба підключення до серверу
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=Спроба підключення не вдалася, це не сервер словників або сервер недоступний
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=Отримання метода
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=Метод не знайдено на сервері
-plugin.dictaccregwizz.POPULATE_LIST=Заповнення списку
-plugin.dictaccregwizz.CLOSING_CONNECTION=Закриття з’єднання
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https://register.facebook.com/editaccount.php">Для того, щоб використовувати Facebook чат необхідно створити "Обліковий запис користувача" <br>в "Налаштуваннях облікового запису " на Facebook.</a><br><br>Примітка: При створенні імені користувача необхідно вийти із сторінки <br>і може знадобитися деякий час, пред тим як ви зможете війти з вашим новим іменем користувача!</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Протокол чату Facebook
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=Ім’я користувача:
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=Ім’я користувача та пароль
+
 
 # generalconfig
 plugin.generalconfig.AUTO_START=Автоматичний запуск {0} при завантаженні компьютера
@@ -910,9 +828,6 @@ plugin.generalconfig.SHOW_HISTORY=Показувати
 plugin.generalconfig.HISTORY_SIZE=останніх повідомлень в новому чаті
 plugin.generalconfig.SEND_MESSAGES_WITH=Надсилати повідомлення при натисненні:
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=Переносити вікно чату поверх всіх вікон при вхідному повідомленні
-plugin.generalconfig.ERROR_PERMISSION=У вас немає достатніх привілеїв для відключения автозапуску
-plugin.generalconfig.TRANSPARENCY=Прозорість
-plugin.generalconfig.ENABLE_TRANSPARENCY=Увімкнути прозорість
 plugin.generalconfig.DEFAULT_LANGUAGE=Мова інтерфейсу
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=Зміни будуть застосовані після наступного запуску Jitsi.
 plugin.generalconfig.SIP_CLIENT_PORT=Порт SIP
@@ -961,6 +876,8 @@ plugin.ircaccregwizz.USE_DEFAULT_PORT=Використовувати замов�
 plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=Мій псевдонім не вимагає ідентифікації
 plugin.ircaccregwizz.HOST=Хост:
 plugin.ircaccregwizz.IRC_SERVER=Сервер
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=Ідентифікація {0}
+plugin.ircaccregwizz.SASL_USERNAME=Ім’я користувача
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
@@ -983,13 +900,10 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=Коментар
 plugin.jabberaccregwizz.RESOURCE=Ресурс
 plugin.jabberaccregwizz.AUTORESOURCE=Автоматичне створення ресурсу
 plugin.jabberaccregwizz.PRIORITY=Приорітет
-plugin.jabberaccregwizz.XMPP_ERROR=Помилка XMPP
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=Невідома помилка XMPP. Упевніться, що назва сервера, правильна.
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=Паролі не співпадають.
 plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Перевизначити параметри замовчувані сервера
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=Додаткові параметри
 plugin.jabberaccregwizz.USE_ICE=Використовувати ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=Використовувати Google Jingle/ICE (експеріментальна функція)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=Автоматично знаходити STUN/TURN сервери
 plugin.jabberaccregwizz.SUPPORT_TURN=Підтримувати TURN
 plugin.jabberaccregwizz.TURN_USERNAME=Ім’я користувача TURN
@@ -1016,11 +930,8 @@ plugin.jabberaccregwizz.ALLOW_NON_SECURE=Дозволити небезпечні
 plugin.jabberaccregwizz.DTMF_AUTO=Автоматично вибирати між RTP та Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=Параметри сервера
 plugin.jabberaccregwizz.CHANGE_PASSWORD=Змінити пароль
-plugin.jabberaccregwizz.NEW_PASSWORD=Новий пароль
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=Повторіть пароль
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=Будь-ласка, необхідно вказати вірний порт для продовження.
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=Щоб змінити пароль необхідно війти на сервер.
-plugin.jabberaccregwizz.PASSWORD_EMPTY=Пароль порожній.
 plugin.jabberaccregwizz.TLS_REQUIRED=З’єднання не зашифрівано! Пароль не буде змінено.
 plugin.jabberaccregwizz.PASSWORD_CHANGED=Пароль успішно змінено
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=Ваш сервер не підтримує заміну пароля.
@@ -1034,21 +945,6 @@ plugin.jabberaccregwizz.RESET=Скинути
 plugin.jabberaccregwizz.RESET_DESCRIPTION=Скинути до глобальнхе налаштуваннь
 plugin.jabberaccregwizz.DISABLE_JINGLE=Вимкнути Jingle (ауіио та відеодзвінки через XMPP).
 
-# mailbox
-plugin.mailbox.OUTGOING=Вихідні повідомлення:
-plugin.mailbox.INCOMING=Вхідні повідомлення:
-plugin.mailbox.WAIT_TIME=Дзвінок переводиться на автоовідповідач
-plugin.mailbox.MAX_MESSAGE_TIME=Максимальна тривалість вхідних повідомлень
-plugin.mailbox.CONFIRM=Підтвердити
-plugin.mailbox.DEFAULTS=За замовчуванням
-plugin.mailbox.MAILBOX=Поштова скринька
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=Протокол для підключення та чату на MSN службі.
-plugin.msnaccregwizz.USERNAME=Електронна скринька:
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=ID та пароль
-
 # plugin manager
 plugin.pluginmanager.INSTALL=Встановити
 plugin.pluginmanager.UNINSTALL=Вилучити
@@ -1077,7 +973,6 @@ plugin.sipaccregwizz.SERVER_PORT=Порт сервера
 plugin.sipaccregwizz.PROXY=Проксі
 plugin.sipaccregwizz.PROXY_PORT=Порт проксі
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=Надавати перевагу транспорту
-plugin.sipaccregwizz.ADVANCED_OPTIONS=Додаткові параметри
 plugin.sipaccregwizz.PROXY_OPTIONS=Налаштування проксі-сервера
 plugin.sipaccregwizz.PROXY_AUTO=Автоматичне налаштування проксі-сервера
 plugin.sipaccregwizz.ENABLE_PRESENCE=Увімкнути присутність (SIMPLE)
@@ -1094,8 +989,6 @@ plugin.sipaccregwizz.DTMF_AUTO=Автоматично вибирати між RT
 plugin.sipaccregwizz.DTMF_RTP=RTP (RFC2833 / RFC4733)
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP INFO
 plugin.sipaccregwizz.DTMF_INBAND=Inband
-plugin.sipaccregwizz.REGISTER=REGISTER
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=Перевизначити замовчувані параметри сервера
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=Увімкнути підтримку шифрування дзвінків
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=Повідомляти про підтримку ZRTP у протоколі сигналізації
 plugin.sipaccregwizz.AUTH_NAME=Ім’я для авторизації
@@ -1116,10 +1009,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=URI для перевірки ГП
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=Паролі не співпадають.
 plugin.sipaccregwizz.NO_CERTIFICATE=<не> (використовувати звичайну перевірку справжності)
 plugin.sipaccregwizz.SAVP_OPTION=Використання RTP/SAVP
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Вимкнено (використовувати тільки RTP/AVP)
 plugin.sipaccregwizz.SAVP_OPTION_1=Обов’язково (пропонувати та приймати тільки RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=Додатково (спочатку пропонувати RTP/SAVP, потім RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=Увімкнути S-дескриптор (також відомий як SDES або SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=Виберіть протоколи шифрування та їхній пріоритет (вгорі протокол з вищим пріоритетом):
 plugin.sipaccregwizz.CIPHER_SUITES=Доступні набори шифрів:
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} намагатиметься автоматично захистити всі Ваши дзвінки за допомогою ZRTP. Ви будете поінформовані про це кожного разу, здійснюючи виклик. Ви можете змінювати додаткові налаштування тільки в тому випадку, якщо добре розумієте, що робите.</div></html>
@@ -1133,15 +1026,6 @@ plugin.skinmanager.DEFAULT_SKIN=Скіни замовчувані
 plugin.skinmanager.ADD_NEW_SKIN=Додати новий скін...
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=Скини додатку замовчувані.
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=Протокол для підключення до віддаленого комп’ютера через SSH.
-plugin.sshaccregwizz.USERNAME=ID облікового запису:
-plugin.sshaccregwizz.IDENTITY_FILE=Особистий файл:
-plugin.sshaccregwizz.KNOWN_HOSTS=Відомі хости:
-plugin.sshaccregwizz.OPTIONAL=Необов’язковий
-plugin.sshaccregwizz.ACCOUNT_DETAILS=Інформація про обліковий запис
-
 # status update
 plugin.autoaway.AUTO_STATUS=Авто відсутність
 plugin.autoaway.ENABLE_CHANGE_STATUS=Змінити статус, коли відійшов
@@ -1188,22 +1072,6 @@ plugin.whiteboard.DESELECT=Відмінити
 plugin.whiteboard.DELETE=Вилучити
 plugin.whiteboard.PROPERTIES=Властивості
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=Протокол Yahoo.
-plugin.yahooaccregwizz.USERNAME=Ім’я користувача:
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=ID та пароль
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Zeroconf (Bonjour) протокол.
-plugin.zeroaccregwizz.FIRST_NAME=Ім’я:
-plugin.zeroaccregwizz.LAST_NAME=Прізвище:
-plugin.zeroaccregwizz.EMAIL=Електронна скринька:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=Запам’ятати Bonjour контакти?
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=ID та пароль
-plugin.zeroaccregwizz.USERID=Ідентифікатор користувача
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=Протокол Google Talk
@@ -1217,19 +1085,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org, портал IP Теле�
 plugin.iptelaccregwizz.USERNAME=Ім’я користувача
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=Підписатися на iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP та чат
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=Ім’я користувача
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=Введіть пароль еще раз
 plugin.sip2sipaccregwizz.EMAIL=Адреса електронної пошти
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=Для отримання довідки про послугу відвідайте<br>http://wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>Адреса електронної пошти використовується для відправки голосових повідомлень, <br>інформувань про пропущені дзвінки, а також відновлення втраченого паролю</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>Для отримання довідки про послугу відвідайте<a href=''>http://wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=Існуючий sip2sip.info обліковий запис
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=Створити безкоштовний обліковий запис sip2sip.info
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && Миттєві повідомлення
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=Для отримання довідки про послугу відвідайте<br>http://ippi.fr
@@ -1238,6 +1098,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=Існуючі ippi обліковий з
 plugin.ippiaccregwizz.CREATE_ACCOUNT=Створити безкоштовний обліковий запис ippi
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=Закрити вікно чату
 plugin.keybindings.CHAT_COPY=Копіювати
 plugin.keybindings.CHAT_CUT=Вирізати
@@ -1260,9 +1121,9 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=Дія
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=Поєднання клавіш
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=Додатково
 plugin.keybindings.globalchooser.PRESS_BTN=Натисніть для визначення поєдняння клавіш
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=Чекання
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=Увімкнути виявлення спеціальних клавіш
 plugin.keybindings.PLUGIN_NAME=Поєднання клавіш
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=Чат
 plugin.keybindings.MAIN=Основні
 plugin.keybindings.GLOBAL=Глобальні
@@ -1290,6 +1151,7 @@ plugin.notificationconfig.tableheader.SOUND=Системний звуковий
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=Звуковий сигнал через динаміки
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=Звуковий сигнал через динамік ПК
 plugin.notificationconfig.tableheader.DESCRIPTION=Опис події
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=Вхідний дзвінок
 plugin.notificationconfig.event.SecurityMessage=Повідомлення безпеки
 plugin.notificationconfig.event.IncomingFile=Отримано файл
@@ -1380,6 +1242,7 @@ impl.neomedia.configform.VIDEO=Відео
 
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultProfile=Профіль для кодування:
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=Базовий
 impl.neomedia.configform.H264.defaultProfile.main=Основний
 impl.neomedia.configform.H264.preferredKeyFrameRequester=Метод запиту ключових кадрів:
@@ -1407,7 +1270,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=Поточний паро�
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=Введіть новий пароль:
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=Введіть пароль повторно:
 plugin.securityconfig.masterpassword.MP_TITLE=Майстер-пароль
-plugin.securityconfig.masterpassword.MP_NOT_SET=(не встановлено)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=Ви ввели неправильний поточний Майстер-пароль. Будь-ласка, спробуйте еще раз.
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=Майстер-пароль неправильний!
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=Замінити пароль не вдалося
@@ -1486,7 +1348,6 @@ plugin.globalproxy.PROXY_PORT=Порт
 plugin.globalproxy.PROXY_USERNAME=Ім’я користувача
 plugin.globalproxy.PROXY_PASSWORD=Пароль
 plugin.globalproxy.DESCRIPTION={0} буде використовувати перелічені параметри проксі-сервера для всіх мереж при наступному підключенні. \nПідтримка проксі в даний час експеріментальна та працює тільки з деякими протоколами. Дивіться таблицю нижче для більш докладної інформації:
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table><tralign="center"><td></td><td>SOCKS4/5</td><td>SOCKS4/5+Auth</td><td>HTTP</td><td>HTTP+Auth</td></tr><tralign="center"><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tralign="center"><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tralign="center"><td>XMPP</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tralign="center"><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 
 # plugin reconnect
@@ -1520,7 +1381,6 @@ plugin.provisioning.RESTART_WARNING=Зміни вступлять в силу т
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=Скопіювати UUID до буфера
 plugin.provisioning.CLIPBOARD_FAILED=Помилка копіювання UUID до буфера
-plugin.provisioning.EXIT_ON_FAIL=Закривати Jitsi, якщо автоналаштування не виконано
 plugin.provisioning.CREDENTIALS=Обліковий запис для автоналаштування
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=Ви дійсно хочете скинути пароль для автоналаштування?
 plugin.provisioning.PROV_FAILED=Автоналаштування не вдале
@@ -1587,8 +1447,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0} намагався підкл
 #plugin spellcheck
 plugin.spellcheck.TITLE=Орфографія та Граматика
 plugin.spellcheck.MENU=Відкрити словник
-plugin.spellcheck.LANG=Мова
-plugin.spellcheck.EDIT_PERSONAL_DICT=Правка
 plugin.spellcheck.ENABLE_SPELL_CHECK=Перевірка правопису
 plugin.spellcheck.dialog.FIND=Знайти наступне
 plugin.spellcheck.dialog.REPLACE=Замінити
diff --git a/resources/languages/resources_zh_CN.properties b/resources/languages/resources_zh_CN.properties
index ebd3026..ad854c2 100644
--- a/resources/languages/resources_zh_CN.properties
+++ b/resources/languages/resources_zh_CN.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -25,92 +36,84 @@
 # from your system's language, pass the language code to ant:
 # ant -Duser.language=xx run
 
-service.gui.ABOUT=关于
-service.gui.ACCEPT=接受
+service.gui.ABOUT=关于 (&A)
+service.gui.ACCEPT=接受 (&A)
 service.gui.ACCOUNT=帐户
 service.gui.ACCOUNT_ME=自己
 service.gui.ACCOUNT_REGISTRATION_WIZARD=帐号注册向导
 service.gui.ACCOUNTS=帐号
 service.gui.ADD=添加
-service.gui.ADD_ACCOUNT=添加帐号
 service.gui.ADD_CONTACT=添加联系人
-service.gui.ADD_AUTHORIZED_CONTACT=添加{0}到你的通讯簿上
+service.gui.ADD_AUTHORIZED_CONTACT=将{0}添加到通讯录
 service.gui.ADD_CONTACT_TO_CONTACTLIST=将此联系人添加到您的联系人列表中
 service.gui.ADD_CONTACT_TO=添加联系人到
-service.gui.ADD_CONTACT_ERROR=添加联系人：{0}失败
+service.gui.ADD_CONTACT_ERROR=添加以下联系人是失败：{0}
 service.gui.ADD_CONTACT_ERROR_TITLE=添加联系人错误
-service.gui.ADD_CONTACT_EXIST_ERROR=联系人{0}已经存在于您的联系人名单中了。
-service.gui.ADD_CONTACT_NETWORK_ERROR=服务器未能响应你添加联系人ID为{0}的联系人的请求。
-service.gui.ADD_CONTACT_NOT_SUPPORTED=无法添加联系人Id为{0}的联系人。不支持此操作。
-service.gui.ADD_CONTACT_IDENTIFIER=请在下面输入栏中输入您想要添加的联系人的称呼。
-service.gui.ADD_CONTACT_WIZARD=添加联系人向导
-service.gui.ADD_CONTACT_NOT_CONNECTED=你需要连接以便添加联系人。请选择一个连接类型并重试。
-service.gui.ADD_GROUP_LOCAL_ERROR=添加组：{0} 失败。错误出自本地IO操作。
+service.gui.ADD_CONTACT_EXIST_ERROR=联系人{0}在通讯录中已存在。
+service.gui.ADD_CONTACT_NETWORK_ERROR=服务器未响应您添加以下联系人的请求：{0}
+service.gui.ADD_CONTACT_NOT_SUPPORTED=添加联系人{0}失败。不支持的操作。
+service.gui.ADD_CONTACT_NOT_CONNECTED=添加联系人时您必须处于连接状态。请登录到选择的服务提供商并重试。
+service.gui.ADD_GROUP_LOCAL_ERROR=添加组：{0} 失败。本地IO时发生错误。
 service.gui.ADD_GROUP_EXIST_ERROR=组 {0} 已经存在于您的联系人名单中了。请选择另一个名称。
 service.gui.ADD_GROUP_NET_ERROR=添加组：{0} 失败。网络错误。请检查您的网络连接然后重试。
 service.gui.ADD_GROUP_ERROR=添加组：{0}失败。
 service.gui.ADD_GROUP_EMPTY_NAME=组名称不能为空。
-service.gui.ADD_GROUP=创建组
-service.gui.ADD_SUBCONTACT=添加紧急联络人
 service.gui.ADDRESS=地址
 service.gui.ADMINISTRATOR=管理员
 service.gui.ADVANCED=高级
-service.gui.ALL=所有
 service.gui.ALL_CONTACTS=所有联系人
 service.gui.ALTERNATE_ADDRESS=备用地址
 service.gui.APPLY=应用
-service.gui.ARE_CALLING={0}正被呼叫。。。
+service.gui.ARE_CALLING={0}正在呼叫。。。
 service.gui.ARE_NOW=你现在是{0}
 service.gui.AT=位于
-service.gui.AUTHORIZE=认证
-service.gui.AUTHORIZATION_ACCEPTED={0}已经接受您的身份验证请求。
+service.gui.AUTHORIZE=身份验证
+service.gui.AUTHORIZATION_ACCEPTED={0}已接受您的身份验证请求。
 service.gui.AUTHENTICATION_FAILED=帐号{0}身份验证失败。您输入的密码错误。
-service.gui.AUTHENTICATION_REQUESTED=认证请求已被响应
-service.gui.AUTHENTICATION_REQUESTED_SERVER=服务器 {0} 已响应您的验证请求。
-service.gui.AUTHENTICATION_REJECTED={0}已经拒绝您的身份验证请求。
-service.gui.AUTHENTICATION_WINDOW_TITLE={0}验证
-service.gui.AUTHORIZATION_REQUESTED=请求验证已被响应
-service.gui.AUTHORIZATION_REQUESTED_INFO=联系人 {0} 需要您提供验证信息。
-service.gui.AUTHORIZATION_RESPONSE=认证响应
+service.gui.AUTHENTICATION_REQUESTED_SERVER=服务器 {0} 已发送了您的身份验证请求。
+service.gui.AUTHENTICATION_REJECTED={0 }已拒绝了您的身份验证请求。
+service.gui.AUTHENTICATION_WINDOW_TITLE={0} 身份验证
+service.gui.AUTHORIZATION_REQUESTED=请求身份验证
+service.gui.AUTHORIZATION_REQUESTED_INFO=联系人 {0} 请求您通过身份验证。
+service.gui.AUTHORIZATION_RESPONSE=身份验证回复
 service.gui.AWAY_STATUS=离开
-service.gui.EXTENDED_AWAY_STATUS=离开
+service.gui.EXTENDED_AWAY_STATUS=远远离开
 service.gui.BAN=禁止
-service.gui.BANNED=禁止
+service.gui.BANNED=已禁止
 service.gui.BAN_FAILED=禁止操作失败
-service.gui.BAN_FAILED_GENERAL_ERROR=阻止 {0} 失败。服务器一般性错误。
-service.gui.BAN_FAILED_NOT_ALLOWED=禁止{0} 失败。聊天室的创建人或管理员不能被禁止。
+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.BRB_MESSAGE=我现在不在，稍后回来。
 service.gui.BROWSE=浏览
-service.gui.BUSY_MESSAGE=抱歉，业务正忙。
-service.gui.BUSY_STATUS=忙
+service.gui.BUSY_MESSAGE=抱歉，我现在有点忙。
+service.gui.BUSY_STATUS=占线
 service.gui.CALL=呼叫
 service.gui.CALL_CONTACT=呼叫联系人
 service.gui.CALL_FAILED=呼叫失败
-service.gui.CALL_HISTORY_TOOL_TIP=点击这里显示呼叫历史
-service.gui.CALL_HISTORY_GROUP_NAME=呼叫记录
-service.gui.CALL_VIA=转接呼叫：
-service.gui.CALL_NAME_OR_NUMBER=呼叫名称或号码
-service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=本次呼叫仅允许来自{0}网络的您的联系人帐号{1}。{2}不属于该网络或此帐户不存在。
-service.gui.CALL_WITH=呼叫对话
-service.gui.CALL_NO_AUDIO_DEVICE=无音频设备，请设置。
-service.gui.CALL_NO_AUDIO_CODEC=无可用的音频编码方案，请添加或启用。
-service.gui.CALL_NO_DEVICE_CODECS_Q=您需要继续此呼叫么？
+service.gui.CALL_HISTORY_TOOL_TIP=点击这里显示通话记录
+service.gui.CALL_HISTORY_GROUP_NAME=通话记录
+service.gui.CALL_VIA=通话方式：
+service.gui.CALL_NAME_OR_NUMBER=通话名称或号码
+service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=此通话仅支持来自网络{0}以及您的账户{1}的参与者。{2}不属于这个网络或账户。
+service.gui.CALL_WITH=通话
+service.gui.CALL_NO_AUDIO_DEVICE=您没有配置音频设备。
+service.gui.CALL_NO_AUDIO_CODEC=您没有启用任何音频编码器。
+service.gui.CALL_NO_DEVICE_CODECS_Q=您要继续进行呼叫吗？
 service.gui.CANCEL=取消
 service.gui.CHAT=聊天
 service.gui.CHANGE_FONT=更改字体
-service.gui.CHANGE_ROOM_SUBJECT=修改聊天室标题...
-service.gui.CHANGE_ROOM_SUBJECT_LABEL=请在下面的输入框内，您可以输入聊天室的新名称。
+service.gui.CHANGE_ROOM_SUBJECT=修改聊天室主题...
+service.gui.CHANGE_ROOM_SUBJECT_LABEL=您可以在下方输入本聊天室的新主题。
 service.gui.CHANGE_NICK=更改昵称
-service.gui.CHANGE_NICKNAME=修改昵称...
-service.gui.CHANGE_NICKNAME_LABEL=请在下面的输入框内，您可以输入您的新昵称。
+service.gui.CHANGE_NICKNAME=更改昵称...
+service.gui.CHANGE_NICKNAME_LABEL=您可以在下方输入新的昵称。
 service.gui.CHANGE_NICKNAME_ERROR=更改昵称时出错
-service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=昵称存在重复
-service.gui.CHANGE_VIDEO_QUALITY=改变远端视频质量
-service.gui.CHAT_CONFERENCE_LABEL=会议
-service.gui.CHAT_CONFERENCE_ITEM_LABEL={0}的会议
-service.gui.CHAT_ROOM_ALREADY_JOINED={0}已加入聊天室。
-service.gui.CHAT_ROOM_CONFIGURATION={0}聊天室的配置信息
+service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=昵称已存在
+service.gui.CHANGE_VIDEO_QUALITY=更改远程视频质量
+service.gui.CHAT_CONFERENCE_ITEM_LABEL={0} 的会议
+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}的配置时发生错误。
@@ -118,31 +121,28 @@ service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_TITLE=编辑成员列表
 service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_DESCRIPTION=列在右侧的用户将拥有此聊天室成员角色。当聊天室被设置为“仅成员”模式时仅这些用户被允许加入。
 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_KICKED=已被踢出 {0}
 service.gui.CHAT_ROOM_USER_QUIT=已退出 {0}
-service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=消息发送被拒(语音被撤销)
-service.gui.CHAT_ROOM_SAVE_BUTTON_TOOLTIP=收藏聊天室，以便将来使用
-service.gui.CHAT_ROOM_REMOVE_BUTTON_TOOLTIP=从聊天室收藏目录移除选择的聊天室
+service.gui.CHAT_ROOM_SEND_MSG_FORBIDDEN=消息发送被拒绝 (语音被撤销)
 service.gui.CHAT_ROOM_NAME=聊天室名
 service.gui.CLEAR_CUSTOM_MESSAGES=清除临时消息
 service.gui.ROOM_NAME=聊天室
-service.gui.AUTOJOIN=自动加入
 service.gui.CHANGE_PASSWORD=修改密码
 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_LEAVE_NOT_CONNECTED=您必须先登录上服务器才能退出聊天室。
-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_ROOM_REQUIRES_PASSWORD=聊天室 {0} 要求输入密码。
 service.gui.CHAT_ROOMS=聊天室
 service.gui.CHAT_ROOM=聊天室
-service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} 已经更换了新主题 {1}
-service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=您可在下列聊天室:{0}继续您的会话
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} 已将聊天室主题更改为 {1}
+service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=您可下列聊天室继续您的会话：{0}
+service.gui.CHAT_NICKNAME_CHANGE={0} 现在是 {1}
 service.gui.CHOOSE_CONTACT=选择联系人
 service.gui.CHOOSE_NUMBER=选择号码
-service.gui.CHOOSE_ACCOUNT=请从帐号列表选择一个帐号。
+service.gui.CHOOSE_ACCOUNT=请从列表中选择一个帐号。
 service.gui.CITY=城市
 service.gui.COUNTRY=国家
 service.gui.SHOW_MORE_TOOLTIP=点击查看更多结果
@@ -150,22 +150,20 @@ service.gui.CLEAR=清除
 service.gui.CLOSE=关闭
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=您2秒前刚收到新消息。是否要结束本次聊天？
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=有进行中的文件传输。你要取消它们吗？
-service.gui.CONFIRM=确认
 service.gui.CONNECTED_STATUS=已连接
 service.gui.CONNECTING=连接中...
 service.gui.CONNECTING_STATUS=连接中
 service.gui.CONNECTING_EARLY_MEDIA_STATUS=连接中*
 service.gui.CONNECTION=连接
-service.gui.CONNECTION_FAILED_MSG=账号登录失败：用户名：{0}；服务器名：{1}。请检查您的网络连接或联系管理员寻求更多信息。
 service.gui.CONNECTION_EXPIRED_MSG=您已经断开与服务器 {0} 的连接。
 service.gui.CONTACT_NAME=ID或号码
-service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=您选择的联系人{0}不支持通话。
+service.gui.CONTACT_NAME_PROMPT=jane.doe@example.com
+service.gui.CONTACT_NAME_INFO=添加一个及时通讯地址 （比如 jane.doe@example.com）或者 VoIP 号码
 service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=您选择的联系人{0}不支持群聊。
 service.gui.CONTACT_PAUSED_TYPING={0} 暂停输入
 service.gui.CONTACT_TYPING={0} 正在输入消息
-service.gui.CONTACT_TYPING_SEND_FAILED=啊-哦...我们不能向{0}宣告你正在书写
+service.gui.CONTACT_TYPING_SEND_FAILED=啊-哦...我们不能向 {0} 宣告你正在键入
 service.gui.CONTACT_INFO=联系人信息
-service.gui.CONTACTLIST=联系人目录
 service.gui.CONTACTS=联系人
 service.gui.COPY=复制(&C)
 service.gui.COPY_LINK=复制链接(&L)
@@ -175,33 +173,32 @@ service.gui.CREATE_CHAT_ROOM=创建聊天室(&C)...
 service.gui.CREATE_CHAT_ROOM_ERROR=创建聊天室 {0} 失败.
 service.gui.CREATE_CHAT_ROOM_WIZARD=聊天室新建向导
 service.gui.CREATE_CONFERENCE_CALL=创建聊天室(&C)
-service.gui.CREATE_CONFERENCE_CHAT=创建聊天室(&C)
 service.gui.CREATE_GROUP=新建组(&C)
 service.gui.CREATE_GROUP_NAME=请在下面输入栏中输入您想要创建的组名.
-service.gui.CREATE_FIRST_GROUP_WIZARD=您的联系人名单中没有任何组. 请创建一个组 (文件/新建组).
 service.gui.CREATE_VIDEO_BRIDGE=创建视频桥接中...
 service.gui.CREATE_VIDEO_BRIDGE_MENU=创建视频桥接
 service.gui.CREATE_JOIN_VIDEO_CONFERENCE=创建/加入视频会议
 service.gui.CREATE_VIDEO_CONFERENCE=为此聊天室创建一个新的视频会议
 service.gui.CONTACT_INFO_NOT_SUPPORTED=该联系人不支持网络名片
 service.gui.CUT=剪切(&U)
-service.gui.DATE=日期
 service.gui.DELETE=删除
 service.gui.DENY=拒绝(&D)
 service.gui.DESKTOP_SHARING_WARNING=<b>您确定要开始屏幕共享?</b> <br> 点击确定将允许对方查看您的屏幕.
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=您正在共享屏幕
 service.gui.DIALPAD=拨号面板
 service.gui.DISPLAY_NAME=显示名称
+service.gui.DISPLAY_NAME_PROMPT=Jane Doe
+service.gui.DISPLAY_NAME_INFO=为这个联系人添加一个名称。如果留空的话，将会使用及时通讯地址或 VoIP 填补。（可选）
 service.gui.DISCONNECTED_STATUS=已断开
 service.gui.DND_STATUS=请别打扰
 service.gui.DO_NOT_ASK_AGAIN=请不要重复询问
 service.gui.DO_NOT_SHOW_AGAIN=请不要重复此消息
-service.gui.DOWNLOAD_NOW=马上下载(&D)
 service.gui.DRAG_FOR_SHARING=将任何你想共享的东西拖动到这里...
 service.gui.DURATION=持续时间
 service.gui.DESTROY_CHATROOM=撤销聊天室
 service.gui.DESTROY_MESSAGE=告知其他参与者，请输入一个理由和加入替代聊天室地址。
 service.gui.EDIT=编辑(&E)
-service.gui.EDITED_AT={0}正在录入
+service.gui.EDITED_AT=编辑于 {0}
 service.gui.EMAIL=Email
 service.gui.EMAILS=电子邮件
 service.gui.EMPTY_HISTORY=清空历史(&E)
@@ -216,7 +213,6 @@ service.gui.ERROR_RECEIVED_FROM=从{0}处收到错误信息
 service.gui.ESTIMATED_TIME=估计时间:
 service.gui.EVENTS=事件
 service.gui.EXIT=退出(&E)
-service.gui.EXTENDED_CRITERIA=延时标准
 service.gui.GENERAL=通用
 service.gui.GENERAL_ERROR=一般错误
 service.gui.GROUP_NAME=组名
@@ -253,24 +249,23 @@ service.gui.FOLDER_OPEN_NO_APPLICATION=无法找到应用程序打开这个文�
 service.gui.FONT=字体
 service.gui.FONT_BOLD=粗体
 service.gui.FONT_COLOR=颜色
-service.gui.FONT_FAMILY=类型
+service.gui.FONT_FAMILY=家族
 service.gui.FONT_ITALIC=斜体
 service.gui.FONT_SIZE=大小
-service.gui.FONT_STYLE=风格
+service.gui.FONT_STYLE=样式
 service.gui.FONT_UNDERLINE=下划线
-service.gui.FROM=从{1}到{0}
 service.gui.GRANT_OWNERSHIP=授予所有权
 service.gui.GRANT_ADMIN=授予管理权
-service.gui.GRANT_MODERATOR=授予群主权限
+service.gui.GRANT_MODERATOR=授予主持人权限
 service.gui.GRANT_MEMBERSHIP=授予成员权限
-service.gui.GRANT_VOICE=允许发言
-service.gui.GUEST=访问者
+service.gui.GRANT_VOICE=授予语音权限
+service.gui.GUEST=访客
 service.gui.HANG_UP=挂断
 service.gui.HD_QUALITY=HD视频
 service.gui.HELP=帮助(&H)
 service.gui.HIDE=隐藏
 service.gui.HIDE_OFFLINE_CONTACTS=隐藏离线联系人
-service.gui.HIDE_MAIN_WINDOW=<DIV>点击快捷键 X 隐藏窗口。<BR>如果需要退出，请选择 文件/退出。</DIV>
+service.gui.HIDE_MAIN_WINDOW=<DIV>单击窗口上的X只会隐藏窗口，而不会真正退出程序。<BR>如果您要退出程序，请选择”文件/退出“命令。</DIV>
 service.gui.HISTORY=历史(&H)
 service.gui.HISTORY_CONTACT=历史记录 - {0}
 service.gui.HISTORY_TOGGLE_PER_CONTACT=关闭此联系人操作历史
@@ -284,20 +279,21 @@ service.gui.HISTORY_REMOVE_ALL_WARNING=您确认想要永久删除本地存储�
 service.gui.HISTORY_REMOVE_ERROR=删除本地存储消息时出错。
 service.gui.HOME=首页
 service.gui.HOME_PAGE=主页
-service.gui.HOUR=时
 service.gui.ICE=ICE
 service.gui.IDENTIFIER=称呼
 service.gui.IGNORE=忽略(&I)
 service.gui.INSERT_SMILEY=表情
-service.gui.INCOMING_CALL=来自{0}的呼叫请求
+service.gui.INCOMING_CALL=来自{0}的通话请求
+service.gui.INCOMING_SCREEN_SHARE=收到屏幕共享请求，来自：{0}
 service.gui.INCOMING_CALL_STATUS=来电
-service.gui.INSTANT_MESSAGINGS=短信
-service.gui.IM=即時聊天
-service.gui.INITIATING_CALL_STATUS=初始化呼叫
-service.gui.INVITATION=邀请
+service.gui.INCOMING_SCREEN_SHARE_STATUS=传入的屏幕共享请求
+service.gui.INSTANT_MESSAGINGS=即时聊天
+service.gui.IM=即时聊天
+service.gui.INITIATING_CALL_STATUS=正在初始化呼叫
+service.gui.INVITATION=邀请文本
 service.gui.INVITATION_RECEIVED=收到邀请
-service.gui.INVITATION_RECEIVED_MSG={0} 邀请 {1} 加入聊天室. 您可以选择同意, 拒绝或者忽略这个邀请.
-service.gui.INVITATION_REJECTED={0}已经拒绝您的加入聊天室邀请。原因：{1}。
+service.gui.INVITATION_RECEIVED_MSG={0} 邀请您加入聊天室{1}。您可以选择同意，拒绝或忽略此邀请。
+service.gui.INVITATION_REJECTED={0} 已经拒绝您的加入聊天室邀请。原因：{1}。
 service.gui.INVITE=邀请(&I)
 service.gui.INVITE_CONTACT_MSG=如果想进行精确查找, 请输入该用户的名称.
 service.gui.INVITE_CONTACT_TO_CHAT=邀请其他联系人加入聊天
@@ -306,13 +302,10 @@ service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=邀请联系人视频桥接
 service.gui.INVITE_REASON=邀请理由
 service.gui.IS_CALLING={0}正在呼叫...
 service.gui.IS_NOW={0}已更名为{1}
-service.gui.JITSI_WARNING=SIP Communicator 最近已经更名为 Jitsi.<br/>如果您想保持您的版本最新,请下载Jitsi.<br/><br/>给您带来的不便敬请谅解.<br/><br/>Jitsi 开发小组
-service.gui.JITSI_WARNING_TITLE=SIP Communicator 已更名为 Jitsi
 service.gui.JOIN=加入(&J)
-service.gui.JOIN_AS=选择名称加入(&O)
-service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=加入一个就绪的视频会议
+service.gui.JOIN_AS=加入为(&O)
+service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=加入现有的视频会议
 service.gui.JOIN_VIDEO=加入视频会话
-service.gui.CLOSE_CHAT_ROOM_DIALOG=关闭(&L)
 service.gui.JOB_TITLE=职位
 service.gui.JOIN_CHAT_ROOM=加入聊天室(&J)...
 service.gui.JOIN_CHAT_ROOM_TITLE=加入聊天室
@@ -325,14 +318,13 @@ 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.LAST_NAME=姓
+service.gui.LAST_NAME=您的姓氏
 service.gui.LEAVE=离开(&L)
 service.gui.LIMIT_REACHED_FOR_IP=本地IP地址注册账户过多, 服务器 {0} 不能接受更多注册.
 service.gui.LIST=所有聊天室
 service.gui.LOADING_ROOMS=载入中...
 service.gui.LOADING=正在加载...
-service.gui.LOCALLY_ON_HOLD_STATUS=本地挂起
+service.gui.LOCALLY_ON_HOLD_STATUS=本地正呼叫等待中
 service.gui.LOGIN_NETWORK_ERROR=由于网络连接原因,登录失败:用户名:{0},服务器:{1}.请检查网络连接.
 service.gui.LOGIN_GENERAL_ERROR=登录账户出错: 用户名: {0}, 服务器名: {1}.
 service.gui.LOGIN_INTERNAL_ERROR=登录错误，用户名：{0}，服务器：{1}。这应该是一个应用程序内部错误。请通过开发者邮件列表将问题报告给我们（dev@jitsi.java.net）。
@@ -340,12 +332,11 @@ service.gui.LOGIN_INVALID_PROPERTIES_ERROR=由于帐号配置问题，登录失�
 service.gui.LOGOFF_NOT_SUCCEEDED=退出账户出错: 用户名: {0}, 服务器名: {1}.
 service.gui.LOW_QUALITY=低品质
 service.gui.MEMBER=成员
-service.gui.MERGE_TO_CALL=合并呼叫
+service.gui.MERGE_TO_CALL=合并所有通话
 service.gui.MESSAGE=消息
 service.gui.MISSED_CALLS_TOOL_TIP=未接来电来自：
 service.gui.MISSED_CALLS_MORE_TOOL_TIP= 还有{0}条
-service.gui.MODERATOR=群主
-service.gui.MORE=查看更多
+service.gui.MODERATOR=主持人
 service.gui.MORE_LABEL=展开
 service.gui.MOVE=移动
 service.gui.MOVE_SUBCONTACT=移动联系人
@@ -354,12 +345,12 @@ service.gui.MOVE_SUBCONTACT_FAILED=您选择的联系人已经存在。\n请重�
 service.gui.MOVE_SUBCONTACT_QUESTION=您确认要将{0}移动到{1}？
 service.gui.MOVE_TO_GROUP=移动到组(&M)
 service.gui.MOVE_CONTACT=移动联系人
-service.gui.MOVE_CONTACT_ERROR=联系人不能被移动(&C)
 service.gui.MSG_DELIVERY_FAILURE=上面消息发送失败
 service.gui.MSG_DELIVERY_NOT_SUPPORTED=您正在使用的协议不支持离线消息。 请尝试其他协议联系{0}或者等待他/她上线。
 service.gui.MSG_DELIVERY_INTERNAL_ERROR=内部出错。可能是程序自身错误。请提交您的错误报告到：http://www.jitsi.org/index.php/Development/BugsAndIssues。
 service.gui.MSG_DELIVERY_ERROR=发送消息失败。
 service.gui.MSG_DELIVERY_UNKNOWN_ERROR=发送消息失败, 未知错误.
+service.gui.MSG_DELIVERY_UNSUPPORTED_OPERATION=不支持的操作。
 service.gui.MSG_NOT_DELIVERED=网络错误。请检查网络配置然后重试。
 service.gui.MSG_NOT_POSSIBLE=无法给该联系人发消息（协议不支持）
 service.gui.MSG_RECEIVED={0} 发送消息给你了
@@ -367,9 +358,8 @@ service.gui.MSG_SEND_CONNECTION_PROBLEM=请先登录服务器, 然后发送消�
 service.gui.MULTIPLE_LOGINS=账号在其他地方登录, 本地连接断开: 用户名: {0}, 服务器: {1}.
 service.gui.MY_CHAT_ROOMS=聊天室
 service.gui.MY_CHAT_ROOMS_TITLE=聊天室
-service.gui.MUTE=静音
-service.gui.MUTUALLY_ON_HOLD_STATUS=挂起（双方）
-service.gui.NAME=姓名
+service.gui.MUTUALLY_ON_HOLD_STATUS=呼叫等待静音
+service.gui.NAME=名称
 service.gui.NETWORK=网络
 service.gui.NETWORK_FAILURE=网络错误
 service.gui.NEXT=下一个(&N)
@@ -378,13 +368,14 @@ service.gui.NEW_MESSAGE=新消息...
 service.gui.NEW_NAME=新名称:
 service.gui.NEW_STATUS_MESSAGE=添加状态信息
 service.gui.NEW_STATUS_MESSAGE_SAVE=存为自定义信息
+service.gui.NICKNAME=昵称
 service.gui.NO=否
-service.gui.NONE=沒有
-service.gui.NO_CAMERA_AVAILABLE=找不到摄像头设备
-service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=桌面共享不受此协议支持
-service.gui.NO_VIDEO_ENCODINGS=配置中无视频编码方式被选中
-service.gui.NO_VIDEO_FOR_PROTOCOL=视频不被此协议支持
-service.gui.NO_AVAILABLE_ROOMS=该服务器上的聊天室清单暂时不可获得.
+service.gui.NONE=无
+service.gui.NO_CAMERA_AVAILABLE=没有可用的摄像头
+service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=此通信协议不支持桌面共享。
+service.gui.NO_VIDEO_ENCODINGS=在配置中没有启用任何视频解码器
+service.gui.NO_VIDEO_FOR_PROTOCOL=此通信协议不支持视频通话
+service.gui.NO_AVAILABLE_ROOMS=服务器上的聊天室列表暂时不可用。
 service.gui.NO_CONTACTS_FOUND=找不到匹配的联系人。按下  Ctrl+Enter 或使用以下按钮 呼叫 {0}。
 service.gui.NO_CONTACTS_FOUND_SHORT=未找到匹配的联系人
 service.gui.NO_MESSAGE=没有消息
@@ -392,27 +383,32 @@ service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=不支持群聊。 进入 jitsi.org
 service.gui.NO_ONLINE_CONFERENCING_ACCOUNT=无可用的会议账户。哪些协议支持会议，请查阅https://jitsi.org。
 service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=呼叫前必须确保至少一个电话帐号在线。请登录您的一个电话帐号然后重试。
 service.gui.NOT_AUTHORIZED=未认证
-service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=消息还没有发送出去, 是否一定退出?
-service.gui.NON_EXISTING_USER_ID=服务器 {0} 不能识别用户身份.
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=您正在尝试关闭会话，但是还有未发送的消息。您确定要关闭会话吗？
+service.gui.NON_EXISTING_USER_ID=服务器 {0} 不能识别指定的用户id。
 service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=不在联系人列表中
 service.gui.SD_QUALITY=标准质量
 service.gui.OFFLINE=离线
-service.gui.OK=OK
-service.gui.OLDER_CALLS=之前的通话
+service.gui.OK=确定
 service.gui.ONLINE=在线
 service.gui.OPEN=打开
-service.gui.OPEN_FILE_FROM_IMAGE=双击来打开文件
+service.gui.OPEN_FILE_FROM_IMAGE=双击以打开文件
 service.gui.OPEN_FOLDER=打开文件夹
 service.gui.OPEN_IN_BROWSER=在浏览器中打开(&B)
 service.gui.OPTIONS=选项
-service.gui.OPEN_AUTOMATICALLY=自动开启聊天室
-service.gui.OPEN_ON_ACTIVITY=活动开启
-service.gui.OPEN_ON_MESSAGE=仅消息开启
-service.gui.OPEN_ON_IMPORTANT_MESSAGE=仅重要消息开启
-service.gui.OR=或
-service.gui.OR_ENTER_PHONE_NUMBER=或者在此输入电话号码...
+service.gui.OPEN_AUTOMATICALLY=在以下情况下自动打开本聊天室
+service.gui.OPEN_ON_ACTIVITY=有活动时打开
+service.gui.OPEN_ON_MESSAGE=仅在有消息时打开
+service.gui.OPEN_ON_IMPORTANT_MESSAGE=仅在有重要消息时打开
+service.gui.OR=或者
 service.gui.ORGANIZATION=组织
 service.gui.OTHER=其他
+service.gui.chat.role.OWNER=所有者
+service.gui.chat.role.ADMINISTRATOR=管理员
+service.gui.chat.role.MODERATOR=主持人
+service.gui.chat.role.MEMBER=成员
+service.gui.chat.role.GUEST=游客
+service.gui.chat.role.SILENT_MEMBER=静音成员
+service.gui.chat.role.OUTCAST=被禁止加入
 service.gui.OWNER=房间所有者
 service.gui.ON_MOBILE_TOOLTIP=(手机通话中)
 service.gui.PASSWORD=密码
@@ -424,28 +420,26 @@ service.gui.PORT=端口
 service.gui.POSTAL_CODE=邮政编码
 service.gui.PREFERENCES=首选项
 service.gui.PREFIX=前缀
-service.gui.PRESENCE=出席
-service.gui.PRESS_ENTER_FOR_SUGGESTIONS=按'回车'查看建议
-service.gui.PRESS_FOR_CALL_INFO=点击查看呼叫信息
+service.gui.PRESENCE=在线状态
+service.gui.PRESS_ENTER_FOR_SUGGESTIONS=按'Enter'键查看建议
+service.gui.PRESS_FOR_CALL_INFO=点击查看通话信息
 service.gui.PRESS_TO_OPEN_CRM=点击打开CRM程序
 service.gui.PREVIOUS=上一个
-service.gui.PREVIOUS_TOOLTIP=查看更早对话
 service.gui.PRINT=打印(&P)
 service.gui.PROACTIVE_NOTIFICATION=正在输入消息
 service.gui.PROBLEMS_ENCOUNTERED=遭遇问题
 service.gui.PROTOCOL=协议
-service.gui.PUT_OFF_HOLD=取消挂起
-service.gui.PUT_ON_HOLD=挂起
+service.gui.PUT_OFF_HOLD=撤销呼叫等待
+service.gui.PUT_ON_HOLD=呼叫等待
 service.gui.QUIT=退出(&Q)
 service.gui.READY=就绪
-service.gui.RECENT_MESSAGES=最近的對话
+service.gui.RECENT_MESSAGES=最近的对话
 service.gui.REASON=原因
 service.gui.RECEIVED=收到{0}
 service.gui.RECONNECTION_LIMIT_EXCEEDED=该账户多次重复登录服务器: 用户名: {0}, 服务器名: {1} 目前已经被禁止, 请等待一段时间后再试.
 service.gui.RE_REQUEST_AUTHORIZATION=重新请求认证
 service.gui.REFERRED_STATUS=转接
 service.gui.REJECT=拒绝(&R)
-service.gui.REMIND_ME_LATER=以后提醒我
 service.gui.REMEMBER_PASSWORD=记住密码
 service.gui.REMOVE=删除(&R)
 service.gui.REMOVE_ACCOUNT=删除账户(&R)
@@ -461,39 +455,32 @@ service.gui.RENAME_CONTACT_WIZARD=请在下面的输入栏中输入您对该联�
 service.gui.RENAME_GROUP=重命名组(&N)
 service.gui.RENAME_GROUP_INFO=请在下面的输入栏中输入您对该组的新名称.
 service.gui.RENAME_CLEAR_USER_DEFINED=还原
-service.gui.RINGING_STATUS=响铃中
+service.gui.RINGING_STATUS=振铃中
 service.gui.REQUEST=请求(&R)
 service.gui.REQUEST_AUTHORIZATION=请求加为好友(&R)
 service.gui.REQUEST_AUTHORIZATION_MSG=不能添加 {0} 到您的联系人名单. 必须等待 {0} 加您为他/她的好友. 请输入您的请求信息.
 service.gui.RETRY=重试
 service.gui.REVOKE_OWNERSHIP=取消所有者权限
 service.gui.REVOKE_ADMIN=取消管理员权限
-service.gui.REVOKE_MODERATOR=取消群主权限
+service.gui.REVOKE_MODERATOR=取消主持人权限
 service.gui.REVOKE_MEMBERSHIP=取消成员权限
-service.gui.REVOKE_VOICE=取消发言权
-service.gui.ROOT_GROUP=最上级组
+service.gui.REVOKE_VOICE=撤回语音权限
 service.gui.SAVE=保存(&S)
-service.gui.SAVE_AS_DEFAULT=保存为默认值
 service.gui.SEARCH=搜索(&S)
 service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=点击按键显示服务器上所有聊天室, 然后选择您感兴趣的聊天室, 点击加入.
 service.gui.SEARCH_STRING_CONTACT_SOURCE=搜索到的联系人
 service.gui.SECURITY=安全
-service.gui.SELECT_ACCOUNT=选择账户
+service.gui.SELECT_ACCOUNT_INFO=您想使用哪个帐号与这个联系人进行通讯？
 service.gui.SELECT_COLOR=选择颜色
 service.gui.SELECT_GROUP=选择组
-service.gui.SELECT_GROUP_WIZARD_MSG=下面的名单中包含您所有联系人组, 请选择一个, 然后加入新的联系人.
+service.gui.SELECT_GROUP_INFO=您想将此联系人放置在哪个群组下显示？（可选）
 service.gui.SELECT_NO_GROUP=未分组
-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.SELECT_VIDEO_CONFERENCE=选择视频会议
 service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=聊天室
 service.gui.SEND=发送(&S)
 service.gui.SEND_FILE=发送文件(&F)
-service.gui.SELECT_CONTACT_SUPPORTING_INFO=没有该联系人信息.
 service.gui.SEND_MESSAGE=发送消息(&S)
-service.gui.SEND_AS_SMS=作为手机短信, 发送消息
 service.gui.SEND_PRIVATE_MESSAGE=发送私信
 service.gui.SEND_SMS=发送手机短信(&E)
 service.gui.SEND_SMS_DETAILS=请记住你必须以国际电话号码格式输入，例如 以 +44 打头的英国号码 +447777000000。
@@ -532,7 +519,6 @@ service.gui.STREET=街道
 service.gui.SUBJECT=主题
 service.gui.SUMMARY=概要
 service.gui.TELEPHONY=电话
-service.gui.TODAY=今天
 service.gui.TOOLS=工具(&T)
 service.gui.TRANSFER=转接(&F)
 service.gui.TO=到(&T)
@@ -542,7 +528,6 @@ service.gui.TRANSFER_CALL_TO=转接给：
 service.gui.TRANSPARENCY_NOT_ENABLED=您当前设置不支持透明。
 service.gui.TYPE_YOUR_REQUEST=请在这里输入您的请求
 service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=我们无法改变此呼叫的视频质量。
-service.gui.UNMUTE=取消静音
 service.gui.USER_IDENTIFIER=用户ID：
 service.gui.USER_EXISTS_ERROR=该网络上已存在该用户。请选择其他用户或网络服务。
 service.gui.USERNAME_NULL=请输入用户名和密码。
@@ -555,7 +540,6 @@ service.gui.USE_PROVISIONING=使用在线条款
 service.gui.VALUE=值
 service.gui.VIDEO_CALL=视频通话(&V)
 service.gui.VIA=通过
-service.gui.VIA_SMS=通过短信
 service.gui.VIEW=查看(&V)
 service.gui.VIEW_HISTORY=查看历史(&H)
 service.gui.VIEW_SMILEYS=查看表情(&S)
@@ -575,9 +559,6 @@ service.gui.VOLUME_CONTROL_TOOL_TIP=调整音量
 service.gui.WAITING_AUTHORIZATION=正在等待验证
 service.gui.WARNING=警告
 service.gui.YES=是
-service.gui.YESTERDAY=昨天
-service.gui.EXISTING_ACCOUNT_ERROR=您输入的帐号已加入。
-service.gui.NEW_MAIL=<b>你有一封新邮件!</b><br/><b>来自:</b> {0} {1} <br/><b>标题:</b> {2} <br/>{3};
 service.gui.NEW_GMAIL_HEADER={0}<a href="{1}">收件箱</a>:<br/>有一封新邮件
 service.gui.NEW_GMAIL_MANY_HEADER={0}<a href="{1}">收件箱</a>:<br/>有{2}封新邮件
 service.gui.NEW_GMAIL_FOOTER=多条未读留言在您的<a href="{0}">收件箱</a>。<br/>
@@ -589,6 +570,9 @@ service.gui.ENTER_FULL_SCREEN_TOOL_TIP=全屏
 service.gui.EXIT_FULL_SCREEN_TOOL_TIP=退出全屏
 service.gui.HOLD_BUTTON_TOOL_TIP=粗体切换
 service.gui.MUTE_BUTTON_TOOL_TIP=切换静音或者按住按钮以调整麦克风音量
+service.gui.PARK=保持
+service.gui.PARKING_SLOT=呼叫保持通道：
+service.gui.PARK_BUTTON_TOOL_TIP=呼叫保持
 service.gui.RECORD_BUTTON_TOOL_TIP=开启/停止录音
 service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=视频切换
 service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=显示/隐藏本地视频
@@ -601,7 +585,6 @@ service.gui.SECURITY_ERROR=安全错误
 service.gui.SPEED=速率：
 service.gui.SILENT_MEMBER=静音成员
 service.gui.NON_SECURE_CONNECTION=无法为账户{0}建立安全连接。如果你想连接到一个非安全服务器，请在您的账户配置中选中 "允许非安全连接" 选项
-service.gui.UPDATE=更新
 service.gui.MOBILE_PHONE=手机
 service.gui.VIDEO_PHONE=视频
 service.gui.WORK_PHONE=工作
@@ -636,12 +619,10 @@ service.gui.callinfo.CALL_INFORMATION=呼叫信息
 service.gui.callinfo.CALL_IDENTITY=标识
 service.gui.callinfo.PEER_COUNT=参与者计数
 service.gui.callinfo.IS_CONFERENCE_FOCUS=会议焦点
-service.gui.callinfo.IS_DEFAULT_ENCRYPTED=启用加密
 service.gui.callinfo.CALL_TRANSPORT=信号呼叫传输
 service.gui.callinfo.CALL_DURATION=呼叫周期
 service.gui.callinfo.TLS_PROTOCOL=TLS 安全协议
 service.gui.callinfo.TLS_CIPHER_SUITE=TLS加密算法套件
-service.gui.callinfo.TLS_SERVER_CERTIFICATE_CHAIN=TLS服务器证书链
 service.gui.callinfo.TLS_CERTIFICATE_CONTENT=TLS服务器证书的内容显示在下面。
 service.gui.callinfo.VIEW_CERTIFICATE=查看证书
 service.gui.callinfo.CODEC=编解码器/频率
@@ -661,10 +642,13 @@ service.gui.callinfo.MEDIA_STREAM_SRTP=RTP
 service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=密钥交换协议
 service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE候选者拓展类型
 service.gui.callinfo.ICE_STATE=ICE作业处理状态
+
+#enum values from IceProcessingState
 service.gui.callinfo.ICE_STATE.WAITING=搜集候选者
 service.gui.callinfo.ICE_STATE.RUNNING=连通性检查
 service.gui.callinfo.ICE_STATE.COMPLETED=已完成
 service.gui.callinfo.ICE_STATE.FAILED=失败
+
 service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=本地主机IP/端口
 service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=本地自反IP/端口
 service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=本地中继IP/端口
@@ -685,28 +669,34 @@ service.gui.ALWAYS_TRUST=总是信任这个证书
 service.gui.CERT_DIALOG_TITLE=验证证书
 service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>当{0}连接到服务器<br><b>{1}</b>时无法确认服务器身份。<br><br>该服务器证书不可信，这意味着无法自动验证服务器身份。<br><br>您确认要继续连接？<br>更多信息，点击 “显示证书”。</html>
 service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0}无法确认服务器证书身份。<br><br>该服务器证书不可信，这意味着无法<br>自动验证服务器身份。您确认要继续连接吗？<br><br>更多信息，点击“查看证书”获取详细信息。</html>
-service.gui.CERT_DIALOG_CLIENT_DESCRIPTION_TXT=<html>{0} 无法验证正在连接的客户端。<br><br>该客户端证书不可信任， <br>这意味着无法自动验证其身份。您确认要接受该连接？/<br><br>点击"查看证书"获取详细信息。</html>
-service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} 无法确认{1}端的身份。<br><br>该证书不可信， 这意味着无法自动验证其身份。您确认要继续连接吗？<br><br>更多详情，点击“显示证书”。</html>
+service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} 无法确认 {1} 端的身份。<br><br>该证书不可信， 这意味着无法自动验证其身份。您确认要继续连接吗？<br><br>更多详情，请点击“显示证书”。</html>
 service.gui.CONTINUE_ANYWAY=仍然继续
+service.gui.CERT_INFO_CHAIN=证书链：
+service.gui.CERT_INFO_ISSUED_TO=颁发给
+
+#service.gui.CERT_INFO_ are combined from Rdn names
 service.gui.CERT_INFO_CN=通用名：
 service.gui.CERT_INFO_O=组织：
 service.gui.CERT_INFO_C=国家：
 service.gui.CERT_INFO_ST=州/省：
 service.gui.CERT_INFO_L=地址：
+service.gui.CERT_INFO_ISSUED_BY=颁发者
 service.gui.CERT_INFO_OU=单位：
+service.gui.CERT_INFO_VALIDITY=有效性
 service.gui.CERT_INFO_ISSUED_ON=授权时间：
 service.gui.CERT_INFO_EXPIRES_ON=失效时间：
+service.gui.CERT_INFO_FINGERPRINTS=指纹
+service.gui.CERT_INFO_CERT_DETAILS=证书信息
 service.gui.CERT_INFO_SER_NUM=序列号：
 service.gui.CERT_INFO_VER=版本：
 service.gui.CERT_INFO_SIGN_ALG=签名算法：
+service.gui.CERT_INFO_PUB_KEY_INFO=公钥信息
 service.gui.CERT_INFO_ALG=算法：
 service.gui.CERT_INFO_PUB_KEY=公钥：
-service.gui.CERT_INFO_KEY_BYTES_PRINT={0} bytes：{1}
 service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
 service.gui.CERT_INFO_EXP=指数：
 service.gui.CERT_INFO_KEY_SIZE=密钥长度：
 service.gui.CERT_INFO_SIGN=签名：
-service.gui.CONTINUE=继续
 service.gui.SHOW_CERT=显示证书
 service.gui.HIDE_CERT=隐藏证书
 
@@ -729,15 +719,13 @@ service.gui.security.SECURE_AUDIO=加密音频
 service.gui.security.AUDIO_NOT_SECURED=音频未加密
 service.gui.security.SECURE_VIDEO=加密视频
 service.gui.security.VIDEO_NOT_SECURED=未加密视频
-service.gui.security.NO_VIDEO=无视频
-service.gui.security.CIPHER=暗码：{0}
+service.gui.security.CALL_SECURED_TOOLTIP=呼叫已加密。更多详情请点击这里。
 service.gui.security.CALL_NOT_SECURED_TOOLTIP=呼叫未加密
 service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=点此同您的伙伴校验安全密码。
-service.gui.security.COMPARE_WITH_PARTNER=核对参与者然后点击挂锁图标确认。
 # keep the following string short
 service.gui.security.COMPARE_WITH_PARTNER_SHORT=请核对参与者：
 service.gui.security.STRING_COMPARED=字符串校验通过！
-service.gui.security.SAS_INFO_TOOLTIP=<html>为了完成加密你<br/>需要口头<b>校验</b>联系人提供的一小段验证<br/>字段并当此字段被验证通过后点击确认。<br/><br/>如果你清除了此确认信息，当下次呼叫此联系人时<br/>你将被要求再次验证。</html>
+service.gui.security.SAS_INFO_TOOLTIP=<html> 为了完成加密你 <br/> 需要口头 <b> 校验 </b> 联系人提供的一小段验证 <br/> 字段并仅当此字段被验证通过后才能点击确认。<br/><br/> 如果你清除了此确认信息，当下次呼叫此联系人时 <br/> 你将被要求再次验证。</html>
 service.gui.security.SECURITY_ALERT=尝试加密呼叫。会断开接入
 
 service.gui.avatar.CHOOSE_ICON=选择图片
@@ -751,20 +739,14 @@ service.gui.avatar.imagepicker.CLICK=微笑然后单击
 service.gui.avatar.imagepicker.IMAGE_FILES=图片文件
 service.gui.avatar.imagepicker.IMAGE_PICKER=图片
 service.gui.avatar.imagepicker.IMAGE_SIZE=图片大小
-service.gui.avatar.imagepicker.INITIALIZING=初始化中
 service.gui.avatar.imagepicker.RESET=重置
 service.gui.avatar.imagepicker.SET=设置
 service.gui.avatar.imagepicker.TAKE_PHOTO=拍照
-service.gui.avatar.imagepicker.WEBCAM_ERROR=摄像头错误
 
 service.gui.security.encryption.required=必须加密！
 
 service.protocol.ICE_FAILED=无法建立连接（ICE失败，并没有发现中继器）
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
-impl.protocol.ssh.DETAILS_SEPARATOR=～
 
 impl.protocol.sip.XCAP_ERROR_TITLE=SIP联系人列表存储错误
 impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR=源不能被读为{0}。对象{1}
@@ -794,9 +776,7 @@ impl.ldap.QUERY_CUSTOM=自定义查询
 impl.ldap.QUERY_CUSTOM_HINT=使用 {0} 作为占位符用于搜索术语。
 impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=在查询术语中自动增加通配符
 impl.ldap.QUERY_PHOTO_INLINE=通过其他属性获取图片
-impl.ldap.NEW=新建
 impl.ldap.EDIT=编辑
-impl.ldap.REMOVE=删除
 impl.ldap.ENABLED=启用
 impl.ldap.SERVER_NAME=服务器名
 impl.ldap.SERVER_NAME_EXAMPLE=我的LDAP服务器
@@ -829,6 +809,12 @@ impl.ldap.HOMEPHONE_FIELD_EXAMPLE=家庭电话
 impl.ldap.PHONE_PREFIX=电话号码前缀
 impl.ldap.PHONE_PREFIX_EXAMPLE=Ex.: 00
 
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS="{0}" 不是一个有效的 SIP 地址。
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS="{0}" 不是一个有效的 XMPP JID。
+
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=地址簿
 plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=允许搜索MaxOSX地址簿
@@ -843,9 +829,7 @@ plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=使用Outlook为默认邮件用
 
 # Google Contacts
 impl.googlecontacts.CONFIG_FORM_TITLE=Google 联系人
-impl.googlecontacts.NEW=新建
 impl.googlecontacts.EDIT=编辑
-impl.googlecontacts.REMOVE=删除
 impl.googlecontacts.ENABLED=启用
 impl.googlecontacts.ACCOUNT_NAME=帐户名
 impl.googlecontacts.SAVE=保存
@@ -854,6 +838,10 @@ impl.googlecontacts.USERNAME=帐户名
 impl.googlecontacts.PASSWORD=密码
 impl.googlecontacts.PREFIX=电话前缀
 impl.googlecontacts.WRONG_CREDENTIALS=Google账户{0}证书错误
+impl.googlecontacts.OAUTH_DIALOG_TITLE=Google 通讯录授权认证
+impl.googlecontacts.INSTRUCTIONS=<html><p><b> 点击下面链接以授权 Google 通讯录插件访问您的账户。 </b><br><br> 点击此链接后，您的浏览器就会打开。请您登录指定的账户并授权。在成功授权后，Google 会显示一条代码。请复制这条代码并粘贴到下面的文本框，然后点击 '保存'。 </p><p> 这是一次性操作。授权令牌将会留作后用。 </html>
+impl.googlecontacts.CODE=代码:
+impl.googlecontacts.HYPERLINK_TEXT=点击这里以允许访问 {0} 的授权请求
 
 # account info
 plugin.accountinfo.TITLE=帐号信息
@@ -884,13 +872,11 @@ plugin.accountinfo.ORGANIZATION=组织名称：
 plugin.accountinfo.JOB_TITLE=职位：
 plugin.accountinfo.ABOUT_ME=关于我们：
 plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
-plugin.accountinfo.USER_PICTURES=头像
 plugin.accountinfo.GLOBAL_ICON=使用全局图标
 plugin.accountinfo.LOCAL_ICON=使用此图标：
-plugin.accountinfo.CHANGE=更改
-plugin.accountinfo.ONLY_MESSAGE=只允许短消息
 
 # connection info
+plugin.connectioninfo.TITLE=连接信息
 
 # contact info
 plugin.contactinfo.TITLE=联系人详细信息
@@ -907,49 +893,13 @@ plugin.aimaccregwizz.USERNAME=AIM用户名：
 plugin.aimaccregwizz.USERNAME_AND_PASSWORD=用户名和密码
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=注册新帐号
 plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=如果你没有AIM帐号，点击这个按钮进行注册。
-plugin.aimaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=覆盖服务器默认设置
 
 # branding
 plugin.branding.ABOUT_WINDOW_TITLE=关于 {0}
 plugin.branding.LOGO_MESSAGE=开源VoIP&&即时消息
-plugin.branding.LOADING=加载中
 plugin.branding.ABOUT_MENU_ENTRY=关于(&A)
-plugin.branding.WELCOME_MESSAGE=<DIV color={0}>{1} 目前处于活跃开发中。 您目前运行的版本是测试版，可能不适合实际工作中使用。请访问 {2} 获取更多信息。</DIV>
-plugin.branding.COPYRIGHT=<DIV><font size=3 color={0}>(c)2003-2013 Copyright <b>jitsi.org</b>。All rights reserved。详情访问 <a href="https://jitsi.org">https://jitsi.org</a>。</font></DIV>
-plugin.branding.LICENSE=<DIV color={0}><b>Jitsi</b> 以LGPL(<a href="http://www.gnu.org">http://www.gnu.org</a>)协议发布。</DIV>
-
-# Dict protocol
-service.protocol.DICTIONARIES=字典
-plugin.dictaccregwizz.ANY_DICTIONARY=任意字典
-plugin.dictaccregwizz.ANY_DICTIONARY_FORM=来自 {0} 的任意字典
-plugin.dictaccregwizz.FIRST_MATCH=首次匹配
-plugin.dictaccregwizz.NO_MATCH=没有匹配结果
-plugin.dictaccregwizz.MATCH_RESULT=没有匹配 "{0}" 的结果， 您是不是要找：\n
-plugin.dictaccregwizz.INVALID_DATABASE=当前使用的字典 "{0}" 在服务器上不存在。
-plugin.dictaccregwizz.INVALID_STRATEGY=服务器不支持当前使用的规则 "{0}"。
-plugin.dictaccregwizz.PROTOCOL_NAME=Dict
-plugin.dictaccregwizz.PROTOCOL_DESCRIPTION=字典服务
-plugin.dictaccregwizz.HOST=主机
-plugin.dictaccregwizz.SERVER_INFO=服务器信息
-plugin.dictaccregwizz.STRATEGY_SELECTION=选择规则
-plugin.dictaccregwizz.STRATEGY_LIST=规则列表：
-plugin.dictaccregwizz.SEARCH_STRATEGIES=搜索规则
-plugin.dictaccregwizz.STRATEGY_DESCRIPTION=如果没有找到合适的翻译，匹配规则用来查找近似词语。例如前缀规则将查找以您的关键词开头的词语。
-plugin.dictaccregwizz.ACCOUNT_INFO_TITLE=Dict帐号信息
-plugin.dictaccregwizz.FIRST_ACCOUNT=这个向导将为您创建dict.org上的Dict帐号。\n\n您可以通过帐号注册向导添加新字典。 填写您要添加字典的主机字段。
-plugin.dictaccregwizz.THREAD_CONNECT=尝试连接服务器
-plugin.dictaccregwizz.THREAD_CONNECT_FAILED=尝试连接失败， 这不是一个字典服务器或者服务器不在线
-plugin.dictaccregwizz.RETRIEVING_STRATEGIES=获取规则列表
-plugin.dictaccregwizz.NO_STRATEGIES_FOUND=服务器上找不到规则策略
-plugin.dictaccregwizz.POPULATE_LIST=组成列表
-plugin.dictaccregwizz.CLOSING_CONNECTION=正在关闭连接
-
-# facebookaccregwizz
-plugin.facebookaccregwizz.DESCRIPTION=<html><body><center><a href="https：//register.facebook.com/editaccount.php">使用Facebook聊天之前你必须在Facebook的 <br>"帐号设置" 页面上先创建一个用户名 </a><br><br>注意： 创建完用户名你需要先从该网页登出，<br>并且在你可以使用该用户名登录之前可能需要等待一段时间！</center></body></html>
-plugin.facebookaccregwizz.PROTOCOL_DESCRIPTION=Facebook聊天协议
-plugin.facebookaccregwizz.PROTOCOL_NAME=Facebook
-plugin.facebookaccregwizz.USERNAME=用户名：
-plugin.facebookaccregwizz.USERNAME_AND_PASSWORD=用户名和密码
+
+plugin.busylampfield.PICKUP=接听通话
 
 # generalconfig
 plugin.generalconfig.AUTO_START=开机或重启时自动运行 {0}
@@ -960,9 +910,6 @@ plugin.generalconfig.SHOW_HISTORY=显示
 plugin.generalconfig.HISTORY_SIZE=最近的聊天信息
 plugin.generalconfig.SEND_MESSAGES_WITH=发送消息经由：
 plugin.generalconfig.BRING_WINDOW_TO_FRONT=聊天窗口前置
-plugin.generalconfig.ERROR_PERMISSION=您没有权限取消自动启动
-plugin.generalconfig.TRANSPARENCY=透明度
-plugin.generalconfig.ENABLE_TRANSPARENCY=启用透明
 plugin.generalconfig.DEFAULT_LANGUAGE=界面语言
 plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=您的设置将在下次启动时生效。
 plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}%已翻译
@@ -978,6 +925,8 @@ plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=呼叫电话号码前删除特
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=转化电话号码中的字符
 plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=e.g. +1-800-MYPHONE -> +1-800-694663
 plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.XMPP_USE_ALL_RESOURCES=在检测联系人的特性时使用所有资源
 plugin.generalconfig.OPUS_CONFIG=Opus
 plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=采样率：
 plugin.generalconfig.OPUS_BITRATE=编码器平均比特率(kbps)：
@@ -1009,19 +958,30 @@ plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=创建新帐号
 plugin.ircaccregwizz.PROTOCOL_NAME=IRC
 plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC协议
 plugin.ircaccregwizz.USERNAME_AND_PASSWORD=用户名和密码
+plugin.ircaccregwizz.USERNAME=昵称
+plugin.ircaccregwizz.EXAMPLE_USERNAME=例如：ircuser
 plugin.ircaccregwizz.INFO_PASSWORD=大部分IRC服务器不需要密码。
 plugin.ircaccregwizz.AUTO_NICK_CHANGE=当该昵称已被占用时自动选择昵称
 plugin.ircaccregwizz.USE_DEFAULT_PORT=使用默认端口
 plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=我的昵称不需要身份校验
 plugin.ircaccregwizz.HOST=主机名：
 plugin.ircaccregwizz.IRC_SERVER=服务器
+plugin.ircaccregwizz.EXAMPLE_SERVER=例如：chat.freenode.net
+plugin.ircaccregwizz.USE_SECURE_CONNECTION=使用安全连接
+plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=启用联系人在线状态
+plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=启用聊天室在线状态
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=SASL验证
+plugin.ircaccregwizz.ENABLE_SASL_AUTHENTICATION=启用SASL验证
+plugin.ircaccregwizz.SASL_USERNAME=用户名
+plugin.ircaccregwizz.SASL_AUTHZ_ROLE=角色
+plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED=以上的IRC密码用于SASL验证
+plugin.ircaccregwizz.RESOLVE_DNS_THROUGH_PROXY=总是使用代理进行DNS解析
 
 # jabber accregwizz
 plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
 plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=XMPP协议
 plugin.jabberaccregwizz.USERNAME=XMPP用户名
 plugin.jabberaccregwizz.PASSWORD_CONFIRM=确认密码
-plugin.jabberaccregwizz.USERNAME_AND_PASSWORD=帐号和密码
 plugin.jabberaccregwizz.CSERVER=服务器
 plugin.jabberaccregwizz.SERVER=连接服务器
 plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=允许保持连接
@@ -1037,13 +997,9 @@ plugin.jabberaccregwizz.COMMENT_COLUMN=评论
 plugin.jabberaccregwizz.RESOURCE=资源
 plugin.jabberaccregwizz.AUTORESOURCE=自动生成资源名
 plugin.jabberaccregwizz.PRIORITY=优先级
-plugin.jabberaccregwizz.XMPP_ERROR=XMPP错误
 plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=未知XMPP错误({0})。请确认服务器地址是否正确。
 plugin.jabberaccregwizz.NOT_SAME_PASSWORD=密码不匹配。
-plugin.jabberaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=覆盖服务器默认设置
-plugin.jabberaccregwizz.ADVANCED_OPTIONS=高级选项
 plugin.jabberaccregwizz.USE_ICE=使用ICE
-plugin.jabberaccregwizz.USE_GOOGLE_ICE=使用Google Jingle/ICE(实验性)
 plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=自动检测STUN/TURN服务器
 plugin.jabberaccregwizz.SUPPORT_TURN=支持TURN
 plugin.jabberaccregwizz.TURN_USERNAME=TURN用户名
@@ -1071,11 +1027,8 @@ plugin.jabberaccregwizz.DISABLE_CARBON=禁用消息碳
 plugin.jabberaccregwizz.DTMF_AUTO=自动：自动选择RTP或Inband
 plugin.jabberaccregwizz.SERVER_OPTIONS=服务器选项
 plugin.jabberaccregwizz.CHANGE_PASSWORD=更改账号密码
-plugin.jabberaccregwizz.NEW_PASSWORD=新密码
-plugin.jabberaccregwizz.NEW_PASSWORD_CONFIRM=确认新密码
 plugin.jabberaccregwizz.PORT_FIELD_INVALID=请填入一个可用的端口号以便继续。
 plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=账号变更密码前必须登录。
-plugin.jabberaccregwizz.PASSWORD_EMPTY=密码为空。
 plugin.jabberaccregwizz.TLS_REQUIRED=连接未使用TLS，不会尝试密码变更。
 plugin.jabberaccregwizz.PASSWORD_CHANGED=密码已变更成功
 plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=您的XMPP服务器不支持密码变更。
@@ -1089,25 +1042,9 @@ plugin.jabberaccregwizz.RESET=重置
 plugin.jabberaccregwizz.RESET_DESCRIPTION=复位全局设置
 plugin.jabberaccregwizz.DISABLE_JINGLE=禁用Jingle(XMPP音频和视频呼叫)
 
-# mailbox
-plugin.mailbox.OUTGOING=已发送的消息：
-plugin.mailbox.INCOMING=已收到的消息：
-plugin.mailbox.WAIT_TIME=转到语音信箱之前等待时间
-plugin.mailbox.MAX_MESSAGE_TIME=最长留言
-plugin.mailbox.CONFIRM=确认
-plugin.mailbox.DEFAULTS=默认
-plugin.mailbox.MAILBOX=邮箱
-
-# msn accregwizz
-plugin.msnaccregwizz.PROTOCOL_NAME=MSN
-plugin.msnaccregwizz.PROTOCOL_DESCRIPTION=连接和使用MSN聊天协议。
-plugin.msnaccregwizz.USERNAME=Email：
-plugin.msnaccregwizz.USERNAME_AND_PASSWORD=帐号和密码
-
 # plugin manager
 plugin.pluginmanager.INSTALL=安装
 plugin.pluginmanager.UNINSTALL=卸载
-plugin.pluginmanager.UPDATE=更新
 plugin.pluginmanager.PLUGINS=插件
 plugin.pluginmanager.URL=地址
 plugin.pluginmanager.CHOOSE_FILE=选择文件
@@ -1132,9 +1069,9 @@ plugin.sipaccregwizz.SERVER_PORT=服务器端口
 plugin.sipaccregwizz.PROXY=代理服务器
 plugin.sipaccregwizz.PROXY_PORT=代理端口
 plugin.sipaccregwizz.PREFERRED_TRANSPORT=首选
-plugin.sipaccregwizz.ADVANCED_OPTIONS=高级选项
 plugin.sipaccregwizz.PROXY_OPTIONS=代理选项
 plugin.sipaccregwizz.PROXY_AUTO=自动配置代理服务器
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=在 HA 的情况下跳过代理安全检查（请仅在需要时使用）
 plugin.sipaccregwizz.ENABLE_PRESENCE=允许出席(SIMPLE)
 plugin.sipaccregwizz.FORCE_P2P_PRESENCE=强制使用P2P出席模式
 plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=离线联系人拉取间隔(单位：秒)
@@ -1152,8 +1089,6 @@ plugin.sipaccregwizz.DTMF_AUTO=自动：从RTP和Inband(无SIP信息)自动选�
 plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
 plugin.sipaccregwizz.DTMF_SIP_INFO=SIP信息
 plugin.sipaccregwizz.DTMF_INBAND=带内
-plugin.sipaccregwizz.REGISTER=注册
-plugin.sipaccregwizz.OVERRIDE_SERVER_DEFAULT_OPTIONS=覆盖服务器默认选项
 plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=启用加密通话支持
 plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=表示支持ZRTP的信令协议
 plugin.sipaccregwizz.AUTH_NAME=授权名称
@@ -1174,10 +1109,10 @@ plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=语音邮件查阅URI
 plugin.sipaccregwizz.NOT_SAME_PASSWORD=您的密码不匹配。
 plugin.sipaccregwizz.NO_CERTIFICATE=<none>(使用常规验证)
 plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP表示
+#used from SecurityPanel
 plugin.sipaccregwizz.SAVP_OPTION_0=Off(只标明RTP/AVP) 
 plugin.sipaccregwizz.SAVP_OPTION_1=强制(只提供并接受RTP/SAVP)
 plugin.sipaccregwizz.SAVP_OPTION_2=可选(先提供RTP/SAVP，然后RTP/AVP)
-plugin.sipaccregwizz.ENABLE_SDES_ATTRIBUTE=启用S-Descriptor(即SDES或SRTP)
 plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=选择启用加密协议和它们的优先顺序(顶端协议优先)：
 plugin.sipaccregwizz.CIPHER_SUITES=启用加密套件：
 plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0}会自动尝试加密您的所有ZRTP呼叫并且您会听到和看到一个安全连接已就绪的提示。如果您已了解您正在做什么，您仅需改变如下高级设置</div></html>
@@ -1191,15 +1126,6 @@ plugin.skinmanager.DEFAULT_SKIN=默认皮肤
 plugin.skinmanager.ADD_NEW_SKIN=添加新皮肤
 plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=应用程序默认皮肤。
 
-# ssh accregwizz
-plugin.sshaccregwizz.PROTOCOL_NAME=SSH
-plugin.sshaccregwizz.PROTOCOL_DESCRIPTION=通过SSH连接远程计算机。
-plugin.sshaccregwizz.USERNAME=帐号ID：
-plugin.sshaccregwizz.IDENTITY_FILE=标识文件：
-plugin.sshaccregwizz.KNOWN_HOSTS=已知主机：
-plugin.sshaccregwizz.OPTIONAL=可选
-plugin.sshaccregwizz.ACCOUNT_DETAILS=详细帐号信息
-
 # status update
 plugin.autoaway.AUTO_STATUS=自动切换到离开状态
 plugin.autoaway.ENABLE_CHANGE_STATUS=离开时修改状态
@@ -1247,22 +1173,6 @@ plugin.whiteboard.DESELECT=反选
 plugin.whiteboard.DELETE=删除
 plugin.whiteboard.PROPERTIES=属性
 
-# yahoo accregwizz
-plugin.yahooaccregwizz.PROTOCOL_NAME=Yahoo!
-plugin.yahooaccregwizz.PROTOCOL_DESCRIPTION=一种连接Yahoo!聊天服务并聊天的协议。
-plugin.yahooaccregwizz.USERNAME=用户名：
-plugin.yahooaccregwizz.USERID_AND_PASSWORD=用户名和密码
-
-# zero accregwizz
-plugin.zeroaccregwizz.PROTOCOL_NAME=Zeroconf
-plugin.zeroaccregwizz.PROTOCOL_DESCRIPTION=Zeroconf (Bonjour) 服务协议。
-plugin.zeroaccregwizz.FIRST_NAME=名字：
-plugin.zeroaccregwizz.LAST_NAME=姓：
-plugin.zeroaccregwizz.EMAIL=Email:
-plugin.zeroaccregwizz.REMEMBER_CONTACTS=记住 Bonjour 联系人？
-plugin.zeroaccregwizz.USERID_AND_PASSWORD=帐号和密码
-plugin.zeroaccregwizz.USERID=用户ID
-
 # gtalk accregwizz
 plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
 plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=GOOGLE TALK协议
@@ -1276,19 +1186,11 @@ plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org， IP电话门户
 plugin.iptelaccregwizz.USERNAME=用户名
 plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=订阅iptel.org
 
-# sip2sip accregwizz
-plugin.sip2sipaccregwizz.PROTOCOL_NAME=sip2sip.info
-plugin.sip2sipaccregwizz.PROTOCOL_DESCRIPTION=VoIP和聊天
+# ippi accregwizz
 plugin.sip2sipaccregwizz.USERNAME=用户名
 plugin.sip2sipaccregwizz.RETYPE_PASSWORD=再次输入密码
 plugin.sip2sipaccregwizz.EMAIL=Email 地址
-plugin.sip2sipaccregwizz.NEW_ACCOUNT_TITLE=请查看以下网站查看服务介绍<br>http：//wiki.sip2sip.info
 plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>这个 email 地址将被用来发送语音留言， <br>未接来电提醒和重置密码服务</html>
-plugin.sip2sipaccregwizz.INFO_NOTE=<html>访问以下地址获取该服务介绍：<a href=''>http：//wiki.sip2sip.info</a></html>
-plugin.sip2sipaccregwizz.EXISTING_ACCOUNT=该sip2sip.info帐号已存在
-plugin.sip2sipaccregwizz.CREATE_ACCOUNT=创建免费的sip2sip.info帐号
-
-# ippi accregwizz
 plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
 plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=VoIP && 即时通信
 plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=请查看以下网站查看服务介绍<br>http://ippi.fr
@@ -1297,6 +1199,7 @@ plugin.ippiaccregwizz.EXISTING_ACCOUNT=已添加的ippi账号
 plugin.ippiaccregwizz.CREATE_ACCOUNT=创建免费的ippi帐号
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
 plugin.keybindings.CHAT_CLOSE=关闭聊天窗口
 plugin.keybindings.CHAT_COPY=复制
 plugin.keybindings.CHAT_CUT=剪切
@@ -1319,15 +1222,16 @@ plugin.keybindings.globalchooser.SHORTCUT_NAME=姓名
 plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=主快捷键
 plugin.keybindings.globalchooser.SHORTCUT_SECOND=第二快捷方式
 plugin.keybindings.globalchooser.PRESS_BTN=点击设置快捷方式
-plugin.keybindings.globalchooser.PRESS_BTN_DOWN=等待中
 plugin.keybindings.globalchooser.PUSH_TO_TALK=按键通话
 plugin.keybindings.globalchooser.ENABLE_SPECIAL=启用特殊键检测
 plugin.keybindings.PLUGIN_NAME=快捷键
+#Enum KeybindingSet.Category
 plugin.keybindings.CHAT=聊天
 plugin.keybindings.MAIN=主要
 plugin.keybindings.GLOBAL=全局快捷键
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=启用
 plugin.notificationconfig.DESCRIPTION=描述
 plugin.notificationconfig.TURN_ON_ALL=全部启用
 plugin.notificationconfig.TURN_OFF_ALL=全部禁用
@@ -1349,6 +1253,7 @@ plugin.notificationconfig.tableheader.SOUND=通过提醒设备播放提示音
 plugin.notificationconfig.tableheader.PLAYBACK_SOUND=通过回放设备播放声音
 plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=通过PC扬声器设备播放声音
 plugin.notificationconfig.tableheader.DESCRIPTION=事件描述
+#NotificationsTable constants
 plugin.notificationconfig.event.IncomingCall=来电
 plugin.notificationconfig.event.SecurityMessage=安全消息
 plugin.notificationconfig.event.IncomingFile=正在传入的文件
@@ -1389,7 +1294,7 @@ impl.media.security.WARNING_NO_EXPECTED_RS_MATCH=<html>找不到共享密钥。<
 impl.media.security.SEVERE_GENERIC_MSG=<html>检测到严重的服务安全问题。<br/><b>您的通话不安全</b><br/>错误代码： {0}</html>
 impl.media.security.ZRTP_GENERIC_MSG=<html>检测到严重的ZRTP问题。<br/><b>您的通话不安全</b><br/>错误代码： {0}</html>
 impl.media.security.INTERNAL_PROTOCOL_ERROR=<html>发生了协议内部错误。<br/><b>您的通话不安全</b><br/>错误代码： {0}</html>
-impl.media.security.CHECKSUM_MISMATCH=<html>内部ZRTP包的校验失败。<br/>如果您看到此消息，通常这可能意味着拒绝服务攻击！</的HTML>
+impl.media.security.CHECKSUM_MISMATCH=<html> 内部ZRTP包的校验失败。<br/> 如果您看到此消息，通常这可能意味着拒绝服务攻击！</html>
 impl.media.security.RETRY_RATE_EXCEEDED=<html>尝试安全协商次数过多。 这很可能意味着对方存在网络连接问题.<br/><b>您的通话不安全</b><br/>错误代码： {0}</html>
 impl.media.security.DATA_SEND_FAILED=<html>加密数据传输失败。 网络数据连接或者对方已断开。<br/><b>您的呼叫不安全</b><br/>错误代码： {0}</html>
 impl.media.security.SECURITY_OFF=加密通话已关闭
@@ -1450,6 +1355,7 @@ impl.neomedia.configform.VIDEO=视频
 impl.neomedia.configform.H264=H.264
 impl.neomedia.configform.H264.defaultIntraRefresh=周期性内部刷新
 impl.neomedia.configform.H264.defaultProfile=编码缺省配置：
+#in JNIEncoder
 impl.neomedia.configform.H264.defaultProfile.baseline=基线
 impl.neomedia.configform.H264.defaultProfile.high=高
 impl.neomedia.configform.H264.defaultProfile.main=主体
@@ -1480,7 +1386,6 @@ plugin.securityconfig.masterpassword.CURRENT_PASSWORD=当前密码：
 plugin.securityconfig.masterpassword.ENTER_PASSWORD=新密码：
 plugin.securityconfig.masterpassword.REENTER_PASSWORD=确认密码：
 plugin.securityconfig.masterpassword.MP_TITLE=主密码
-plugin.securityconfig.masterpassword.MP_NOT_SET=(未设置)
 plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=您输入的主密码错误。 请重试。
 plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=主密码错误！
 plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=密码修改失败
@@ -1496,7 +1401,6 @@ plugin.securityconfig.masterpassword.COL_PASSWORD=密码
 plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(未知)
 plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(无法解密)
 plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=存储的密码
-plugin.securityconfig.masterpassword.REMOVE_PASSWORD_BUTTON=删除
 plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=清空
 plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=确认要删除全部保存的密码？
 plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=删除全部密码
@@ -1592,7 +1496,6 @@ plugin.globalproxy.PROXY_PORT=代理端口
 plugin.globalproxy.PROXY_USERNAME=代理用户名
 plugin.globalproxy.PROXY_PASSWORD=代理密码
 plugin.globalproxy.DESCRIPTION={0} 将对所有网络连接应用以上代理设置。\n目前对代理的支持尚处于试验阶段，并且只支持部分协议。详细信息请查看下表：
-plugin.globalproxy.PROTOCOL_SUPPORT=<html><table> <tr><td></td><td> SOSCKS4/5 </td><td> SOSCKS4/5+Auth </td><td> HTTP </td><td> HTTP+Auth </td></tr><tr><td>Yahoo!</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>MSN</td><td>+</td><td>+</td><td>-</td><td>-</td></tr><tr><td>JABBER</td><td>+</td><td>+</td><td>+</td><td>+</td></tr><tr><td>ICQ/AIM</td><td>+</td><td>+</td><td>+</td><td>+</td></tr></table></html>
 #plugin.globalproxy.PROTOCOL_SUPPORT
 plugin.globalproxy.FWD_DNS=附加DNS代理
 plugin.globalproxy.FWD_DNS_NOTE=Tor的作用。通过将所有的DNS查询路径转发到Tor代理而有助于回避DNS漏洞。需要重启。
@@ -1609,6 +1512,11 @@ plugin.reconnectplugin.NETWORK_DOWN=网络连接已断开！
 plugin.chatconfig.TITLE=聊天
 plugin.chatconfig.replacement.TITLE=图片/视频：
 plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=允许插入表情
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=替换图像和视频
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=启用
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_PROPOSAL=禁用（显示预览链接）
+plugin.chatconfig.replacement.DISABLE_REPLACEMENT=禁用
+plugin.chatconfig.replacement.CONFIGURE_REPLACEMENT=图像和视频替换设置选项更改
 plugin.chatconfig.replacement.REPLACEMENT_SOURCES=来源：
 plugin.chatconfig.spellcheck.TITLE=拼写检查
 
@@ -1625,7 +1533,6 @@ plugin.provisioning.RESTART_WARNING=请注意所有修改仅在下次启动{0}�
 plugin.provisioning.UUID=UUID
 plugin.provisioning.COPYTOCLIPBOARD=复制UUID到剪贴板
 plugin.provisioning.CLIPBOARD_FAILED=复制UUID到剪贴板失败
-plugin.provisioning.EXIT_ON_FAIL=如果配置失败则退出程序
 plugin.provisioning.CREDENTIALS=最后存储的配置证书
 plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=确认移除预置密码么？
 plugin.provisioning.PROV_FAILED=预置失败
@@ -1692,8 +1599,6 @@ util.dns.DNSSEC_WARNING=<html><div width="600">{0}已视图连接位于<b>{1}</b
 #plugin spellcheck
 plugin.spellcheck.TITLE=拼写和语法检查
 plugin.spellcheck.MENU=显示拼写和语法
-plugin.spellcheck.LANG=语言
-plugin.spellcheck.EDIT_PERSONAL_DICT=编辑
 plugin.spellcheck.ENABLE_SPELL_CHECK=启用拼写检查
 plugin.spellcheck.dialog.FIND=查找下一个
 plugin.spellcheck.dialog.REPLACE=替换 
diff --git a/resources/languages/resources_zh_TW.properties b/resources/languages/resources_zh_TW.properties
index db996d1..b461fc9 100644
--- a/resources/languages/resources_zh_TW.properties
+++ b/resources/languages/resources_zh_TW.properties
@@ -1,7 +1,18 @@
 # Jitsi, the OpenSource Java VoIP and Instant Messaging client.
 #
-# Distributable under LGPL license.
-# See terms of license at gnu.org.
+# Copyright @ 2015 Atlassian Pty Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # Translation files are automatically generated from:
 #
@@ -27,147 +38,1617 @@
 
 service.gui.ABOUT=關於
 service.gui.ACCEPT=接受
+service.gui.ACCOUNT=帳號
+service.gui.ACCOUNT_ME=自己
+service.gui.ACCOUNT_REGISTRATION_WIZARD=帳號註冊精靈
 service.gui.ACCOUNTS=帳號
 service.gui.ADD=新增
-service.gui.ADD_ACCOUNT=新增帳號
 service.gui.ADD_CONTACT=新增聯絡人
-service.gui.ADD_AUTHORIZED_CONTACT=新增{0}到你的通訊錄上
-service.gui.ADD_CONTACT_TO_CONTACTLIST=將此聯絡人新增到您的聯絡人列表中
+service.gui.ADD_AUTHORIZED_CONTACT=將 {0} 新增到您的通訊錄
+service.gui.ADD_CONTACT_TO_CONTACTLIST=將此聯絡人新增到您的通訊錄
 service.gui.ADD_CONTACT_TO=新增聯絡人到
-service.gui.ADD_CONTACT_ERROR=新增聯絡人：{0}失敗
+service.gui.ADD_CONTACT_ERROR=新增聯絡人 {0} 失敗
 service.gui.ADD_CONTACT_ERROR_TITLE=新增聯絡人錯誤
-service.gui.ADD_CONTACT_EXIST_ERROR=聯絡人{0}已經存在於您的聯絡人名單中了。
-service.gui.ADD_CONTACT_NETWORK_ERROR=伺服器未能回應你新增聯絡人ID為{0}的聯絡人的請求。
-service.gui.ADD_CONTACT_NOT_SUPPORTED=無法新增聯絡人Id為{0}的聯絡人。不支援此操作。
-
-
-
-
-
-
+service.gui.ADD_CONTACT_EXIST_ERROR=聯絡人 {0} 已經存在於您的通訊錄中了。
+service.gui.ADD_CONTACT_NETWORK_ERROR=伺服器未回應您新增以下聯絡人的請求： {0}
+service.gui.ADD_CONTACT_NOT_SUPPORTED=無法新增聯絡人ID為 {0} 的聯絡人：不支援此操作。
+service.gui.ADD_CONTACT_NOT_CONNECTED=新增聯絡人時必須連上伺服器。請登入後再試。
+service.gui.ADD_GROUP_LOCAL_ERROR=新增群組 {0} 失敗：本地資料存取錯誤。
+service.gui.ADD_GROUP_EXIST_ERROR=群組 {0} 已經存在於您的通訊錄。請另取一個名稱。
+service.gui.ADD_GROUP_NET_ERROR=新增群組 {0} 失敗：網路錯誤。請檢查您的網路連線然後重試。
+service.gui.ADD_GROUP_ERROR=新增群組 {0} 失敗。
+service.gui.ADD_GROUP_EMPTY_NAME=群組名稱不得為空白。
+service.gui.ADDRESS=地址
+service.gui.ADMINISTRATOR=管理員
+service.gui.ADVANCED=進階
+service.gui.ALL_CONTACTS=所有聯絡人
+service.gui.ALTERNATE_ADDRESS=備用地址
+service.gui.APPLY=套用
+service.gui.ARE_CALLING={0} 正在呼叫...
+service.gui.ARE_NOW=您現在是 {0}
+service.gui.AT=位於
+service.gui.AUTHORIZE=授權
+service.gui.AUTHORIZATION_ACCEPTED={0} 已接受您的授權請求。
+service.gui.AUTHENTICATION_FAILED=帳號 {0} 身份驗證失敗：密碼輸入錯誤。
+service.gui.AUTHENTICATION_REQUESTED_SERVER=伺服器 {0} 已發送了您的身份驗證請求。
+service.gui.AUTHENTICATION_REJECTED={0 } 已拒絕了您的授權請求。
+service.gui.AUTHENTICATION_WINDOW_TITLE={0} 身份驗證
+service.gui.AUTHORIZATION_REQUESTED=已發送授權請求
+service.gui.AUTHORIZATION_REQUESTED_INFO=聯絡人 {0} 請求您的授權。
+service.gui.AUTHORIZATION_RESPONSE=授權回覆
+service.gui.AWAY_STATUS=離開
+service.gui.EXTENDED_AWAY_STATUS=長時間離開
+service.gui.BAN=封鎖
+service.gui.BANNED=已封鎖
+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.BROWSE=瀏覽
+service.gui.BUSY_MESSAGE=抱歉，我現在有點忙。
+service.gui.BUSY_STATUS=忙碌
+service.gui.CALL=呼叫
+service.gui.CALL_CONTACT=呼叫聯絡人
+service.gui.CALL_FAILED=呼叫失敗
+service.gui.CALL_HISTORY_TOOL_TIP=點擊這裡顯示通話記錄
+service.gui.CALL_HISTORY_GROUP_NAME=通話記錄
+service.gui.CALL_VIA=通話方式：
+service.gui.CALL_NAME_OR_NUMBER=通話名稱或號碼
+service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=本次通話僅允許來自 {0} 網路以及您的 {1} 帳號的聯絡人參加，{2} 不在上述範圍。
+service.gui.CALL_WITH=與 ... 通話
+service.gui.CALL_NO_AUDIO_DEVICE=您沒有設定音頻設備。
+service.gui.CALL_NO_AUDIO_CODEC=您沒有啟用任何音頻編碼器。
+service.gui.CALL_NO_DEVICE_CODECS_Q=您要繼續呼叫嗎？
+service.gui.CANCEL=取消
+service.gui.CHAT=聊天
+service.gui.CHANGE_FONT=變更字型
+service.gui.CHANGE_ROOM_SUBJECT=修改聊天室主題...
+service.gui.CHANGE_ROOM_SUBJECT_LABEL=您可以在下方輸入本聊天室的新主題。
+service.gui.CHANGE_NICK=修改暱稱
+service.gui.CHANGE_NICKNAME=修改暱稱...
+service.gui.CHANGE_NICKNAME_LABEL=請輸入您的新暱稱。
+service.gui.CHANGE_NICKNAME_ERROR=更改暱稱時發生錯誤
+service.gui.CHANGE_NICKNAME_CONFLICT_ERROR=暱稱已存在
+service.gui.CHANGE_VIDEO_QUALITY=更改遠端視訊品質
+service.gui.CHAT_CONFERENCE_ITEM_LABEL={0} 的語音會議
+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_CONFIGURATION_MEMBERS_EDIT_TITLE=編輯成員清單
+service.gui.CHAT_ROOM_CONFIGURATION_MEMBERS_EDIT_DESCRIPTION=本聊天室成員列於右側。當聊天室被設定為「僅成員」模式時，只有這些使用者被允許加入。
+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_SEND_MSG_FORBIDDEN=訊息發送被封鎖 (您被版主取消發言權了)
+service.gui.CHAT_ROOM_NAME=聊天室名稱
+service.gui.CLEAR_CUSTOM_MESSAGES=清除自訂訊息
+service.gui.ROOM_NAME=聊天室
+service.gui.CHANGE_PASSWORD=修改密碼
+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_LEAVE_NOT_CONNECTED=您必須先登入伺服器才能退出聊天室。
+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=聊天室
+service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} 已將聊天室主題改為：{1}
+service.gui.CHAT_ROOM_ALTERNATE_ADDRESS=您可於下列聊天室繼續您的對話：{0}
+service.gui.CHAT_NICKNAME_CHANGE={0} 現在是 {1}
+service.gui.CHOOSE_CONTACT=選擇聯絡人
+service.gui.CHOOSE_NUMBER=選擇號碼
+service.gui.CHOOSE_ACCOUNT=請從列表中選擇一個帳號。
+service.gui.CITY=城市
+service.gui.COUNTRY=國家
+service.gui.SHOW_MORE_TOOLTIP=點擊查看更多結果
+service.gui.CLEAR=清除
+service.gui.CLOSE=關閉
+service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=您 2 秒前剛收到新訊息。是否要結束本次聊天？
+service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=還有檔案沒傳完。您要取消它們嗎？
+service.gui.CONNECTED_STATUS=已連線
+service.gui.CONNECTING=連線中...
+service.gui.CONNECTING_STATUS=連線中
+service.gui.CONNECTING_EARLY_MEDIA_STATUS=連線中*
+service.gui.CONNECTION=連線
+service.gui.CONNECTION_EXPIRED_MSG=您已經中斷與伺服器 {0} 的連線。
+service.gui.CONTACT_NAME=ID或號碼
+service.gui.CONTACT_NAME_PROMPT=jane.doe@example.com
+service.gui.CONTACT_NAME_INFO=新增一個及時通訊地址 （比如 jane.doe@example.com）或者 VoIP 號碼
+service.gui.CONTACT_NOT_SUPPORTING_CHAT_CONF=您選擇的聯絡人 {0} 不支援群組聊天。
+service.gui.CONTACT_PAUSED_TYPING={0} 暫停輸入
+service.gui.CONTACT_TYPING={0} 正在輸入訊息
+service.gui.CONTACT_TYPING_SEND_FAILED=噓！我們不會告訴 {0} 您正在輸入訊息...
+service.gui.CONTACT_INFO=聯絡人訊息
+service.gui.CONTACTS=聯絡人
+service.gui.COPY=複製
+service.gui.COPY_LINK=複製鏈結
+service.gui.CREATE=建立
+servoce.gui.CREATE_CALL_FAILED=通話建立失敗
+service.gui.CREATE_CHAT_ROOM=建立聊天室...
+service.gui.CREATE_CHAT_ROOM_ERROR=建立聊天室 {0} 失敗
+service.gui.CREATE_CHAT_ROOM_WIZARD=聊天室建立精靈
+service.gui.CREATE_CONFERENCE_CALL=建立語音會議室...
+service.gui.CREATE_GROUP=建立新群組...
+service.gui.CREATE_GROUP_NAME=請在下面輸入欄中輸入您想要建立的群組名.
+service.gui.CREATE_VIDEO_BRIDGE=建立視訊橋接中...
+service.gui.CREATE_VIDEO_BRIDGE_MENU=建立視訊橋接
+service.gui.CREATE_JOIN_VIDEO_CONFERENCE=建立/加入視訊會議
+service.gui.CREATE_VIDEO_CONFERENCE=為此聊天室建立一個新的視訊會議
+service.gui.CONTACT_INFO_NOT_SUPPORTED=該聯絡人不支援網路名片
+service.gui.CUT=剪下
+service.gui.DELETE=刪除
+service.gui.DENY=拒絕
+service.gui.DESKTOP_SHARING_WARNING=<b>您確定要開始螢幕共享？</b> <br>這個動作將允許對方觀看您的螢幕畫面。
+service.gui.DESKTOP_SHARING_DIALOG_INDICATE=您正在共享螢幕
+service.gui.DIALPAD=撥號盤
+service.gui.DISPLAY_NAME=顯示名稱
+service.gui.DISPLAY_NAME_PROMPT=Jane Doe
+service.gui.DISPLAY_NAME_INFO=為這個聯絡人新增一個名稱。如果留空的話，將會使用及時通訊地址或 VoIP 填補。（可選）
+service.gui.DISCONNECTED_STATUS=已斷線
+service.gui.DND_STATUS=請勿打擾
+service.gui.DO_NOT_ASK_AGAIN=請勿重複詢問
+service.gui.DO_NOT_SHOW_AGAIN=請勿重複此訊息
+service.gui.DRAG_FOR_SHARING=將任何您想共享的東西拖動到這裡...
+service.gui.DURATION=持續時間
+service.gui.DESTROY_CHATROOM=撤銷聊天室
+service.gui.DESTROY_MESSAGE=請提供說明以及替代聊天室的名稱以告知其他參與者。
+service.gui.EDIT=編輯
+service.gui.EDITED_AT=編輯於 {0}
+service.gui.EMAIL=電子郵件
+service.gui.EMAILS=電子郵件
+service.gui.EMPTY_HISTORY=清空歷史紀錄
+service.gui.ENABLE_DESKTOP_REMOTE_CONTROL=啟用遠端控制
+service.gui.ENABLE_TYPING_NOTIFICATIONS=讓其他人知道我們正在發訊息（發送對話狀態）
+service.gui.END_CONFERENCE=結束會議
+service.gui.ENTER_PHONE_NUMBER=輸入電話號碼
+service.gui.ENTER_NAME_OR_NUMBER=輸入名稱或號碼
+service.gui.ERROR=錯誤
+service.gui.ERROR_WAS=錯誤訊息：{0}
+service.gui.ERROR_RECEIVED_FROM=從 {0} 收到錯誤訊息
+service.gui.ESTIMATED_TIME=預估時間：
+service.gui.EVENTS=事件
+service.gui.EXIT=退出
+service.gui.GENERAL=通用
+service.gui.GENERAL_ERROR=常見錯誤
+service.gui.GROUP_NAME=群組名稱
+service.gui.FAILED_STATUS=呼叫失敗
+service.gui.FAILED_TO_JOIN_CHAT_ROOM=加入聊天室 {0} 失敗
+service.gui.FAX=傳真
+service.gui.FFC_STATUS=有空聊天
+service.gui.FILE=檔案
+service.gui.FILE_WAITING_TO_ACCEPT=等待 {0} 接收您的檔案
+service.gui.FILE_UNABLE_TO_SEND=向 {0} 傳送檔案時發生錯誤
+service.gui.FILE_RECEIVE_FAILED=從 {0} 接收檔案時發生錯誤
+service.gui.FILE_SENDING_TO=正在向 {0} 傳送檔案
+service.gui.FILE_RECEIVING_FROM=正在從 {0} 接收檔案
+service.gui.FILE_SEND_COMPLETED=向 {0} 傳送檔案成功
+service.gui.FILE_RECEIVE_COMPLETED=從 {0} 接收檔案成功
+service.gui.FILE_TRANSFER_CANCELED=檔案傳輸已取消
+service.gui.FILE_SEND_FAILED=檔案傳送失敗：{0}
+service.gui.FILE_TOO_BIG=檔案大小超出通訊協定允許範圍：{0}
+service.gui.FILE_SEND_REFUSED={0} 拒收這個檔案
+service.gui.FILE_TRANSFER_REFUSED=檔案傳輸被拒絕
+service.gui.FILE_TRANSFER_NOT_SUPPORTED=您選擇的聯絡人不支持檔案傳輸。
+service.gui.FILE_TRANSFER_PREPARING=正在準備和 {0} 的檔案傳輸。請稍候...
+service.gui.FILE_TRANSFER_REQUEST_RECIEVED={0} 正在和您共享檔案
+service.gui.FILE_DOES_NOT_EXIST=無法找到這個檔案，它可能已被刪除或移動到別處。
+service.gui.FILE_OPEN_FAILED=開啟檔案失敗，它可能已被刪除或移動到別處。
+service.gui.FILE_OPEN_NOT_SUPPORTED=對不起！在當前平台上無法開啟檔案
+service.gui.FILE_OPEN_NO_PERMISSION=您沒有足夠的權限來開啟這個檔案。請檢查後重試。
+service.gui.FILE_OPEN_NO_APPLICATION=無法找到應用程式開啟這種類型的檔案
+service.gui.FINISH=完成
+service.gui.FOLDER_DOES_NOT_EXIST=無法找到包含這個檔案的資料夾。它可能已被刪除或移動到別處。
+service.gui.FOLDER_OPEN_FAILED=開啟資料夾失敗
+service.gui.FOLDER_OPEN_NO_PERMISSION=您沒有足夠的權限來開啟這個資料夾。請檢查後重試。
+service.gui.FOLDER_OPEN_NO_APPLICATION=無法找到應用程式開啟這個資料夾
+service.gui.FONT=字型
+service.gui.FONT_BOLD=粗體
+service.gui.FONT_COLOR=顏色
+service.gui.FONT_FAMILY=字型家族
+service.gui.FONT_ITALIC=斜體
+service.gui.FONT_SIZE=大小
+service.gui.FONT_STYLE=樣式
+service.gui.FONT_UNDERLINE=底線
+service.gui.GRANT_OWNERSHIP=晉升為主人
+service.gui.GRANT_ADMIN=提拔為管理員
+service.gui.GRANT_MODERATOR=提拔為主持人
+service.gui.GRANT_MEMBERSHIP=授予成員權限
+service.gui.GRANT_VOICE=授予語音權限
+service.gui.GUEST=訪客
+service.gui.HANG_UP=掛斷
+service.gui.HD_QUALITY=HD視訊
+service.gui.HELP=協助
+service.gui.HIDE=隱藏
+service.gui.HIDE_OFFLINE_CONTACTS=隱藏離線聯絡人
+service.gui.HIDE_MAIN_WINDOW=<DIV>點擊視窗上的 X 只會隱藏視窗，不會退出程式。<BR>如果您要退出程式，請選擇「檔案/退出」。</DIV>
+service.gui.HISTORY=通訊紀錄
+service.gui.HISTORY_CONTACT=歷史記錄 - {0}
+service.gui.HISTORY_TOGGLE_PER_CONTACT=關閉此聯絡人的歷史記錄
+service.gui.HISTORY_TOGGLE_PER_CHATROOM=關閉此聊天室的歷史記錄
+service.gui.HISTORY_TOGGLE_ALL=關閉所有聊天室及聯絡人的歷史記錄
+service.gui.HISTORY_ERASE_PER_CONTACT=清除此聯絡人的所有歷史記錄
+service.gui.HISTORY_ERASE_PER_CHATROOM=清除此聊天室的所有歷史記錄
+service.gui.HISTORY_ERASE_ALL=清除在 {0} 的所有聊天記錄
+service.gui.HISTORY_REMOVE_PER_CONTACT_WARNING=您確定要永久刪除 {0} 儲存在這部電腦上的所有訊息嗎？
+service.gui.HISTORY_REMOVE_ALL_WARNING=您確認要永久刪除儲存在這部電腦上的所有訊息嗎？
+service.gui.HISTORY_REMOVE_ERROR=刪除在這部電腦上的訊息時發生錯誤。
+service.gui.HOME=首頁
+service.gui.HOME_PAGE=首頁
+service.gui.ICE=ICE
+service.gui.IDENTIFIER=識別名稱
+service.gui.IGNORE=忽略
+service.gui.INSERT_SMILEY=表情
+service.gui.INCOMING_CALL=來自 {0} 的通話請求
+service.gui.INCOMING_SCREEN_SHARE=來自 {0} 的螢幕共享請求
+service.gui.INCOMING_CALL_STATUS=來電呼叫
+service.gui.INCOMING_SCREEN_SHARE_STATUS=收到螢幕共享請求
+service.gui.INSTANT_MESSAGINGS=即時通訊
+service.gui.IM=即時通訊
+service.gui.INITIATING_CALL_STATUS=通訊正在建立
+service.gui.INVITATION=邀請說明
+service.gui.INVITATION_RECEIVED=收到邀請
+service.gui.INVITATION_RECEIVED_MSG={0} 邀請您加入聊天室 {1} 。您可以選擇同意，拒絕或忽略此邀請。
+service.gui.INVITATION_REJECTED={0} 已經拒絕您的加入聊天室邀請。原因：{1} 
+service.gui.INVITE=邀請
+service.gui.INVITE_CONTACT_MSG=如果想進行精確搜尋，請輸入該使用者的名稱。
+service.gui.INVITE_CONTACT_TO_CHAT=邀請其他聯絡人加入聊天
+service.gui.INVITE_CONTACT_TO_CALL=邀請其他聯絡人加入呼叫
+service.gui.INVITE_CONTACT_TO_VIDEO_BRIDGE=邀請其他聯絡人加入視訊橋接
+service.gui.INVITE_REASON=邀請理由
+service.gui.IS_CALLING={0} 正在呼叫...
+service.gui.IS_NOW={0} 已更名為 {1}
+service.gui.JOIN=加入
+service.gui.JOIN_AS=加入為...
+service.gui.JOIN_EXISTING_VIDEO_CONFERENCE=加入現有的視訊會議
+service.gui.JOIN_VIDEO=加入視訊通話
+service.gui.JOB_TITLE=職稱
+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.JOIN_AUTOMATICALLY=自動加入
+service.gui.DONT_JOIN_AUTOMATICALLY=禁止自動加入
+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_NAME=姓氏
+service.gui.LEAVE=離開
+service.gui.LIMIT_REACHED_FOR_IP=來自這個本地IP地址的註冊者太多，伺服器 {0} 不再接受新註冊。
+service.gui.LIST=清單
+service.gui.LOADING_ROOMS=正在載入聊天室...
+service.gui.LOADING=載入中...
+service.gui.LOCALLY_ON_HOLD_STATUS=本地通話保留
+service.gui.LOGIN_NETWORK_ERROR=使用者 {0} 登入 {1} 伺服器失敗：請檢查您的網路連線。
+service.gui.LOGIN_GENERAL_ERROR=使用者 {0} 登入 {1} 伺服器時發生錯誤。
+service.gui.LOGIN_INTERNAL_ERROR=使用者 {0} 登入 {1} 伺服器時發生錯誤：這應該是一個 bug！請將問題 email 回饋至 dev@jitsi.java.net。
+service.gui.LOGIN_INVALID_PROPERTIES_ERROR=使用者 {0} 登入 {1} 伺服器時發生錯誤：請檢查您的帳號設定。
+service.gui.LOGOFF_NOT_SUCCEEDED=使用者 {0} 登出 {1} 伺服器時發生錯誤。
+service.gui.LOW_QUALITY=低品質
+service.gui.MEMBER=成員
+service.gui.MERGE_TO_CALL=合併所有通話
+service.gui.MESSAGE=訊息
+service.gui.MISSED_CALLS_TOOL_TIP=未接來電來自：
+service.gui.MISSED_CALLS_MORE_TOOL_TIP= 還有 {0} 條
+service.gui.MODERATOR=主持人
+service.gui.MORE_LABEL=展開
+service.gui.MOVE=移動
+service.gui.MOVE_SUBCONTACT=移動聯絡人
+service.gui.MOVE_SUBCONTACT_MSG=請選擇您要移動聯絡人到哪個群組。
+service.gui.MOVE_SUBCONTACT_FAILED=您選擇的聯絡人已經存在。\n請重新選擇！
+service.gui.MOVE_SUBCONTACT_QUESTION=您確認要將 {0} 移動到 {1}？
+service.gui.MOVE_TO_GROUP=移動到群組
+service.gui.MOVE_CONTACT=移動聯絡人
+service.gui.MSG_DELIVERY_FAILURE=以上訊息發送失敗
+service.gui.MSG_DELIVERY_NOT_SUPPORTED=您正在使用的通訊協定不支援離線訊息功能。請嘗試其他通訊協定，或者等待 {0} 上線。
+service.gui.MSG_DELIVERY_INTERNAL_ERROR=程式內部發生錯誤：這可能是一個BUG！請回饋問題到：http://www.jitsi.org/index.php/Development/BugsAndIssues
+service.gui.MSG_DELIVERY_ERROR=發送訊息失敗。
+service.gui.MSG_DELIVERY_UNKNOWN_ERROR=發送訊息失敗，原因不明。
+service.gui.MSG_DELIVERY_UNSUPPORTED_OPERATION=不支持的操作。
+service.gui.MSG_NOT_DELIVERED=網路錯誤。請檢查網路設定後重試。
+service.gui.MSG_NOT_POSSIBLE=無法發送訊息給該聯絡人（通訊協定不支援）
+service.gui.MSG_RECEIVED={0} 發送訊息給您了
+service.gui.MSG_SEND_CONNECTION_PROBLEM=請先登入伺服器再發送訊息。
+service.gui.MULTIPLE_LOGINS=使用者 {0} 在其他地方登入，{1} 伺服器連線中斷。
+service.gui.MY_CHAT_ROOMS=聊天室
+service.gui.MY_CHAT_ROOMS_TITLE=新增聊天室
+service.gui.MUTUALLY_ON_HOLD_STATUS=雙方等候接通
+service.gui.NAME=名稱
+service.gui.NETWORK=網路
+service.gui.NETWORK_FAILURE=網路錯誤
+service.gui.NEXT=下一個
+service.gui.NEW_ACCOUNT=建立新帳號...
+service.gui.NEW_MESSAGE=新訊息...
+service.gui.NEW_NAME=新名稱
+service.gui.NEW_STATUS_MESSAGE=新狀態訊息
+service.gui.NEW_STATUS_MESSAGE_SAVE=存為自定義訊息
+service.gui.NICKNAME=暱稱
+service.gui.NO=否
+service.gui.NONE=無
+service.gui.NO_CAMERA_AVAILABLE=沒有可用的攝影機
+service.gui.NO_DESKTOP_SHARING_FOR_PROTOCOL=此通訊協定不支援桌面共享功能。
+service.gui.NO_VIDEO_ENCODINGS=在設定檔中沒有啟用任何視訊解碼器
+service.gui.NO_VIDEO_FOR_PROTOCOL=此通訊協定不支持視訊通話
+service.gui.NO_AVAILABLE_ROOMS=目前無法取得伺服器上的聊天室列表。
+service.gui.NO_CONTACTS_FOUND=找不到相符的聯絡人。按下 Ctrl+Enter 或使用以下按鈕呼叫 {0} 。
+service.gui.NO_CONTACTS_FOUND_SHORT=未找到相符的聯絡人
+service.gui.NO_MESSAGE=沒有訊息
+service.gui.NO_GROUP_CHAT_ACCOUNT_AVAILABLE=沒有可用的群組聊天帳號。請到 jitsi.org 查詢哪些通訊協定支援群組聊天。
+service.gui.NO_ONLINE_CONFERENCING_ACCOUNT=沒有可用的會議帳號。請到 jitsi.org 查詢哪些通訊協定支援會議。
+service.gui.NO_ONLINE_TELEPHONY_ACCOUNT=呼叫前必須確保至少一個電話帳號在線。請登入您的一個電話帳號然後重試。
+service.gui.NOT_AUTHORIZED=未授權
+service.gui.NON_EMPTY_CHAT_WINDOW_CLOSE=您正在嘗試關閉對話，但是還有未發送的訊息。您確定要關閉對話嗎？
+service.gui.NON_EXISTING_USER_ID={0} 伺服器無法識別這個使用者 ID。
+service.gui.NOT_IN_CONTACT_LIST_GROUP_NAME=不在通訊錄中
+service.gui.SD_QUALITY=標準品質
+service.gui.OFFLINE=離線
+service.gui.OK=確定
+service.gui.ONLINE=在線
+service.gui.OPEN=開啟
+service.gui.OPEN_FILE_FROM_IMAGE=雙擊以開啟檔案
+service.gui.OPEN_FOLDER=開啟資料夾
+service.gui.OPEN_IN_BROWSER=在瀏覽器中開啟
+service.gui.OPTIONS=選項
+service.gui.OPEN_AUTOMATICALLY=在下列情況時自動開啟本聊天室
+service.gui.OPEN_ON_ACTIVITY=有活動時開啟
+service.gui.OPEN_ON_MESSAGE=僅在有訊息時開啟
+service.gui.OPEN_ON_IMPORTANT_MESSAGE=僅在有重要訊息時開啟
+service.gui.OR=或者
+service.gui.ORGANIZATION=組織
+service.gui.OTHER=其他
+service.gui.chat.role.OWNER=主人
+service.gui.chat.role.ADMINISTRATOR=管理員
+service.gui.chat.role.MODERATOR=主持人
+service.gui.chat.role.MEMBER=成員
+service.gui.chat.role.GUEST=遊客
+service.gui.chat.role.SILENT_MEMBER=靜音成員
+service.gui.chat.role.OUTCAST=被禁止加入
+service.gui.OWNER=聊天室主人
+service.gui.ON_MOBILE_TOOLTIP=(手機通話中)
+service.gui.PASSWORD=密碼
+service.gui.PASSWORD_CHANGE_FAILURE=密碼修改失敗
+service.gui.PASSWORD_CHANGE_SUCCESS=密碼修改成功
+service.gui.PASTE=貼上
+service.gui.PERSONAL=私人
+service.gui.PORT=通訊埠
+service.gui.POSTAL_CODE=郵遞區號
+service.gui.PREFERENCES=偏好設定
+service.gui.PREFIX=前置字串
+service.gui.PRESENCE=上線狀況
+service.gui.PRESS_ENTER_FOR_SUGGESTIONS=按 Enter 鍵查看建議
+service.gui.PRESS_FOR_CALL_INFO=點擊查看通話訊息
+service.gui.PRESS_TO_OPEN_CRM=點擊開啟CRM程式
+service.gui.PREVIOUS=上一個
+service.gui.PRINT=列印
+service.gui.PROACTIVE_NOTIFICATION=正在輸入訊息
+service.gui.PROBLEMS_ENCOUNTERED=遇到問題
+service.gui.PROTOCOL=通訊協定
+service.gui.PUT_OFF_HOLD=取消等待通話
+service.gui.PUT_ON_HOLD=等待通話
+service.gui.QUIT=退出
+service.gui.READY=就緒
+service.gui.RECENT_MESSAGES=最近的對話
+service.gui.REASON=原因
+service.gui.RECEIVED=收到 {0}
+service.gui.RECONNECTION_LIMIT_EXCEEDED=使用者 {0} 重複登入 {1} 伺服器：該帳號暫時被封鎖，請過一段時間後再試。
+service.gui.RE_REQUEST_AUTHORIZATION=重新請求授權
+service.gui.REFERRED_STATUS=轉接
+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_CONTACT_TEXT=<DIV>確定要將<B> {0} </B><BR>從通訊錄中刪除嗎？</DIV>
+service.gui.REMOVE_CONTACT_NOT_CONNECTED=您需要重新連線以移除此聯絡人。請登入後重試。
+service.gui.REMOVE_GROUP=刪除群組
+service.gui.REMOTELY_ON_HOLD_STATUS=對方等候通話
+service.gui.RENAME=重新命名
+service.gui.RENAME_CONTACT=重新命名聯絡人
+service.gui.RENAME_CONTACT_WIZARD=請輸入該聯絡人的新名稱。
+service.gui.RENAME_GROUP=重新命名群組
+service.gui.RENAME_GROUP_INFO=請輸入該群組的新名稱。
+service.gui.RENAME_CLEAR_USER_DEFINED=還原
+service.gui.RINGING_STATUS=響鈴中
+service.gui.REQUEST=請求
+service.gui.REQUEST_AUTHORIZATION=請求授權
+service.gui.REQUEST_AUTHORIZATION_MSG=無法新增 {0} 到您的通訊錄，必須等待 {0} 加您為好友。請輸入您的請求訊息。
+service.gui.RETRY=重試
+service.gui.REVOKE_OWNERSHIP=取消所有權
+service.gui.REVOKE_ADMIN=取消管理者權限
+service.gui.REVOKE_MODERATOR=取消主持人權限
+service.gui.REVOKE_MEMBERSHIP=取消成員權限
+service.gui.REVOKE_VOICE=取消發言權
+service.gui.SAVE=存檔
+service.gui.SEARCH=搜尋
+service.gui.SEARCH_FOR_CHAT_ROOMS_MSG=點擊顯示本伺服器上所有聊天室，選擇您想加入的聊天室再點擊「加入」。
+service.gui.SEARCH_STRING_CONTACT_SOURCE=搜尋到的聯絡人
+service.gui.SECURITY=安全
+service.gui.SELECT_ACCOUNT_INFO=您想使用哪個帳號與這個聯絡人進行通訊？
+service.gui.SELECT_COLOR=選擇顏色
+service.gui.SELECT_GROUP=選擇群組
+service.gui.SELECT_GROUP_INFO=您想將此聯絡人放置在哪個群組下顯示？（可選）
+service.gui.SELECT_NO_GROUP=未加入群組
+service.gui.SELECT_PROVIDERS_FOR_CHAT_ROOM=以下是您所有支援群組聊天的帳號。請選擇其中一個以建立聊天室。
+service.gui.SELECT_VIDEO_CONFERENCE=選擇視訊會議
+service.gui.SERVER_CHAT_ROOMS_DIALOG_TEXT=聊天室
+service.gui.SEND=發送
+service.gui.SEND_FILE=傳送檔案
+service.gui.SEND_MESSAGE=發送訊息
+service.gui.SEND_PRIVATE_MESSAGE=傳送私密訊息
+service.gui.SEND_SMS=發送簡訊
+service.gui.SEND_SMS_DETAILS=請以國際電話號碼格式輸入，例如以 +886 開頭的台灣手機號碼 +886937123456。
+service.gui.SEND_SMS_NOT_SUPPORTED=您選擇的通訊協定不支援簡訊發送功能。
+service.gui.SMS=簡訊
+service.gui.SEND_VIA=轉發訊息
+service.gui.SENT=已發送
+service.gui.SERVER_CHAT_ROOMS=聊天室伺服器
+service.gui.SET_GLOBAL_STATUS=設定全域狀態
+service.gui.SET_STATUS_MESSAGE=設定狀態訊息
+service.gui.SET_SUBJECT=設定主題
+service.gui.SETTINGS=選項
+service.gui.SHARE_DESKTOP=共享桌面
+service.gui.SHARE_DESKTOP_WITH_CONTACT=共享桌面給聯絡人
+service.gui.SHARE_FULL_SCREEN=全螢幕共享
+service.gui.SHARE_REGION=局部螢幕共享
+service.gui.SHOW=顯示
+service.gui.SHOW_CONTACT_LIST_TOOL_TIP=點擊切換歷史記錄視窗及通訊錄。
+service.gui.SHOW_MORE=顯示更多...
+service.gui.SHOW_OFFLINE_CONTACTS=顯示離線聯絡人
+service.gui.SIGN_IN=登入
+service.gui.SMS_SUCCESSFULLY_SENT=簡訊發送成功！
+service.gui.SMS_SEND_CONNECTION_PROBLEM=必須先登入才能發送簡訊。請登入您的簡訊服務帳號。
+service.gui.SPECIFY_REASON=請輸入您這麼做的原因。
+service.gui.SPECIFY_SERVER=請補充您帳號設定的伺服器說明。
+service.gui.SOUND_OFF=關閉聲音
+service.gui.SOUND_ON=開啟聲音
+service.gui.START_SHARING=開始共享
+service.gui.STATUS=狀態
+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.STOP_SHARING=停止共享
+service.gui.STREET=街道
+service.gui.SUBJECT=標題
+service.gui.SUMMARY=摘要
+service.gui.TELEPHONY=電話
+service.gui.TOOLS=工具
+service.gui.TRANSFER=轉接
+service.gui.TO=到：
+service.gui.TRANSFER_CALL_MSG=先選擇要轉接聯絡人再點擊「轉接」。
+service.gui.TRANSFER_CALL_TITLE=轉接來電
+service.gui.TRANSFER_CALL_TO=轉接給：
+service.gui.TRANSPARENCY_NOT_ENABLED=您當前的設定不支持透明化。
+service.gui.TYPE_YOUR_REQUEST=請在這裡輸入您的請求
+service.gui.UNABLE_TO_CHANGE_VIDEO_QUALITY=我們無法變更本通話的視訊品質。
+service.gui.USER_IDENTIFIER=使用者ID：
+service.gui.USER_EXISTS_ERROR=所選的網路已存在該使用者。請選擇其他使用者或網路。
+service.gui.USERNAME_NULL=請輸入使用者名稱和密碼。
+service.gui.WEBPAGE=開啟網頁
+service.gui.ACCOUNT_CREATION_FAILED=建立帳號失敗，原因：{0}
+service.gui.UNKNOWN=未知使用者
+service.gui.UNKNOWN_STATUS=未知狀態
+service.gui.UNREGISTERED_MESSAGE=使用者 {0} 連線 {1} 伺服器失敗：您正處於離線狀態。
+service.gui.USE_PROVISIONING=使用在線配置
+service.gui.VALUE=數值
+service.gui.VIDEO_CALL=視訊通話
+service.gui.VIA=經由
+service.gui.VIEW=顯示
+service.gui.VIEW_HISTORY=檢視歷史紀錄
+service.gui.VIEW_SMILEYS=顯示表情
+service.gui.VIEW_TOOLBAR=顯示工具列
+service.gui.VIEW_SIMPLE_CHAT_THEME=簡單聊天主題皮膚
+service.gui.VOICEMAIL_NEW_URGENT_OLD_RECEIVED={0} 條新訊息 ( {1} 條緊急 ) 和 {2} 條舊訊息
+service.gui.VOICEMAIL_NEW_URGENT_RECEIVED={0} 條新訊息 ( {1} 條緊急 )
+service.gui.VOICEMAIL_NEW_OLD_RECEIVED={0} 條新訊息和 {1} 條舊訊息
+service.gui.VOICEMAIL_NEW_RECEIVED={0} 條新訊息
+service.gui.VOICEMAIL_OLD_RECEIVED={0} 條舊訊息
+service.gui.VOICEMAIL_NO_MESSAGES=沒有訊息
+service.gui.VOICEMAIL_TITLE=語音留言
+service.gui.VOICEMAIL_TOOLTIP=語音留言給：
+service.gui.VOICEMAIL_TIP=點擊通話按鈕以收聽您的留言。
+service.gui.VOICEMAIL_TIP_NO_ACCOUNT=請在帳號精靈中設定可用以讀取語音信箱的網址 (URI)
+service.gui.VOLUME_CONTROL_TOOL_TIP=調整音量
+service.gui.WAITING_AUTHORIZATION=正在等待授權
+service.gui.WARNING=警告
+service.gui.YES=是
+service.gui.NEW_GMAIL_HEADER=您有一封新郵件！收件箱：<a href="{1}">{0}</a><br/>
+service.gui.NEW_GMAIL_MANY_HEADER=收件箱：<a href="{1}">{0}</a><br/> 有 {2} 封新郵件。
+service.gui.NEW_GMAIL_FOOTER=多條未讀留言在您的<a href="{0}">收件箱</a>。<br/>
+service.gui.NEW_GMAIL_MANY_FOOTER=有 {1} 個未讀留言在您的<a href="{0}">收件箱</a>。<br/>
+service.gui.ACTIVATE=啟用
+service.gui.DEACTIVATE=停用
+service.gui.NEW=新增
+service.gui.ENTER_FULL_SCREEN_TOOL_TIP=進入全螢幕模式
+service.gui.EXIT_FULL_SCREEN_TOOL_TIP=退出全螢幕模式
+service.gui.HOLD_BUTTON_TOOL_TIP=啟用/停用通話等待
+service.gui.MUTE_BUTTON_TOOL_TIP=切換靜音或者按住按鈕以調整麥克風音量
+service.gui.PARK=保持
+service.gui.PARKING_SLOT=通話駐留通道：
+service.gui.PARK_BUTTON_TOOL_TIP=呼叫保持
+service.gui.RECORD_BUTTON_TOOL_TIP=開啟/停止錄音
+service.gui.LOCAL_VIDEO_BUTTON_TOOL_TIP=切換視訊
+service.gui.SHOW_LOCAL_VIDEO_BUTTON_TOOL_TIP=顯示/隱藏本地視訊
+service.gui.SHOW_HIDE_PEERS_TOOL_TIP=顯示/隱藏通話參與者列表
+service.gui.TRANSFER_BUTTON_TOOL_TIP=轉接來電
+service.gui.TRANSFER_TO=轉接給...
+service.gui.SECURITY_INFO=安全訊息
+service.gui.SECURITY_WARNING=安全警告
+service.gui.SECURITY_ERROR=安全錯誤
+service.gui.SPEED=速率：
+service.gui.SILENT_MEMBER=靜音成員
+service.gui.NON_SECURE_CONNECTION=無法為帳號 {0} 建立安全連線。如果您想連線到一個不安全的伺服器，請在您的帳號設定中勾選「允許不安全的連線」選項
+service.gui.MOBILE_PHONE=手機
+service.gui.VIDEO_PHONE=視訊
+service.gui.WORK_PHONE=工作
+service.gui.PHONE=電話
+service.gui.PHONES=電話
+service.gui.EDIT_NOT_SUPPORTED=此帳號不可編輯
+service.gui.SHOW_PREVIEW=(顯示預覽)
+service.gui.SHOW_PREVIEW_WARNING_DESCRIPTION=您要繼續顯示此圖片？\n\n顯示圖片/視訊 可能讓您的匿名失效並且暴露您的活動狀態。
+service.gui.SHOW_PREVIEW_DIALOG_TITLE=顯示圖片/視訊預覽
+
+service.gui.ZID_NAME_SET=ZRTP 識別碼名稱：
+service.gui.ZID_NAME_NOT_SET=ZRTP 識別碼名稱未設定
+service.gui.ZID_NAME_BUTTON=點擊設定一個 ZRTP 識別碼名稱。
+service.gui.ZID_NAME_DIALOG=編輯 ZRTP 識別碼名稱
+service.gui.ZID_NAME_UNEXPECTED=<html>ZRTP 識別碼不相符。<br><b>請先比對身份驗證識別碼是否與對方一致！</b><br>修改 ZRTP 身份驗證識別碼直至與對方一致再存檔。</html>
+
+service.gui.JANUARY=一月
+service.gui.FEBRUARY=二月
+service.gui.MARCH=三月
+service.gui.APRIL=四月
+service.gui.MAY=五月
+service.gui.JUNE=六月
+service.gui.JULY=七月
+service.gui.AUGUST=八月
+service.gui.SEPTEMBER=九月
+service.gui.OCTOBER=十月
+service.gui.NOVEMBER=十一月
+service.gui.DECEMBER=十二月
+
+service.gui.callinfo.TECHNICAL_CALL_INFO=技術呼叫訊息
+service.gui.callinfo.CALL_INFORMATION=通話訊息
+service.gui.callinfo.CALL_IDENTITY=標識
+service.gui.callinfo.PEER_COUNT=參與人數
+service.gui.callinfo.IS_CONFERENCE_FOCUS=會議焦點
+service.gui.callinfo.CALL_TRANSPORT=信號呼叫傳輸
+service.gui.callinfo.CALL_DURATION=通話週期
+service.gui.callinfo.TLS_PROTOCOL=TLS 通訊協定
+service.gui.callinfo.TLS_CIPHER_SUITE=TLS 加密算法套件
+service.gui.callinfo.TLS_CERTIFICATE_CONTENT=以下是 TLS 伺服器憑證內容。
+service.gui.callinfo.VIEW_CERTIFICATE=查看憑證
+service.gui.callinfo.CODEC=編碼器/頻率
+service.gui.callinfo.NA=無
+service.gui.callinfo.VIDEO_SIZE=視訊大小
+service.gui.callinfo.AUDIO_INFO=音訊訊息
+service.gui.callinfo.VIDEO_INFO=視訊訊息
+service.gui.callinfo.LOCAL_IP=本地IP/通訊埠
+service.gui.callinfo.REMOTE_IP=遠端IP/通訊埠
+service.gui.callinfo.BANDWITH=帶寬
+service.gui.callinfo.LOSS_RATE=損失率
+service.gui.callinfo.RTT=RTT
+service.gui.callinfo.JITTER=抖動
+service.gui.callinfo.MEDIA_STREAM_TRANSPORT_PROTOCOL=多媒體串流傳輸通訊協定
+service.gui.callinfo.MEDIA_STREAM_RTP=RTP
+service.gui.callinfo.MEDIA_STREAM_SRTP=SRTP
+service.gui.callinfo.KEY_EXCHANGE_PROTOCOL=密鑰交換通訊協定
+service.gui.callinfo.ICE_CANDIDATE_EXTENDED_TYPE=ICE 候選者拓展類型
+service.gui.callinfo.ICE_STATE=ICE 作業處理狀態
+
+#enum values from IceProcessingState
+service.gui.callinfo.ICE_STATE.WAITING=搜集候選者
+service.gui.callinfo.ICE_STATE.RUNNING=連通性檢查
+service.gui.callinfo.ICE_STATE.COMPLETED=已完成
+service.gui.callinfo.ICE_STATE.FAILED=失敗
+
+service.gui.callinfo.ICE_LOCAL_HOST_ADDRESS=本地主機IP/通訊埠
+service.gui.callinfo.ICE_LOCAL_REFLEXIVE_ADDRESS=本地自反IP/通訊埠
+service.gui.callinfo.ICE_LOCAL_RELAYED_ADDRESS=本地中繼IP/通訊埠
+service.gui.callinfo.ICE_REMOTE_HOST_ADDRESS=遠端主機IP/通訊埠
+service.gui.callinfo.ICE_REMOTE_REFLEXIVE_ADDRESS=遠端自反IP/通訊埠
+service.gui.callinfo.ICE_REMOTE_RELAYED_ADDRESS=遠端中繼IP/通訊埠
+service.gui.callinfo.TOTAL_HARVESTING_TIME=回收時間總計
+service.gui.callinfo.HARVESTING_TIME=回收時間
+service.gui.callinfo.HARVESTING_MS_FOR=ms (為
+service.gui.callinfo.HARVESTS= 收成)
+service.gui.callinfo.DECODED_WITH_FEC=用 FEC 解碼封包
+service.gui.callinfo.DISCARDED_PERCENT=當前封包被捨棄
+service.gui.callinfo.DISCARDED_TOTAL=被捨棄封包數
+service.gui.callinfo.ADAPTIVE_JITTER_BUFFER=自適應抖動緩衝器
+service.gui.callinfo.JITTER_BUFFER_DELAY=抖動緩衝器
+
+service.gui.ALWAYS_TRUST=總是信任這個憑證
+service.gui.CERT_DIALOG_TITLE=驗證憑證
+service.gui.CERT_DIALOG_DESCRIPTION_TXT=<html>{0} 連接到 {1} 伺服器時無法驗證。<br><br>該伺服器憑證不受信任，因而無法自動驗證。<br><br>您確定要繼續連線？<br>點擊 「檢視憑證」可取得進一步資訊。</html>
+service.gui.CERT_DIALOG_DESCRIPTION_TXT_NOHOST=<html>{0} 連接伺服器時無法驗證。<br><br>該伺服器憑證不受信任，因而無法自動驗證。<br><br>您確定要繼續連線？<br>點擊 「檢視憑證」可取得進一步資訊。</html>
+service.gui.CERT_DIALOG_PEER_DESCRIPTION_TXT=<html>{0} 無法驗證客戶端 {1} 的身份。<br><br>該客戶端的證書不受信任，因此無法自動驗證其身份。<br>您確認要繼續連線？<br><br>點擊「查看證書」獲取詳細訊息。</html>
+service.gui.CONTINUE_ANYWAY=仍然繼續
+service.gui.CERT_INFO_CHAIN=證書鏈：
+service.gui.CERT_INFO_ISSUED_TO=通用名：
+
+#service.gui.CERT_INFO_ are combined from Rdn names
+service.gui.CERT_INFO_CN=通用名：
+service.gui.CERT_INFO_O=組織：
+service.gui.CERT_INFO_C=國家：
+service.gui.CERT_INFO_ST=州/省：
+service.gui.CERT_INFO_L=地址：
+service.gui.CERT_INFO_ISSUED_BY=頒發者
+service.gui.CERT_INFO_OU=單位：
+service.gui.CERT_INFO_VALIDITY=有效性
+service.gui.CERT_INFO_ISSUED_ON=簽發日：
+service.gui.CERT_INFO_EXPIRES_ON=到期日：
+service.gui.CERT_INFO_FINGERPRINTS=數位指紋
+service.gui.CERT_INFO_CERT_DETAILS=序號：
+service.gui.CERT_INFO_SER_NUM=序號：
+service.gui.CERT_INFO_VER=版本：
+service.gui.CERT_INFO_SIGN_ALG=演算法簽章：
+service.gui.CERT_INFO_PUB_KEY_INFO=公鑰訊息
+service.gui.CERT_INFO_ALG=演算法：
+service.gui.CERT_INFO_PUB_KEY=公鑰：
+service.gui.CERT_INFO_KEY_BITS_PRINT={0} bits
+service.gui.CERT_INFO_EXP=指數：
+service.gui.CERT_INFO_KEY_SIZE=密鑰長度：
+service.gui.CERT_INFO_SIGN=簽名：
+service.gui.SHOW_CERT=顯示憑證
+service.gui.HIDE_CERT=隱藏憑證
+
+service.gui.AUTO_ANSWER=自動接聽和轉接
+service.gui.AUTO_ANSWER_LABEL=自動接聽
+service.gui.AUTO_ANSWER_ALL_CALLS=所有來電
+service.gui.AUTO_ANSWER_ALERT_INFO_FIELDS=只用於來電 (那些包含 "Alert-Info" 欄位的來電設定為「自動接聽」)
+service.gui.AUTO_ANSWER_CUSTOM_FIELDS=包含下列字段和數值的通話
+service.gui.AUTO_ANSWER_FIELD=字段/檔頭：
+service.gui.AUTO_ANSWER_VALUE=數值：
+service.gui.AUTO_ANSWER_DESCR_VLUE=始終留空
+service.gui.AUTO_ANSWER_FWD_CALLS=通話轉接
+service.gui.AUTO_ANSWER_FWD_CALLS_TO=轉接所有通話到下列號碼或網址 (URI)：
+service.gui.AUTO_ANSWER_VIDEO=視訊
+service.gui.AUTO_ANSWER_VIDEO_CALLS_WITH_VIDEO=用視訊接聽視訊通話
+service.gui.LOCAL_VIDEO_ERROR_TITLE=本地端視訊錯誤
+service.gui.LOCAL_VIDEO_ERROR_MESSAGE=啟用/禁用本地端視訊失敗。
+
+service.gui.security.SECURE_AUDIO=加密音頻
+service.gui.security.AUDIO_NOT_SECURED=音訊未加密
+service.gui.security.SECURE_VIDEO=加密視訊
+service.gui.security.VIDEO_NOT_SECURED=視訊未加密
+service.gui.security.CALL_SECURED_TOOLTIP=通話已加密。更多詳情請點擊這裡。
+service.gui.security.CALL_NOT_SECURED_TOOLTIP=通話未加密
+service.gui.security.CALL_SECURED_COMPARE_TOOLTIP=點擊這裡與對方核對安全密碼。
 # keep the following string short
-
+service.gui.security.COMPARE_WITH_PARTNER_SHORT=請與參與者進行字串比對：
+service.gui.security.STRING_COMPARED=字串比對成功！
+service.gui.security.SAS_INFO_TOOLTIP=<html>為了完成加密，您需要<b>口頭讀出</b>對方提供的一小段身份驗證文字，通過驗證後才能繼續通話。<br/><br/>如果您清除了這條確認訊息，下次您仍將被要求重新驗證。</html>
+service.gui.security.SECURITY_ALERT=嘗試啟動加密通話，即將重新連線。
+
+service.gui.avatar.CHOOSE_ICON=選擇圖片
+service.gui.avatar.REMOVE_ICON=刪除這張圖片
+service.gui.avatar.CLEAR_RECENT=清除最近使用圖片：
+service.gui.avatar.RECENT_ICONS=最近使用圖片：
 # service.gui.avatar.imagepicker
+service.gui.avatar.imagepicker.CANCEL=取消
+service.gui.avatar.imagepicker.CHOOSE_FILE=選擇...
+service.gui.avatar.imagepicker.CLICK=按一下，然後微笑 ^_^
+service.gui.avatar.imagepicker.IMAGE_FILES=圖片檔案
+service.gui.avatar.imagepicker.IMAGE_PICKER=圖片
+service.gui.avatar.imagepicker.IMAGE_SIZE=圖片大小
+service.gui.avatar.imagepicker.RESET=重置
+service.gui.avatar.imagepicker.SET=設定
+service.gui.avatar.imagepicker.TAKE_PHOTO=拍照
 
+service.gui.security.encryption.required=必須加密！
 
+service.protocol.ICE_FAILED=無法建立連線（ICE失敗，找不到中繼器）
 
-# impl.protocol.ssh
-#Contact Details Seperator(must not be part of contact data stored as persistent
-# data)
 
+impl.protocol.sip.XCAP_ERROR_TITLE=SIP通訊錄存儲錯誤
+impl.protocol.sip.XCAP_ERROR_RESOURCE_ERR={1} 的資源 {0} 無法讀取。
+impl.protocol.sip.XCAP_ERROR_UNAUTHORIZED={0} 用於 XCAP 的使用者名稱或密碼錯誤。
 
 # systray
+impl.systray.SET_STATUS=設定狀態
+impl.systray.FAILED_TO_OPEN_ADD_CONTACT_DIALOG=開啟「新增聯絡人」精靈失敗。
+impl.systray.POPUP_MESSAGE_HANDLER=工作列冒泡提示訊息
+impl.swingnotification.POPUP_MESSAGE_HANDLER={0} 彈出視窗
+impl.growlnotification.POPUP_MESSAGE_HANDLER=聲音提醒
+impl.galagonotification.POPUP_MESSAGE_HANDLER=freedesktop.org 桌面提醒
 
 # New Account Dialog
+impl.gui.main.account.DEFAULT_PAGE_TITLE=帳號新增精靈
+impl.gui.main.account.DEFAULT_PAGE_BODY=您可利用上述清單來選擇您想要新增帳號的網路。
+impl.gui.main.account.DUMMY_PROTOCOL_NAME=虛擬通訊協定名稱
+impl.gui.main.account.DUMMY_PROTOCOL_DESCRIPTION=選擇網路
 
 # LDAP
+impl.ldap.CONFIG_FORM_TITLE=LDAP 設定
+impl.ldap.GENERAL=通用
+impl.ldap.FIELDS=欄位
+impl.ldap.QUERY=查詢
+impl.ldap.QUERY_DEFAULT=自動建立
+impl.ldap.QUERY_CUSTOM=自定義查詢
+impl.ldap.QUERY_CUSTOM_HINT=使用 {0} 作為搜尋條件當中的位置標誌符號。
+impl.ldap.QUERY_CUSTOM_AUTO_WILDCARD=在搜尋條件當中自動補上通配字符。
+impl.ldap.QUERY_PHOTO_INLINE=經由其他屬性獲取圖片
+impl.ldap.EDIT=編輯
+impl.ldap.ENABLED=啟用
+impl.ldap.SERVER_NAME=伺服器名稱
+impl.ldap.SERVER_NAME_EXAMPLE=我的 LDAP 伺服器
+impl.ldap.SERVER_HOSTNAME=主機名稱
+impl.ldap.SERVER_EXIST=該伺服器名稱已存在，請重新命名。
+impl.ldap.USE_SSL=使用 SSL
+impl.ldap.AUTH_NONE=沒有
+impl.ldap.AUTH_SIMPLE=簡易
+impl.ldap.SCOPE_SUB_TREE=子節點
+impl.ldap.SCOPE_ONE=一個
+impl.ldap.SAVE=存檔
+impl.ldap.CANCEL=取消
+impl.ldap.SERVER_PORT=通訊埠
+impl.ldap.AUTHENTICATION=身份驗證
+impl.ldap.USERNAME=使用者名稱 (Bind DN)
+impl.ldap.PASSWORD=密碼
+impl.ldap.SEARCH_BASE=搜尋範圍
+impl.ldap.SCOPE=範圍
+impl.ldap.WRONG_CREDENTIALS=LDAP 目錄服務 {0} 驗證錯誤 (Wrong credentials)
+impl.ldap.MAIL_FIELD_NAME=電子郵件欄位
+impl.ldap.MAILSUFFIX_FIELD_NAME=電子郵件後綴欄位
+impl.ldap.WORKPHONE_FIELD_NAME=工作電話欄位
+impl.ldap.MOBILEPHONE_FIELD_NAME=移動電話欄位
+impl.ldap.HOMEPHONE_FIELD_NAME=住家電話欄位
+impl.ldap.MAIL_FIELD_EXAMPLE=電子郵件
+impl.ldap.MAILSUFFIX_FIELD_EXAMPLE=@domain.org (別忘了加上 '@')
+impl.ldap.WORKPHONE_FIELD_EXAMPLE=公司電話
+impl.ldap.MOBILEPHONE_FIELD_EXAMPLE=行動電話
+impl.ldap.HOMEPHONE_FIELD_EXAMPLE=住家電話
+impl.ldap.PHONE_PREFIX=國際電話碼
+impl.ldap.PHONE_PREFIX_EXAMPLE=例如 00
+
+# SIP Protocol
+impl.protocol.sip.INVALID_ADDRESS="{0}" 不是一個有效的 SIP 地址。
+
+#Jabber Protocol
+impl.protocol.jabber.INVALID_ADDRESS="{0}" 不是一個有效的 XMPP JID。
 
 # Address book plugin
+plugin.addrbook.ADDRESS_BOOKS=通訊錄
+plugin.addrbook.ENABLE_MACOSX_ADDRESSBOOK=允許搜尋 MacOS X 通訊錄
+plugin.addrbook.ENABLE_MICROSOFT_OUTLOOK=允許搜尋 Microsoft Outlook
+plugin.addrbook.DESCRIPTION=若啟用本功能，您於搜尋框輸入的文字會同時在線上和本機通訊錄進行搜尋，所有符合條件的聯絡人都能夠被找出來。
+plugin.addrbook.DEFAULT_IM_APP=以 Jitsi 作為預設的即時通訊商 (與 Outlook 整合)
+plugin.addrbook.PREFIX=國際電話冠碼
+plugin.addrbook.PREFIX_EXAMPLE=例如 00
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT_TITLE=存取您的 Microsoft Outlook 聯絡人發生錯誤。
+plugin.addrbook.OUTLOOK_IS_NOT_DEFAULT_MAIL_CLIENT={0} 目前無法訪問您的Microsoft Outlook聯絡人，因為Outlook不是您的預設電子郵件應用程式。
+plugin.addrbook.MAKE_OUTLOOK_DEFAULT_MAIL_CLIENT=使用 Outlook 做為預設電子郵件軟體
 
 # Google Contacts
+impl.googlecontacts.CONFIG_FORM_TITLE=Google 聯絡人
+impl.googlecontacts.EDIT=編輯
+impl.googlecontacts.ENABLED=啟用
+impl.googlecontacts.ACCOUNT_NAME=帳號名稱
+impl.googlecontacts.SAVE=存檔
+impl.googlecontacts.CANCEL=取消
+impl.googlecontacts.USERNAME=帳號名稱
+impl.googlecontacts.PASSWORD=密碼
+impl.googlecontacts.PREFIX=電話區號
+impl.googlecontacts.WRONG_CREDENTIALS=Google 帳號 {0} 驗證錯誤
+impl.googlecontacts.OAUTH_DIALOG_TITLE=Google 通訊錄授權
+impl.googlecontacts.INSTRUCTIONS=<html><p><b> 點擊如下鏈接以授權 Google 通訊錄外掛訪問您的帳戶。</b><br><br> 點擊此鏈接後，您的瀏覽器就會開啟。請您登入指定的帳號並完成授權。在成功授權後，Google 會提供一串代碼。請複製這串代碼並粘貼到下面的文字對話框，然後點擊「保存」。 </p><p>本操作只需進行一次，往後不必反覆授權。</html>
+impl.googlecontacts.CODE=代碼:
+impl.googlecontacts.HYPERLINK_TEXT=點擊這裡以允許訪問 {0} 的授權請求
 
 # account info
+plugin.accountinfo.TITLE=帳號訊息
+plugin.accountinfo.EXTENDED=延伸訊息
+plugin.accountinfo.NOT_SUPPORTED=無法獲取帳號訊息。
+plugin.accountinfo.SELECT_ACCOUNT=請選擇一個帳號：
+plugin.accountinfo.DISPLAY_NAME=顯示名稱：
+plugin.accountinfo.FIRST_NAME=名字：
+plugin.accountinfo.MIDDLE_NAME=字/號：
+plugin.accountinfo.LAST_NAME=姓氏：
+plugin.accountinfo.NICKNAME=暱稱：
+plugin.accountinfo.URL=網址(URL)：
+plugin.accountinfo.AGE=年齡：
+plugin.accountinfo.BDAY=生日：
+plugin.accountinfo.BDAY_FORMAT=MMM月dd日, yyyy西元年
+plugin.accountinfo.GENDER=性別：
+plugin.accountinfo.STREET=街道地址：
+plugin.accountinfo.CITY=城市：
+plugin.accountinfo.REGION=地區：
+plugin.accountinfo.POST=郵遞區號：
+plugin.accountinfo.COUNTRY=國家：
+plugin.accountinfo.EMAIL=E-mail：
+plugin.accountinfo.WORK_EMAIL=公司 Email：
+plugin.accountinfo.PHONE=電話：
+plugin.accountinfo.WORK_PHONE=公司電話：
+plugin.accountinfo.MOBILE_PHONE=行動電話：
+plugin.accountinfo.ORGANIZATION=組織名稱：
+plugin.accountinfo.JOB_TITLE=職稱：
+plugin.accountinfo.ABOUT_ME=關於我：
+plugin.accountinfo.ABOUT_ME_MAX_CHARACTERS=200
+plugin.accountinfo.GLOBAL_ICON=使用全域圖標
+plugin.accountinfo.LOCAL_ICON=使用此圖標：
 
 # connection info
+plugin.connectioninfo.TITLE=連接訊息
 
 # contact info
+plugin.contactinfo.TITLE=聯絡人詳情
+plugin.contactinfo.CONTACT_SUMMARY_DESCRIPTION=聯絡人摘要
+plugin.contactinfo.CONTACT_EXTENDED_DESCRIPTION=聯絡人備註
+plugin.contactinfo.NOT_SPECIFIED=[未指定]
+plugin.contactinfo.USER_PICTURES=大頭照
+plugin.contactinfo.USER_STATUS_MESSAGE=狀態
 
 # aimaccregwizz
+plugin.aimaccregwizz.PROTOCOL_NAME=AIM
+plugin.aimaccregwizz.PROTOCOL_DESCRIPTION=AIM服務通訊協定
+plugin.aimaccregwizz.USERNAME=AIM即時通暱稱：
+plugin.aimaccregwizz.USERNAME_AND_PASSWORD=AIM 即時通暱稱和密碼
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT=註冊新帳號
+plugin.aimaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=如果您沒有 AIM 帳號，可點擊這個按鈕註冊一個新帳號。
 
 # branding
+plugin.branding.ABOUT_WINDOW_TITLE=關於 {0}
+plugin.branding.LOGO_MESSAGE=開放源碼 VoIP 以及即時通訊
+plugin.branding.ABOUT_MENU_ENTRY=關於
 
-# Dict protocol
-
-# facebookaccregwizz
+plugin.busylampfield.PICKUP=接聽通話
 
 # generalconfig
+plugin.generalconfig.AUTO_START=開機或重啟時自動運行 {0}
+plugin.generalconfig.CHATALERTS_ON_MESSAGE=以工作列圖標提醒來電
+plugin.generalconfig.GROUP_CHAT_MESSAGES=集中聊天訊息到同一個視窗
+plugin.generalconfig.LOG_HISTORY=保存聊天記錄
+plugin.generalconfig.SHOW_HISTORY=顯示
+plugin.generalconfig.HISTORY_SIZE=最近的聊天訊息
+plugin.generalconfig.SEND_MESSAGES_WITH=發送訊息經由：
+plugin.generalconfig.BRING_WINDOW_TO_FRONT=將聊天視窗保持在最上層
+plugin.generalconfig.DEFAULT_LANGUAGE=介面語言
+plugin.generalconfig.DEFAULT_LANGUAGE_RESTART_WARN=您的設定將在下次啟動時生效。
+plugin.generalconfig.DEFAULT_LANGUAGE_TRANSLATED={0}% 已翻譯
+plugin.generalconfig.SIP_CLIENT_PORT=SIP 客戶端通訊埠
+plugin.generalconfig.SIP_CLIENT_SECURE_PORT=SIP 客戶端加密通訊埠
+plugin.generalconfig.SIP_SSL_PROTOCOLS=啟用 SSL/TLS 通訊協定
+plugin.generalconfig.ERROR_PORT_NUMBER=錯誤的通訊埠號
+plugin.generalconfig.CHECK_FOR_UPDATES=啟動時檢查更新
+plugin.generalconfig.STARTUP_CONFIG=啟動
+plugin.generalconfig.LEAVE_CHATROOM_ON_WINDOW_CLOSE=關閉視窗時退出聊天室
+plugin.generalconfig.SHOW_RECENT_MESSAGES=顯示最近的對話（依聊天記錄）
+plugin.generalconfig.REMOVE_SPECIAL_PHONE_SYMBOLS=撥號前刪除電話號碼中的特殊符號
+plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS=轉換電話號碼中的英文字母
+plugin.generalconfig.ACCEPT_PHONE_NUMBER_WITH_ALPHA_CHARS_EXAMPLE=例如 +1-800-MYPHONE -> +1-800-6974663
+plugin.generalconfig.SIP_CALL_CONFIG=SIP
+plugin.generalconfig.XMPP_CONFIG=XMPP
+plugin.generalconfig.XMPP_USE_ALL_RESOURCES=搜尋聯絡人時使用所有資源
+plugin.generalconfig.OPUS_CONFIG=Opus
+plugin.generalconfig.OPUS_AUDIO_BANDWIDTH=採樣率：
+plugin.generalconfig.OPUS_BITRATE=編碼器平均位元傳輸率(kbps)：
+plugin.generalconfig.OPUS_USE_DTX=使用 DTX：
+plugin.generalconfig.OPUS_USE_FEC=使用 Inband FEC：
+plugin.generalconfig.OPUS_COMPLEXITY=編碼器複雜度：
+plugin.generalconfig.OPUS_MIN_EXPECTED_PACKET_LOSS=最低預期丟包率(%)：
+plugin.generalconfig.SILK_CONFIG=Silk
+plugin.generalconfig.SILK_USE_FEC=使用 Inband FEC：
+plugin.generalconfig.SILK_ALWAYS_ASSUME_PACKET_LOSS=始終假設丟包：
+plugin.generalconfig.SILK_SAT=語音活性閾值(0-1)：
+plugin.generalconfig.SILK_ADVERTISE_FEC=SDP 支援的 FEC 宣告：
+plugin.generalconfig.RESTORE=恢復預設值
 
 # gibberish accregwizz
+plugin.gibberishaccregwizz.PROTOCOL_NAME=胡言亂語
+plugin.gibberishaccregwizz.PROTOCOL_DESCRIPTION=Jitsi 測試通訊協定
+plugin.gibberishaccregwizz.USERNAME=使用者ID：
+plugin.gibberishaccregwizz.USERNAME_AND_PASSWORD=ID 設定
 
 # icqaccregwizz
+plugin.icqaccregwizz.PROTOCOL_NAME=ICQ
+plugin.icqaccregwizz.PROTOCOL_DESCRIPTION=AOL ICQ 服務通訊協定
+plugin.icqaccregwizz.USERNAME=ICQ 號碼：
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=如果您沒有 ICQ 帳號，可點擊這個按鈕註冊一個新帳號。
+plugin.icqaccregwizz.REGISTER_NEW_ACCOUNT=建立新帳號
 
 # irc accregwizz
+plugin.ircaccregwizz.PROTOCOL_NAME=IRC
+plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC 通訊協定
+plugin.ircaccregwizz.USERNAME_AND_PASSWORD=IRC 使用者名稱 (UIN) 和密碼
+plugin.ircaccregwizz.USERNAME=暱稱
+plugin.ircaccregwizz.EXAMPLE_USERNAME=例如：ircuser
+plugin.ircaccregwizz.INFO_PASSWORD=大部分 IRC 伺服器不需要密碼。
+plugin.ircaccregwizz.AUTO_NICK_CHANGE=當該暱稱已被佔用時，自動選擇暱稱。
+plugin.ircaccregwizz.USE_DEFAULT_PORT=使用預設通訊埠
+plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=我的暱稱不需要身份校驗
+plugin.ircaccregwizz.HOST=主機名稱：
+plugin.ircaccregwizz.IRC_SERVER=伺服器
+plugin.ircaccregwizz.EXAMPLE_SERVER=例如：chat.freenode.net
+plugin.ircaccregwizz.USE_SECURE_CONNECTION=使用安全連接
+plugin.ircaccregwizz.ENABLE_CONTACT_PRESENCE=啟用聯絡人在線狀態
+plugin.ircaccregwizz.ENABLE_CHAT_ROOM_PRESENCE=啟用聊天室在線狀態
+plugin.ircaccregwizz.SASL_AUTHENTICATION_TITLE=SASL 身份驗證
+plugin.ircaccregwizz.ENABLE_SASL_AUTHENTICATION=啟用 SASL 身份驗證
+plugin.ircaccregwizz.SASL_USERNAME=使用者名稱
+plugin.ircaccregwizz.SASL_AUTHZ_ROLE=角色
+plugin.ircaccregwizz.SASL_IRC_PASSWORD_USED=以上的 IRC 密碼用於 SASL 身份驗證
+plugin.ircaccregwizz.RESOLVE_DNS_THROUGH_PROXY=總是使用代理進行DNS解析
 
 # jabber accregwizz
-
-# mailbox
-
-# msn accregwizz
+plugin.jabberaccregwizz.PROTOCOL_NAME=XMPP
+plugin.jabberaccregwizz.PROTOCOL_DESCRIPTION=XMPP 通訊協定
+plugin.jabberaccregwizz.USERNAME=XMPP 使用者名稱
+plugin.jabberaccregwizz.PASSWORD_CONFIRM=確認密碼
+plugin.jabberaccregwizz.CSERVER=伺服器
+plugin.jabberaccregwizz.SERVER=連接伺服器
+plugin.jabberaccregwizz.ENABLE_KEEP_ALIVE=允許保持連線
+plugin.jabberaccregwizz.ENABLE_GMAIL_NOTIFICATIONS=有新訊息時經由 Gmail 提醒
+plugin.jabberaccregwizz.ENABLE_GOOGLE_CONTACTS_SOURCE=允許搜尋 Google 聯絡人
+plugin.jabberaccregwizz.NEW_ACCOUNT_TITLE=註冊新的 XMPP 帳號
+plugin.jabberaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=建立新的 XMPP 帳號
+plugin.jabberaccregwizz.CHOOSE_SERVER_TITLE=XMPP 新帳號伺服器選擇器
+plugin.jabberaccregwizz.CHOOSE_SERVER_TEXT=從以下列表選擇要建立帳號的 XMPP 伺服器
+plugin.jabberaccregwizz.CHOOSE=選擇
+plugin.jabberaccregwizz.SERVER_COLUMN=伺服器
+plugin.jabberaccregwizz.COMMENT_COLUMN=評論
+plugin.jabberaccregwizz.RESOURCE=資源
+plugin.jabberaccregwizz.AUTORESOURCE=自動生成資源名稱
+plugin.jabberaccregwizz.PRIORITY=優先等級
+plugin.jabberaccregwizz.UNKNOWN_XMPP_ERROR=不認識的 XMPP 錯誤 ({0})：請確認伺服器地址是否正確。
+plugin.jabberaccregwizz.NOT_SAME_PASSWORD=密碼不相符。
+plugin.jabberaccregwizz.USE_ICE=使用 ICE
+plugin.jabberaccregwizz.AUTO_DISCOVER_STUN=自動檢測 STUN/TURN 伺服器
+plugin.jabberaccregwizz.SUPPORT_TURN=支援 TURN
+plugin.jabberaccregwizz.TURN_USERNAME=TURN 使用者名稱
+plugin.jabberaccregwizz.IP_ADDRESS=IP 地址
+plugin.jabberaccregwizz.ADD_STUN_SERVER=新增 STUN 伺服器
+plugin.jabberaccregwizz.EDIT_STUN_SERVER=編輯 STUN 伺服器
+plugin.jabberaccregwizz.ADDITIONAL_STUN_SERVERS=更多 STUN 伺服器
+plugin.jabberaccregwizz.NO_STUN_ADDRESS=請填寫合法的 STUN 伺服器地址再進行下一步。
+plugin.jabberaccregwizz.NO_STUN_USERNAME=請填寫合法的 STUN 伺服器使用者名稱再進行下一步。
+plugin.jabberaccregwizz.STUN_ALREADY_EXIST=該 STUN 伺服器已存在
+plugin.jabberaccregwizz.USE_DEFAULT_STUN_SERVER=若是沒有可用的 STUN 伺服器，則使用 {0} 作為預設的 STUN 伺服器。
+plugin.jabberaccregwizz.USE_JINGLE_NODES=使用 Jingle Nodes
+plugin.jabberaccregwizz.AUTO_DISCOVER_JN=自動檢測 Jingle Nodes 中繼
+plugin.jabberaccregwizz.RELAY_SUPPORT=支援中繼 (relay)
+plugin.jabberaccregwizz.ADD_JINGLE_NODE=新增 Jingle Node
+plugin.jabberaccregwizz.EDIT_JINGLE_NODE=編輯 JINGLE NODE
+plugin.jabberaccregwizz.JID_ADDRESS=JID 地址
+plugin.jabberaccregwizz.ADDITIONAL_JINGLE_NODES=更多 JINGLE NODES
+plugin.jabberaccregwizz.USE_UPNP=啟用 UPnP
+plugin.jabberaccregwizz.EXISTING_ACCOUNT=已新增的 XMPP 帳號
+plugin.jabberaccregwizz.DOMAIN_BYPASS_CAPS=將使用 GTalk 通話域
+plugin.jabberaccregwizz.TELEPHONY_DOMAIN=語音通話域
+plugin.jabberaccregwizz.ALLOW_NON_SECURE=允許非安全連線
+plugin.jabberaccregwizz.DISABLE_CARBON=禁止訊息複製
+plugin.jabberaccregwizz.DTMF_AUTO=自動：自動選擇 RTP 或 Inband
+plugin.jabberaccregwizz.SERVER_OPTIONS=伺服器選項
+plugin.jabberaccregwizz.CHANGE_PASSWORD=更改帳號密碼
+plugin.jabberaccregwizz.PORT_FIELD_INVALID=請填入一個可用的通訊埠號碼，然後進行下一步。
+plugin.jabberaccregwizz.HAS_TO_BE_LOGGED_IN=變更密碼前，必須先登入該帳號。
+plugin.jabberaccregwizz.TLS_REQUIRED=該連線未使用 TLS，不會嘗試變更密碼。
+plugin.jabberaccregwizz.PASSWORD_CHANGED=密碼變更成功
+plugin.jabberaccregwizz.SERVER_NOT_SUPPORT_PASSWORD_CHANGE=您的 XMPP 伺服器不支援密碼變更。
+plugin.jabberaccregwizz.PASSWORD_NOT_STORED=密碼在伺服器上已變更，但是本地設定沒有更新。
+plugin.jabberaccregwizz.ENTER_NEW_PASSWORD=請同時在兩個輸入框中輸入新密碼：
+plugin.jabberaccregwizz.OVERRIDE_ENCODINGS=重載全域編碼設定
+plugin.jabberaccregwizz.ENCODINGS=編碼
+plugin.jabberaccregwizz.AUDIO=音訊
+plugin.jabberaccregwizz.VIDEO=視訊
+plugin.jabberaccregwizz.RESET=重置
+plugin.jabberaccregwizz.RESET_DESCRIPTION=重置全域設定
+plugin.jabberaccregwizz.DISABLE_JINGLE=禁用 Jingle (XMPP 音訊和視訊呼叫)
 
 # plugin manager
+plugin.pluginmanager.INSTALL=安裝
+plugin.pluginmanager.UNINSTALL=解除安裝
+plugin.pluginmanager.PLUGINS=外掛
+plugin.pluginmanager.URL=網址
+plugin.pluginmanager.CHOOSE_FILE=選取檔案
+plugin.pluginmanager.SHOW_SYSTEM_BUNDLES=顯示系統外掛
+plugin.pluginmanager.SYSTEM=系統
+plugin.pluginmanager.NEW=新建
 
 # simple accregwizz
+plugin.simpleaccregwizz.LOGIN_USERNAME=使用者名稱
+plugin.simpleaccregwizz.INITIAL_ACCOUNT_REGISTRATION=只需點擊一次就能設定所有您偏好的通訊協定。
+plugin.simpleaccregwizz.SIGNUP=還沒註冊帳號？
+plugin.simpleaccregwizz.SPECIAL_SIGNUP=還沒註冊帳號？ - 點擊這裡獲取使用者名稱
 
 # sipaccregwizz
+plugin.sipaccregwizz.PROTOCOL_NAME=SIP
+plugin.sipaccregwizz.PROTOCOL_DESCRIPTION=SIP 通訊協定
+plugin.sipaccregwizz.USERNAME=SIP ID
+plugin.sipaccregwizz.USERNAME_AND_PASSWORD=帳號和密碼
+plugin.sipaccregwizz.CLIENT_CERTIFICATE=客戶 TLS 憑證
+plugin.sipaccregwizz.REGISTRAR=註冊
+plugin.sipaccregwizz.SERVER_PORT=伺服器通訊埠
+plugin.sipaccregwizz.PROXY=代理伺服器
+plugin.sipaccregwizz.PROXY_PORT=代理通訊埠
+plugin.sipaccregwizz.PREFERRED_TRANSPORT=首選傳輸方式
+plugin.sipaccregwizz.PROXY_OPTIONS=代理選項
+plugin.sipaccregwizz.PROXY_AUTO=自動設定代理伺服器
+plugin.sipaccregwizz.PROXY_FORCE_BYPASS=在 HA 的情況下跳過代理安全檢查（請僅在需要時使用）
+plugin.sipaccregwizz.ENABLE_PRESENCE=允許出席 (簡易)
+plugin.sipaccregwizz.FORCE_P2P_PRESENCE=強制使用 P2P 出席模式
+plugin.sipaccregwizz.OFFLINE_CONTACT_POLLING_PERIOD=離線聯絡人拉取間隔 (單位：秒)
+plugin.sipaccregwizz.SUBSCRIPTION_EXPIRATION=預設訂閱周期 (單位：秒)
+plugin.sipaccregwizz.PRESENCE_OPTIONS=出席選項
+plugin.sipaccregwizz.KEEP_ALIVE=保持連線
+plugin.sipaccregwizz.KEEP_ALIVE_METHOD=保持連線方式
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL=保持連接自動觸發間隔時間
+plugin.sipaccregwizz.KEEP_ALIVE_INTERVAL_INFO=1 到 3600 秒
+plugin.sipaccregwizz.DTMF_MINIMAL_TONE_DURATION=最小 RTP DTMF 校正周期(ms)
+plugin.sipaccregwizz.DTMF_MINIMAL_TONE_DURATION_INFO=預設 RTP DTMF 周期是 70ms
+plugin.sipaccregwizz.DTMF=DTMF
+plugin.sipaccregwizz.DTMF_METHOD=DTMF 方式
+plugin.sipaccregwizz.DTMF_AUTO=自動：從 RTP 和 Inband (無SIP訊息) 自動選擇
+plugin.sipaccregwizz.DTMF_RTP=RTP ( RFC2833 / RFC 4733 )
+plugin.sipaccregwizz.DTMF_SIP_INFO=SIP 訊息
+plugin.sipaccregwizz.DTMF_INBAND=Inband
+plugin.sipaccregwizz.ENABLE_DEFAULT_ENCRYPTION=啟用支援加密通話
+plugin.sipaccregwizz.ENABLE_SIPZRTP_ATTRIBUTE=表示支援 ZRTP 的信號通訊協定
+plugin.sipaccregwizz.AUTH_NAME=授權名稱
+plugin.sipaccregwizz.DISPLAY_NAME=顯示名稱
+plugin.sipaccregwizz.EXISTING_ACCOUNT=已新增的 SIP 帳號
+plugin.sipaccregwizz.CREATE_ACCOUNT=建立免費的 SIP 帳號
+plugin.sipaccregwizz.CREATE_ACCOUNT_TITLE=建立帳號
+plugin.sipaccregwizz.XCAP_OPTIONS=通訊錄選項
+plugin.sipaccregwizz.CLIST_TYPE=類型
+plugin.sipaccregwizz.XCAP_USE_SIP_CREDENTIALS=使用 SIP 認證
+plugin.sipaccregwizz.XCAP_USER=使用者
+plugin.sipaccregwizz.XCAP_PASSWORD=密碼
+plugin.sipaccregwizz.XCAP_SERVER_URI=伺服器網址 (URI) 或 IP 地址
+plugin.sipaccregwizz.VOICEMAIL=語音信箱
+plugin.sipaccregwizz.MWI=留言等待 (MWI)
+plugin.sipaccregwizz.VOICEMAIL_URI=語音信箱訂閱網址 (URI)
+plugin.sipaccregwizz.VOICEMAIL_CHECK_URI=語音信箱查閱網址 (URI)
+plugin.sipaccregwizz.NOT_SAME_PASSWORD=您的密碼不相符。
+plugin.sipaccregwizz.NO_CERTIFICATE=<none>(使用一般身份驗證)
+plugin.sipaccregwizz.SAVP_OPTION=RTP/SAVP 標示
+#used from SecurityPanel
+plugin.sipaccregwizz.SAVP_OPTION_0=關閉 (只用 RTP/AVP) 
+plugin.sipaccregwizz.SAVP_OPTION_1=強制 (只用 RTP/SAVP)
+plugin.sipaccregwizz.SAVP_OPTION_2=可選 (先用 RTP/SAVP，然後才用 RTP/AVP)
+plugin.sipaccregwizz.ENCRYPTION_PROTOCOL_PREFERENCES=選擇啟用加密通訊協定和它們的優先順序 (頂端通訊協定優先)：
+plugin.sipaccregwizz.CIPHER_SUITES=啟用加密套件：
+plugin.sipaccregwizz.SECURITY_WARNING=<html><div width=450>{0} 會自動嘗試加密您的所有 ZRTP 通話，同時您會聽到和看到一個安全連線已就緒的提示。如果您已了解您正在做什麼，您僅需改變如下進階設定</div></html>
+plugin.sipaccregwizz.SHOW_ADVANCED=進階加密設定
+plugin.sipaccregwizz.ZRTP_OPTION=ZRTP 選項
+plugin.sipaccregwizz.SDES_OPTION=SDes 選項
 
 # skin manager
-
-# ssh accregwizz
+plugin.skinmanager.SKINS=佈景主題
+plugin.skinmanager.DEFAULT_SKIN=預設佈景主題
+plugin.skinmanager.ADD_NEW_SKIN=新增佈景主題
+plugin.skinmanager.DEFAULT_SKIN_DESCRIPTION=預設的佈景主題
 
 # status update
+plugin.autoaway.AUTO_STATUS=自動切換到離開狀態
+plugin.autoaway.ENABLE_CHANGE_STATUS=離開時更改狀態
+plugin.autoaway.AWAY_MINUTES=閒置幾分鐘自動切換到離開狀態：
 
 # updatechecker
+plugin.updatechecker.DIALOG_TITLE=安裝系統更新
+plugin.updatechecker.DIALOG_MESSAGE=<html>有更新的 {0} 版本可以下載。
+plugin.updatechecker.DIALOG_MESSAGE_2=<br>{0} ({1})：<br>
+plugin.updatechecker.BUTTON_DOWNLOAD=下載
+plugin.updatechecker.BUTTON_CLOSE=關閉
+plugin.updatechecker.BUTTON_INSTALL=安裝
+plugin.updatechecker.UPDATE_MENU_ENTRY=檢查更新
+plugin.updatechecker.DIALOG_WARN=安裝更新前需要登出 {0} 帳號。所有通話將臨時中斷。您需要繼續安裝更新嗎？
+plugin.updatechecker.DIALOG_NOUPDATE=您的版本已經是最新的。
+plugin.updatechecker.DIALOG_NOUPDATE_TITLE=沒有更新的版本
+plugin.updatechecker.DIALOG_MISSING_UPDATE=找不到更新管理器。
 
 # usersearch
+plugin.usersearch.USER_SEARCH=使用者搜尋
 
 # whiteboard
-
-# yahoo accregwizz
-
-# zero accregwizz
+plugin.whiteboard.TITLE=白板 [Beta]
+plugin.whiteboard.MENU_ITEM=白板
+plugin.whiteboard.NOT_SUPPORTED=該聯絡人不支援白板
+plugin.whiteboard.DRAW=繪圖
+plugin.whiteboard.OPEN=開啟
+plugin.whiteboard.PEN=畫筆
+plugin.whiteboard.SELECT=選取
+plugin.whiteboard.LINE=線條
+plugin.whiteboard.RECTANGLE=矩形
+plugin.whiteboard.FILLED_RECTANGLE=實心矩形
+plugin.whiteboard.TEXT=文字
+plugin.whiteboard.IMAGE=圖片
+plugin.whiteboard.POLYGON=多邊形
+plugin.whiteboard.FILLEDPOLYGON=實心多邊形
+plugin.whiteboard.POLYLINE=折線
+plugin.whiteboard.CIRCLE=圓形
+plugin.whiteboard.FILLED_CIRCLE=實心圓形
+plugin.whiteboard.COLOR=顏色
+plugin.whiteboard.MODIFICATION=修改
+plugin.whiteboard.THICKNESS=粗細:
+plugin.whiteboard.GRID=格線
+plugin.whiteboard.DESELECT=取消選取
+plugin.whiteboard.DELETE=刪除
+plugin.whiteboard.PROPERTIES=屬性
 
 # gtalk accregwizz
+plugin.googletalkaccregwizz.PROTOCOL_NAME=Google Talk
+plugin.googletalkaccregwizz.PROTOCOL_DESCRIPTION=GOOGLE TALK 通訊協定
+plugin.googletalkaccregwizz.USERNAME=Google Talk 使用者名稱
+plugin.googletalkaccregwizz.REGISTER_NEW_ACCOUNT_TEXT=如果您沒有 Google Talk 帳號，可點擊這個按鈕註冊一個新帳號。
+plugin.googletalkaccregwizz.NEW_ACCOUNT_TITLE=Google Talk 帳號註冊
 
 # iptel accregwizz
-
-# sip2sip accregwizz
+plugin.iptelaccregwizz.PROTOCOL_NAME=iptel.org
+plugin.iptelaccregwizz.PROTOCOL_DESCRIPTION=iptel.org，IP 電訊平台
+plugin.iptelaccregwizz.USERNAME=使用者名稱
+plugin.iptelaccregwizz.NEW_ACCOUNT_TITLE=訂閱 iptel.org
 
 # ippi accregwizz
+plugin.sip2sipaccregwizz.USERNAME=使用者名稱
+plugin.sip2sipaccregwizz.RETYPE_PASSWORD=再次輸入密碼
+plugin.sip2sipaccregwizz.EMAIL=Email 地址
+plugin.sip2sipaccregwizz.EMAIL_NOTE=<html>這個 email 地址將被用來發送語音留言、<br>未接來電提醒和重置密碼服務。</html>
+plugin.ippiaccregwizz.PROTOCOL_NAME=ippi
+plugin.ippiaccregwizz.PROTOCOL_DESCRIPTION=網路電話 (VoIP) 與即時通訊
+plugin.ippiaccregwizz.NEW_ACCOUNT_TITLE=查閱本服務說明：<br>http://ippi.fr
+plugin.ippiaccregwizz.INFO_NOTE=<html>查閱本服務說明：<a href=''>http://ippi.fr</a></html>
+plugin.ippiaccregwizz.EXISTING_ACCOUNT=已建立的 ippi 帳號
+plugin.ippiaccregwizz.CREATE_ACCOUNT=免費建立 ippi 帳號
 
 # key binding chooser
+#in new ChatWindow() -> manipulated
+plugin.keybindings.CHAT_CLOSE=關閉聊天視窗
+plugin.keybindings.CHAT_COPY=複製
+plugin.keybindings.CHAT_CUT=剪下
+plugin.keybindings.CHAT_NEXT_TAB=下一個標籤
+plugin.keybindings.CHAT_OPEN_HISTORY=開啟歷史記錄
+plugin.keybindings.CHAT_OPEN_SMILIES=開啟表情
+plugin.keybindings.CHAT_PASTE=貼上
+plugin.keybindings.CHAT_PREVIOUS_TAB=上一個標籤
+plugin.keybindings.MAIN_NEXT_TAB=下一個標籤
+plugin.keybindings.MAIN_PREVIOUS_TAB=上一個標籤
+plugin.keybindings.MAIN_RENAME=重新命名聯絡人
+plugin.keybindings.OPEN_HISTORY=顯示聊天記錄
+plugin.keybindings.OPEN_SMILIES=顯示表情
+plugin.keybindings.globalchooser.ANSWER_CALL=通話應答
+plugin.keybindings.globalchooser.HANGUP_CALL=通話掛斷
+plugin.keybindings.globalchooser.ANSWER_HANGUP_CALL=通話應答/掛斷
+plugin.keybindings.globalchooser.SHOW_CONTACTLIST=顯示通訊錄
+plugin.keybindings.globalchooser.MUTE_CALLS=通話靜音
+plugin.keybindings.globalchooser.SHORTCUT_NAME=快捷鍵功能
+plugin.keybindings.globalchooser.SHORTCUT_PRIMARY=主要快捷鍵
+plugin.keybindings.globalchooser.SHORTCUT_SECOND=次要快捷鍵
+plugin.keybindings.globalchooser.PRESS_BTN=點擊設定快捷鍵
+plugin.keybindings.globalchooser.PUSH_TO_TALK=按鍵通話 (Push to Talk)
+plugin.keybindings.globalchooser.ENABLE_SPECIAL=啟用特殊鍵偵測
+plugin.keybindings.PLUGIN_NAME=快捷鍵
+#Enum KeybindingSet.Category
+plugin.keybindings.CHAT=聊天
+plugin.keybindings.MAIN=主要
+plugin.keybindings.GLOBAL=全域快捷鍵
 
 # Notification Configuration Form
+plugin.notificationconfig.ENABLE_NOTIF=啟用
+plugin.notificationconfig.DESCRIPTION=描述
+plugin.notificationconfig.TURN_ON_ALL=全部啟用
+plugin.notificationconfig.TURN_OFF_ALL=全部禁用
+plugin.notificationconfig.ACTIONS=動作
+plugin.notificationconfig.QUICK_CONTROLS=快捷控制
+plugin.notificationconfig.RESTORE=還原預設值
+plugin.notificationconfig.PLAY_SOUND=播放聲音：
+plugin.notificationconfig.EXEC_PROG=執行程式：
+plugin.notificationconfig.DISPLAY_POPUP=在彈出式視窗中顯示訊息
+plugin.notificationconfig.POPUP_NOTIF_HANDLER=彈出提醒類型
+plugin.notificationconfig.SOUND_FILE=音效檔案：
+plugin.notificationconfig.PROGRAM_FILE=程式檔案：
+plugin.notificationconfig.BROWSE_SOUND=選擇音效檔
+plugin.notificationconfig.BROWSE_PROGRAM=選擇程式
+plugin.notificationconfig.tableheader.ENABLE=啟用或禁用這個特性
+plugin.notificationconfig.tableheader.EXECUTE=執行程式
+plugin.notificationconfig.tableheader.POPUP=顯示訊息框
+plugin.notificationconfig.tableheader.SOUND=用提醒裝置播放提示音
+plugin.notificationconfig.tableheader.PLAYBACK_SOUND=用回放裝置播放提示音
+plugin.notificationconfig.tableheader.PCSPEAKER_SOUND=用電腦喇叭播放聲音
+plugin.notificationconfig.tableheader.DESCRIPTION=事件描述
+#NotificationsTable constants
+plugin.notificationconfig.event.IncomingCall=來電通知
+plugin.notificationconfig.event.SecurityMessage=安全訊息
+plugin.notificationconfig.event.IncomingFile=要傳進來的檔案
+plugin.notificationconfig.event.LogFilesArchived=紀錄檔已封存
+plugin.notificationconfig.event.CallSecurityError=通話加密發生錯誤
+plugin.notificationconfig.event.NetworkNotifications=網路通知
+plugin.notificationconfig.event.Dialing=正在撥號
+plugin.notificationconfig.event.ProactiveNotification=主動輸入通知
+plugin.notificationconfig.event.CallSecurityOn=啟動加密通話
+plugin.notificationconfig.event.IncomingMessage=收到訊息
+plugin.notificationconfig.event.OutgoingCall=通話撥出
+plugin.notificationconfig.event.BusyCall=通話忙線中
+plugin.notificationconfig.event.CallSaved=通話保留
+plugin.notificationconfig.event.HangUp=掛斷
+plugin.notificationconfig.event.DNSSEC_NOTIFICATION=DNSSEC 警告
+plugin.notificationconfig.event.DTMFTone.A=DTMF 音調 A
+plugin.notificationconfig.event.DTMFTone.B=DTMF 音調 B
+plugin.notificationconfig.event.DTMFTone.C=DTMF 音調 C
+plugin.notificationconfig.event.DTMFTone.D=DTMF 音調 D
+plugin.notificationconfig.event.DTMFTone.0=DTMF 音調 0
+plugin.notificationconfig.event.DTMFTone.1=DTMF 音調 1
+plugin.notificationconfig.event.DTMFTone.2=DTMF 音調 2
+plugin.notificationconfig.event.DTMFTone.3=DTMF 音調 3
+plugin.notificationconfig.event.DTMFTone.4=DTMF 音調 4
+plugin.notificationconfig.event.DTMFTone.5=DTMF 音調 5
+plugin.notificationconfig.event.DTMFTone.6=DTMF 音調 6
+plugin.notificationconfig.event.DTMFTone.7=DTMF 音調 7
+plugin.notificationconfig.event.DTMFTone.8=DTMF 音調 8
+plugin.notificationconfig.event.DTMFTone.9=DTMF 音調 9
+plugin.notificationconfig.event.DTMFTone.*=DTMF 音調 *
+plugin.notificationconfig.event.DTMFTone.#=DTMF 音調 #
+plugin.notificationconfig.event.DeviceConfigurationChanged=裝置設定已變更
+plugin.notificationconfig.event.NewSelectedDevice=新選取的裝置
 
 # ZRTP Securing
+impl.media.security.WARNING_NO_RS_MATCH=<html>沒有可用的共享密鑰。<br/><b>建議採用 SAS 驗證。</b></html>
+impl.media.security.WARNING_NO_EXPECTED_RS_MATCH=<html>找不到共享密鑰。<br/><b>需要進行 SAS 驗證。</b><br/>如果 SAS 密碼不相符，請掛斷重撥。</html>
+impl.media.security.SEVERE_GENERIC_MSG=<html>檢測到嚴重的服務安全問題。<br/><b>您的通話不安全。</b><br/>錯誤代碼：{0}</html>
+impl.media.security.ZRTP_GENERIC_MSG=<html>檢測到嚴重的 ZRTP 問題。<br/><b>您的通話並未加密。</b><br/>錯誤代碼： {0}</html>
+impl.media.security.INTERNAL_PROTOCOL_ERROR=<html>發生了通訊協定內部錯誤。<br/><b>您的通話不安全。</b><br/>錯誤代碼：{0}</html>
+impl.media.security.CHECKSUM_MISMATCH=<html>內部 ZRTP 封包校驗失敗。<br/>如果您看到這條訊息，可能是遭到了拒絕服務(DoS)攻擊！</html>
+impl.media.security.RETRY_RATE_EXCEEDED=<html>嘗試安全協商次數過多。這很可能是對方的網路連線有問題。<br/><b>您的通話不安全。</b><br/>錯誤代碼：{0}</html>
+impl.media.security.DATA_SEND_FAILED=<html>加密資料傳送失敗。資料連線中斷或是對方已斷線。<br/><b>您的通話不安全</b><br/>錯誤代碼：{0}</html>
+impl.media.security.SECURITY_OFF=加密通話已停用
+impl.media.security.SECURITY_ON=加密通話已啟用
 
 # ZRTP Configuration
+impl.media.security.zrtp.CONFIG=ZRTP 設定
+impl.media.security.zrtp.TITLE=通話
+impl.media.security.zrtp.PUB_KEYS=公開金鑰
+impl.media.security.zrtp.HASHES=雜湊
+impl.media.security.zrtp.SYM_CIPHERS=對稱加密演算法
+impl.media.security.zrtp.SAS_TYPES=SAS 類型
+impl.media.security.zrtp.SRTP_LENGTHS=SRTP 身份驗證長度
+impl.media.security.zrtp.STANDARD=標準
+impl.media.security.zrtp.MANDATORY=強制
+impl.media.security.zrtp.TRUSTED=可信任的 MitM
+impl.media.security.zrtp.SASSIGNATURE=SAS 簽名進行中
+impl.media.security.zrtp.DESCRIPTION={0} 會自動嘗試加密您的所有通話，在此同時您會聽到和看到一條安全連線已就緒的提示。按下此按鈕表示您允許 ZRTP 專家微調 {0} 的 ZRTP 協商行為，您無需做任何調整即可獲得安全呼叫。您應僅在已詳細了解 ZRTP 和一般的加密工作原理後再變更此設定。
+impl.media.security.zrtp.ZRTP_NINJA=ZRTP 隱身
 
 
 
 # Profiler4J
-
-
-
+plugin.profiler.PLUGIN_NAME=Profiler4j
+
+impl.media.configform.AUDIO=音訊系統：
+impl.media.configform.AUDIO_IN=音訊輸入：
+impl.media.configform.AUDIO_NOTIFY=通知：
+impl.media.configform.AUDIO_OUT=音訊輸出：
+impl.media.configform.AUTOMATICGAINCONTROL=自動取得控制權
+impl.media.configform.DENOISE=開啟降噪功能
+impl.media.configform.DEVICES=裝置
+impl.media.configform.DOWN=下移
+impl.media.configform.ECHOCANCEL=開啟回音消除功能
+impl.media.configform.ENCODINGS=編碼
+impl.media.configform.NO_AVAILABLE_AUDIO_DEVICE=無可用的音訊裝置。請連接一個。
+impl.media.configform.NO_DEVICE=<沒有裝置>
+impl.media.configform.NO_PREVIEW=預覽
+impl.media.configform.UP=上移
+impl.media.configform.VIDEO=攝影機：
+impl.media.configform.VIDEO_MORE_SETTINGS=更多設定
+impl.media.configform.VIDEO_RESOLUTION=視訊解析度
+impl.media.configform.VIDEO_FRAME_RATE=自定義影格率(每秒)
+impl.media.configform.VIDEO_PACKETS_POLICY=RTP 步進門檻 (kB/s)
+impl.media.configform.VIDEO_BITRATE=視訊位元傳輸率(kb/s)
+impl.media.configform.VIDEO_RESET=重置為預設值
+impl.media.configform.AUDIO_DEVICE_CONNECTED=已連線的設備：
+impl.media.configform.AUDIO_DEVICE_DISCONNECTED=斷線的設備：
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_IN=新選擇的音訊輸入裝置：
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_OUT=新選擇的音訊輸出裝置：
+impl.media.configform.AUDIO_DEVICE_SELECTED_AUDIO_NOTIFICATIONS=新選擇的提醒裝置：
+impl.media.configform.VIDEO_DEVICE_SELECTED=新選擇的視訊裝置：
+impl.media.configform.AUDIO_DEVICE_CONFIG_MANAGMENT_CLICK=點此進行裝置管理
+
+impl.neomedia.configform.AUDIO=音訊
+impl.neomedia.configform.VIDEO=視訊
+
+impl.neomedia.configform.H264=H.264
+impl.neomedia.configform.H264.defaultIntraRefresh=周期性內部更新
+impl.neomedia.configform.H264.defaultProfile=預設編碼設定：
+#in JNIEncoder
+impl.neomedia.configform.H264.defaultProfile.baseline=基準線
+impl.neomedia.configform.H264.defaultProfile.high=高
+impl.neomedia.configform.H264.defaultProfile.main=主要
+impl.neomedia.configform.H264.keyint=關鍵影格之間的最大間隔
+impl.neomedia.configform.H264.preferredKeyFrameRequester=以偏好方式請求關鍵影格：
+impl.neomedia.configform.H264.preferredKeyFrameRequester.rtcp=RTCP
+impl.neomedia.configform.H264.preferredKeyFrameRequester.signaling=發送信號
+impl.neomedia.configform.H264.preset=預設編碼器
 
 # The callrecordingconfig plugin was never really committed into trunk and its
 # ConfigurationForm was actually put in the neomedia bundle.
+plugin.callrecordingconfig.CALL_RECORDING_CONFIG=通話錄音
+plugin.callrecordingconfig.SAVE_CALLS=儲存錄音檔至：
+plugin.callrecordingconfig.SAVE_CALL=儲存錄音檔至...
+plugin.callrecordingconfig.CHOOSE_DIR=選擇資料夾...
+plugin.callrecordingconfig.SUPPORTED_FORMATS=錄音檔格式：
+plugin.callrecordingconfig.CALL_SAVED=錄音檔儲存成功
+plugin.callrecordingconfig.CALL_SAVED_TO={0}
 
 # Security configuration form title
+plugin.securityconfig.TITLE=安全
+plugin.securityconfig.masterpassword.TITLE=密碼
+plugin.securityconfig.masterpassword.CHANGE_MASTER_PASSWORD=修改主控密碼...
+plugin.securityconfig.masterpassword.USE_MASTER_PASSWORD=使用主控密碼
+plugin.securityconfig.masterpassword.SAVED_PASSWORDS=已儲存的密碼...
+plugin.securityconfig.masterpassword.INFO_TEXT=主控密碼是用來保護您儲存的帳號密碼。請務必牢記它。
+plugin.securityconfig.masterpassword.CURRENT_PASSWORD=目前密碼：
+plugin.securityconfig.masterpassword.ENTER_PASSWORD=輸入新密碼：
+plugin.securityconfig.masterpassword.REENTER_PASSWORD=再輸入一次新密碼：
+plugin.securityconfig.masterpassword.MP_TITLE=主控密碼
+plugin.securityconfig.masterpassword.MP_CURRENT_EMPTY=您輸入的主控密碼錯誤。請重試。
+plugin.securityconfig.masterpassword.MP_VERIFICATION_FAILURE_MSG=主控密碼不正確！
+plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE=密碼變更失敗
+plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS=已成功變更密碼
+plugin.securityconfig.masterpassword.MP_CHANGE_SUCCESS_MSG=已成功變更主控密碼。
+plugin.securityconfig.masterpassword.MP_CHANGE_FAILURE_MSG=無法用您提供的主控密碼解開加密的密碼。\n已儲存的密碼可能已被改動。
+plugin.securityconfig.masterpassword.MP_REMOVE_FAILURE=密碼刪除失敗
+plugin.securityconfig.masterpassword.MP_REMOVE_SUCCESS=已成功刪除密碼
+plugin.securityconfig.masterpassword.MP_REMOVE_SUCCESS_MSG=您已成功刪除主控密碼。
+plugin.securityconfig.masterpassword.COL_TYPE=類型
+plugin.securityconfig.masterpassword.COL_NAME=名稱
+plugin.securityconfig.masterpassword.COL_PASSWORD=密碼
+plugin.securityconfig.masterpassword.PROTOCOL_UNKNOWN=(未知)
+plugin.securityconfig.masterpassword.CANNOT_DECRYPT=(無法解密)
+plugin.securityconfig.masterpassword.STORED_ACCOUNT_PASSWORDS=儲存的密碼
+plugin.securityconfig.masterpassword.REMOVE_ALL_PASSWORDS_BUTTON=全部刪除
+plugin.securityconfig.masterpassword.REMOVE_ALL_CONFIRMATION=您確定要刪除所有密碼嗎？
+plugin.securityconfig.masterpassword.REMOVE_ALL_TITLE=刪除所有密碼
+plugin.securityconfig.masterpassword.SHOW_PASSWORDS_BUTTON=顯示密碼
+plugin.securityconfig.masterpassword.HIDE_PASSWORDS_BUTTON=隱藏密碼
+plugin.securityconfig.masterpassword.PASSWORD_QUALITY_METER=密碼強度
+plugin.securityconfig.masterpassword.MP_INPUT=請輸入主控密碼：\n\n
 
 # otr plugin
+plugin.otr.menu.TITLE=密談
+plugin.otr.menu.START_OTR=開始私密對話
+plugin.otr.menu.END_OTR=結束私密對話
+plugin.otr.menu.FINISHED=您的好友已結束了與您的私密對話。您也應該這麼做。
+plugin.otr.menu.VERIFIED=您的私密對話已被確認
+plugin.otr.menu.UNVERIFIED=您的私密對話未被確認。請為您的好友進行身份驗證。
+plugin.otr.menu.LOADING_OTR=開始私密對話...
+plugin.otr.menu.TIMED_OUT=啟動私密對話逾時。
+plugin.otr.menu.REFRESH_OTR=刷新私密對話
+plugin.otr.menu.AUTHENTICATE_BUDDY=好友身份驗證
+plugin.otr.menu.WHATS_THIS=這是什麼
+plugin.otr.menu.CB_AUTO=自動發起與 {0} 的私密對話
+plugin.otr.menu.CB_AUTO_ALL=自動建立與所有人的私密對話
+plugin.otr.menu.CB_ENABLE=允許私密對話
+plugin.otr.menu.CB_REQUIRE=私密對話邀請
+plugin.otr.menu.CB_RESET=重置
+plugin.otr.menu.OTR_TOOLTIP=使用 OTR 的私密對話
+plugin.otr.authbuddydialog.HELP_URI=https://jitsi.org/GSOC2009/OTR
+plugin.otr.authbuddydialog.AUTHENTICATION_INFO=驗證好友能夠確保對方的真實身份。
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD=您希望如何進行身份驗證？
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_QUESTION=以問答題進行身份驗證
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_SECRET=以共享密碼進行身份驗證
+plugin.otr.authbuddydialog.AUTHENTICATION_METHOD_FINGERPRINT=以數位指紋進行身份驗證
+plugin.otr.authbuddydialog.AUTHENTICATION_FINGERPRINT=為了驗證數位指紋，您需要通過其他途徑聯絡您的好友，例如電話或由 GPG 驗證的電子郵件，告知對方您的數位指紋字串。如果字串相符，請在後續的對話中選擇接受此數位指紋驗證。
+plugin.otr.authbuddydialog.LOCAL_FINGERPRINT=您 ({0}) 的數位指紋：{1}
+plugin.otr.authbuddydialog.REMOTE_FINGERPRINT={0} 的數位指紋：{1}
+plugin.otr.authbuddydialog.AUTH_BY_QUESTION_INFO_INIT=若希望以問答題來進行身份驗證，您需要設定一組只有您和您的好友才知道答案的問題。若您的答案與對方提出的問題不相符，您的真實身份將被質疑。
+plugin.otr.authbuddydialog.AUTH_BY_SECRET_INFO_INIT=若希望以共享密碼進行身份驗證，您需要設定一組只有您和您的好友才知道的密碼。若您輸入的密碼與對方設定的密碼不相符，您的真實身份將被質疑。
+plugin.otr.authbuddydialog.AUTH_BY_SECRET_INFO_RESPOND=您的好友向您提出一個問題以確認您的真實身份。若要通過身份驗證，請輸入您的答案。
+plugin.otr.authbuddydialog.SHARED_SECRET=輸入您們的共享密碼：
+plugin.otr.authbuddydialog.QUESTION_RESPOND=您的好友問您：
+plugin.otr.authbuddydialog.QUESTION_INIT=在此輸入您的問題：
+plugin.otr.authbuddydialog.ANSWER=在此輸入您的答案 (英文字母區分大小寫)：
+plugin.otr.authbuddydialog.AUTHENTICATION_FROM=來自 {0} 的身份驗證。
+plugin.otr.authbuddydialog.CANCEL=取消
+plugin.otr.authbuddydialog.HELP=求助
+plugin.otr.authbuddydialog.TITLE=好友身份驗證
+plugin.otr.authbuddydialog.AUTHENTICATE_BUDDY=驗證好友身份
+plugin.otr.authbuddydialog.I_HAVE=我已經
+plugin.otr.authbuddydialog.I_HAVE_NOT=我還沒有
+plugin.otr.authbuddydialog.VERIFY_ACTION=驗證了 {0} 的數位指紋正確性。
+plugin.otr.authbuddydialog.FINGERPRINT_CHECK=請輸入從 {0} 收到的數位指紋。
+plugin.otr.smpprogressdialog.TITLE=身份驗證進度
+plugin.otr.smpprogressdialog.AUTHENTICATION_SUCCESS=身份驗證成功！
+plugin.otr.smpprogressdialog.AUTHENTICATION_FAIL=身份驗證失敗！
+plugin.otr.configform.MY_PRIVATE_KEYS=我的私密金鑰
+plugin.otr.configform.KNOWN_FINGERPRINTS=已知的數位指紋
+plugin.otr.configform.CB_AUTO=自動啟動私密對話
+plugin.otr.configform.CB_ENABLE=允許私密對話
+plugin.otr.configform.CB_REQUIRE=邀請私密對話
+plugin.otr.configform.NO_KEY_PRESENT=金鑰不存在
+plugin.otr.configform.GENERATE=產生
+plugin.otr.configform.REGENERATE=重新產生
+plugin.otr.configform.FINGERPRINT=數位指紋
+plugin.otr.configform.VERIFY_FINGERPRINT=確認數位指紋
+plugin.otr.configform.FORGET_FINGERPRINT=不要記住數位指紋
+plugin.otr.configform.COLUMN_NAME_CONTACT=聯絡人
+plugin.otr.configform.COLUMN_NAME_VERIFIED_STATUS=已驗證
+plugin.otr.configform.COLUMN_VALUE_VERIFIED_TRUE=是
+plugin.otr.configform.COLUMN_VALUE_VERIFIED_FALSE=否
+plugin.otr.activator.unverifiedsessionwarning={0} 透過來路不明的電腦與您通話。建議您<A href="jitsi://{1}/{2}?{3}">對 {0} 進行身份驗證</a>。
+plugin.otr.activator.unverifiedsessionstared=與 {0} 的<b>未驗證</b>的私密對話開始。
+plugin.otr.activator.sessionstared=已開始和 {0} 的私密對話
+plugin.otr.activator.sessionfinished={0} 已經結束了和您的私密對話；您也應該這樣做。
+plugin.otr.activator.sessionlost=與 {0} 的私密對話已中斷。
+plugin.otr.activator.historyon=正在記錄您與 {0} 的對話內容。您可以<A href="jitsi://{1}/{2}">在此關閉聊天紀錄</a>。
+plugin.otr.activator.historyoff=您與 {0} 的對話內容沒有記錄。您可以<A href="jitsi://{1}/{2}">啟用聊天紀錄</a>。
+plugin.otr.activator.sessionfinishederror=您的訊息 "{0}" 未送出。請結束與 {1} 的私密對話。
+plugin.otr.activator.smpaborted={0} 已經終止了身份驗證程序。
+plugin.otr.activator.smperror=在身份驗證過程中出現了一個錯誤。
+plugin.otr.activator.unencryptedmsgreceived=收到的訊息是未經加密的。
+plugin.otr.activator.unreadablemsgreceived={0} 發送給您一條無法讀取的加密訊息。
+plugin.otr.activator.requireencryption=您的訊息 "{0}" 未送出。需要啟動私密對話。
+plugin.otr.activator.unreadablemsgreply=您發送給 {0} 的加密訊息無法被讀取。請關閉與 {1} 的私密對話或刷新對話。
+plugin.otr.activator.fallbackmessage=<span style="font-weight: bold;">{0} 正試圖發起一個加密的<a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">私密對話</a>。 然而您的軟體不支援私密對話。 請參閱：<a href="http://en.wikipedia.org/wiki/Off-the-Record_Messaging">http://en.wikipedia.org/wiki/Off-the-Record_Messaging</a></span>
+plugin.otr.activator.multipleinstancesdetected=您的好友 {0} 重複登入並且建立了多組私密對話。您可以從下列清單當中選擇其中一組。
+plugin.otr.activator.msgfromanotherinstance={0} 發送給您一條被用於另一對話的訊息。若您重複登入，這條訊息會在另一對話收到。
 
 # global proxy plugin
+plugin.globalproxy.GLOBAL_PROXY_CONFIG=全域代理設定
+plugin.globalproxy.PROXY_TYPE=代理類型
+plugin.globalproxy.PROXY_ADDRESS=代理伺服器
+plugin.globalproxy.PROXY_PORT=代理通訊埠
+plugin.globalproxy.PROXY_USERNAME=代理使用者名稱
+plugin.globalproxy.PROXY_PASSWORD=代理密碼
+plugin.globalproxy.DESCRIPTION={0} 將對所有網路連接套用以上代理設定。\n目前對代理的支援尚處於試驗階段，並且只支援部分通訊協定。詳情請參閱下表：
 #plugin.globalproxy.PROTOCOL_SUPPORT
+plugin.globalproxy.FWD_DNS=同時代理 DNS
+plugin.globalproxy.FWD_DNS_NOTE=經由 Tor 的代理功能，可協助避免 DNS 洩漏您的行蹤。這項服務需要重新啟動程式。
+plugin.globalproxy.FWD_DNS_ADDR=DNS 代理地址
+plugin.globalproxy.FWD_DNS_PORT=DNS 代理通訊埠
 
 # plugin reconnect
+plugin.reconnectplugin.CONNECTION_FAILED_MSG=使用者 {0} 登入 {1} 伺服器失敗！\n請檢查您的系統設定或尋求網路管理員協助。
+plugin.reconnectplugin.NETWORK_DOWN=網路連接已中斷！
 
 
 #plugin chat config
 
+plugin.chatconfig.TITLE=聊天
+plugin.chatconfig.replacement.TITLE=圖片/視訊：
+plugin.chatconfig.replacement.ENABLE_SMILEY_STATUS=允許插入表情
+plugin.chatconfig.replacement.REPLACEMENT_TITLE=替換圖像和視訊
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_STATUS=啟用
+plugin.chatconfig.replacement.ENABLE_REPLACEMENT_PROPOSAL=禁用（顯示預覽鏈接）
+plugin.chatconfig.replacement.DISABLE_REPLACEMENT=禁用
+plugin.chatconfig.replacement.CONFIGURE_REPLACEMENT=圖像和視訊替換設定選項更改
+plugin.chatconfig.replacement.REPLACEMENT_SOURCES=來源：
+plugin.chatconfig.spellcheck.TITLE=拼字檢查
 
 #provisioning plugin
+plugin.provisioning.PROVISIONING=網路服務
+plugin.provisioning.ENABLE_DISABLE=允許提供網路服務
+plugin.provisioning.AUTO=自動偵測預置服務網址 (URI)
+plugin.provisioning.DHCP=DHCP
+plugin.provisioning.DNS=DNS
+plugin.provisioning.BONJOUR=Bonjour
+plugin.provisioning.MANUAL=手動指定預置服務網址 (URI)
+plugin.provisioning.URI=網址 (URI)
+plugin.provisioning.RESTART_WARNING=請注意：所有的變更需要在下次啟動 {0} 後才會生效！
+plugin.provisioning.UUID=UUID
+plugin.provisioning.COPYTOCLIPBOARD=複製 UUID 到剪貼簿
+plugin.provisioning.CLIPBOARD_FAILED=複製 UUID 到剪貼簿失敗
+plugin.provisioning.CREDENTIALS=最後存儲的預置證書
+plugin.provisioning.REMOVE_CREDENTIALS_MESSAGE=確定要刪除預置的密碼嗎？
+plugin.provisioning.PROV_FAILED=預置失敗
+plugin.provisioning.PROV_FAILED_MSG=<html>{0} 預置失敗！<br>請稍後再試，或聯絡管理員。</html>
+plugin.provisioning.FORGET_PASSWORD=忘記密碼
 
 # packet logging service
+plugin.loggingutils.PACKET_LOGGING_CONFIG=記錄
+plugin.loggingutils.ENABLE_DISABLE=啟用紀錄包裹
+plugin.loggingutils.PACKET_LOGGING_RTP=RTP
+plugin.loggingutils.PACKET_LOGGING_RTP_DESCRIPTION=(每5000 條紀錄儲存成一個包裹)
+plugin.loggingutils.PACKET_LOGGING_ICE4J=ice4j.org
+plugin.loggingutils.PACKET_LOGGING_DESCRIPTION=<html>使用 PCAP (tcpdump/wireshark) 格式，將各種<br>通訊協定的除錯紀錄包裹存放到紀錄資料夾。</html>
+plugin.loggingutils.PACKET_LOGGING_FILE_COUNT=紀錄檔檔案數目
+plugin.loggingutils.PACKET_LOGGING_FILE_SIZE=最大的紀錄檔檔案大小 (單位：KB)
+plugin.loggingutils.ARCHIVE_BUTTON=將紀錄檔封存
+plugin.loggingutils.UPLOAD_LOGS_BUTTON=將紀錄檔上傳
+plugin.loggingutils.UPLOAD_BUTTON=上傳
+plugin.loggingutils.ARCHIVE_FILECHOOSE_TITLE=選擇檔案
+plugin.loggingutils.ARCHIVE_UPREPORT_EMAIL=johnsmith@email.com
+plugin.loggingutils.ARCHIVE_MESSAGE_OK=紀錄檔封存成功\n{0}
+plugin.loggingutils.ARCHIVE_MESSAGE_NOTOK=紀錄檔封存錯誤 \n{0}
 
 # dns config plugin
+plugin.dnsconfig.TITLE=DNS
+plugin.dnsconfig.DNSSEC=安全DNS(DNSSEC)
+plugin.dnsconfig.PARALLEL_DNS=DNS平行解析
+plugin.dnsconfig.border.TITLE=備用解析器
+plugin.dnsconfig.chkBackupDnsEnabled.text=允許 DNS 平行解析
+plugin.dnsconfig.lblBackupResolver.text=主機名稱
+plugin.dnsconfig.lblBackupResolverFallbackIP.text=備用IP
+plugin.dnsconfig.lblBackupPort.text=通訊埠
+plugin.dnsconfig.lblRedemption.text=切換回主解析器
+plugin.dnsconfig.lblRedemption.description=<html>在我們停用備用解析器之前，主解析器必須返回的迅速回應次數。</html>
+plugin.dnsconfig.lblPatience.text=啟用備用解析器
+plugin.dnsconfig.lblPatience.description=<html>啟用備用解析器之前最長等待主DNS回應時間(毫秒)</html>
+plugin.dnsconfig.dnssec.chkEnabled=啟用DNSSEC解析器
+plugin.dnsconfig.dnssec.lblDefault=預設行為
+plugin.dnsconfig.dnssec.chkAbsolute=處理所有域名為絕對值
+plugin.dnsconfig.dnssec.lblNameservers=自定義名稱伺服器
+plugin.dnsconfig.dnssec.lblNameserversHint=<html>多個伺服器可以用逗號分隔，e.g. 149.20.64.20, 149.20.64.21 (OARC的公開DNSSEC驗證解析伺服器)</html>
+plugin.dnsconfig.dnssec.DOMAIN_NAME=域
+plugin.dnsconfig.dnssec.MODE=行為
+plugin.dnsconfig.dnssec.ENABLE_FAILED=狀態變更失敗
+plugin.dnsconfig.dnssec.ENABLE_FAILED_MSG=變更DNSSEC啟用狀態失敗。
+plugin.dnsconfig.dnssec.RESTART_WARNING=<html>注意因啟用或禁用DNSSEC而禁用平行解析器會在下次啟動 {0} 時生效。</html>
+net.java.sip.communicator.util.dns.SecureResolveMode.IgnoreDnssec=略過
+net.java.sip.communicator.util.dns.SecureResolveMode.SecureOnly=必需
+net.java.sip.communicator.util.dns.SecureResolveMode.SecureOrUnsigned=簽名區需求
+net.java.sip.communicator.util.dns.SecureResolveMode.WarnIfBogus=輪詢偽回複
+net.java.sip.communicator.util.dns.SecureResolveMode.WarnIfBogusOrUnsigned=輪詢未簽名的或虛假回複
+util.dns.INSECURE_ANSWER_TITLE=DNSSEC失敗
+util.dns.INSECURE_ANSWER_MESSAGE_NO_REASON=DNS對 {0} 應答是非安全的。
+util.dns.INSECURE_ANSWER_MESSAGE_REASON=DNS應答 {0} 是不安全的。\n原因： {1}
+util.dns.DNSSEC_ADVANCED_OPTIONS=顯示進階選項
+util.dns.DNSSEC_ADVANCED_REASON_BOGUS=<html>DNSSEC簽名區 {0} 返回無效數據。<br>{1}</html>
+util.dns.DNSSEC_ADVANCED_REASON_UNSIGNED=為 {1} 執行的 {0} 查詢是未簽名的。
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Accept=總是接受
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.AlwaysAccept=總是接受
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.Deny=拒絕
+net.java.sip.communicator.util.dns.ConfigurableDnssecResolver$DnssecDialogResult.AlwaysDeny=總是拒絕
+util.dns.DNSSEC_WARNING=<html><div width="600">{0} 已試圖連接位於<b>{1}</b>的伺服器，此域由DNSSEC提供強安全防護。 {0} 從DNS伺服器處獲取的訊息同此域DNSSEC提供的訊息不符。<br><br><b>此問題一般不會發生，除非 {1} 處發生非常嚴重的錯誤。 它有力的表明您的網路連接可信度發生嚴重問題。</b> <br><br>如果您正在使用某些網路(例如WiFi熱點)或基於特殊原因不再信任您的互聯網服務提供商，我們強烈建議您立即停止使用並尋找一個可信的替代互聯網接入點。當您安全的接入另一個網路，此問題會自動消除。如非上述原因，請聯絡您的服務提供商並告知他們有關問題。</div></html>
 
 #plugin spellcheck
-
+plugin.spellcheck.TITLE=拼寫和語法檢查
+plugin.spellcheck.MENU=顯示拼寫和語法
+plugin.spellcheck.ENABLE_SPELL_CHECK=啟用拼寫檢查
+plugin.spellcheck.dialog.FIND=查找下一個
+plugin.spellcheck.dialog.REPLACE=替換 
+plugin.spellcheck.dialog.ADD=新增單詞
+plugin.spellcheck.DICT_ERROR_TITLE=切換字典錯誤
+plugin.spellcheck.DICT_ERROR=無法切換字典
+plugin.spellcheck.DICT_RETRIEVE_ERROR=字典無法被獲取自
+plugin.spellcheck.DICT_PROCESS_ERROR=本地未識別
+plugin.spellcheck.UNINSTALL_DICTIONARY=卸載
+plugin.spellcheck.DICT_ERROR_DELETE_TITLE=卸載字典時發生錯誤
+plugin.spellcheck.DICT_ERROR_DELETE=無法卸載字典
+plugin.spellcheck.SPELLCHECK=拼寫檢查
+
+plugin.contactsourceconfig.CONTACT_SOURCE_TITLE=聯絡源
 
 #Certificate configuration plugin
+plugin.certconfig.TITLE=TLS設定
+plugin.certconfig.TRUSTSTORE_CONFIG=受信任的根證書源
+plugin.certconfig.JAVA_TRUSTSTORE=Java
+plugin.certconfig.WINDOWS_TRUSTSTORE=Windows
+plugin.certconfig.CERT_LIST_TITLE=TLS 客戶端身份驗證設定
+plugin.certconfig.CERT_LIST_DESCRIPTION=<html><body>這裡的設定可以被用作帳號設定中的客戶端 TLS 證書 (亦即用 SIP 提供的身份驗證憑證替代使用者名稱和密碼驗證)。</body></html>
+plugin.certconfig.ALIAS=密鑰庫中的別名稱
+plugin.certconfig.KEYSTORE_TYPE=類型
+plugin.certconfig.EDIT_ENTRY=編輯TLS客戶端證書設定
+plugin.certconfig.KEYSTORE=檔案
+plugin.certconfig.KEYSTORE_PASSWORD=密碼
+plugin.certconfig.INCOMPLETE=請為所有字段錄入值
+plugin.certconfig.SHOW_CERT_EXCEPTION=證書不可顯示({0})。
+plugin.certconfig.KEYSTORE_EXCEPTION=無法加載密鑰庫({0})。
+plugin.certconfig.FILE_TYPE_DESCRIPTION=證書存儲(PKCS#11 模式，PKCS#12檔案，Java ks 密鑰庫)
+plugin.certconfig.ALIAS_LOAD_EXCEPTION=無法從密鑰庫獲取別名({0})。
+plugin.certconfig.INVALID_KEYSTORE_TYPE=勾選的密鑰庫類型可能不可用({0})。
+plugin.certconfig.BROWSE_KEYSTORE=開啟密鑰庫
+plugin.certconfig.REVOCATION_TITLE=證書吊銷選項
+plugin.certconfig.REVOCATION_CHECK_ENABLED=啟用CRL(證書吊銷列表)
+plugin.certconfig.REVOCATION_OCSP_ENABLED=啟用OCSP(在線證書狀態通訊協定)
 
 # Phone number contact source plugin
+plugin.phonenumbercontactsource.DISPLAY_NAME=電話號碼
 
 # properties editor
+plugin.propertieseditor.TITLE=屬性編輯器
+plugin.propertieseditor.NEW_PROPERTY_TITLE=增加新屬性
+plugin.propertieseditor.CHECK_BOX=下次顯示此警告
+plugin.propertieseditor.DESCRIPTION=下列按鈕允許修改Jitsi性能設定。改變這些進階設定可能會妨害程式的穩定性，安全性和性能。如果您確信已了解您的變更，請繼續。
+plugin.propertieseditor.IM_AWARE=我了解相關的風險
+plugin.propertieseditor.NEED_RESTART=注意：某些屬性需要重新啟動，新設定才會生效。
 
 #Thunderbird address book plugin
+plugin.thunderbird.CONFIG_FORM_TITLE=Thunderbird
+plugin.thunderbird.ENABLED=已啟用
+plugin.thunderbird.PHONE_PREFIX=電話區碼: