10 files changed, 37 insertions, 4 deletions
diff --git a/resources/colors/colors.properties b/resources/colors/colors.properties
index c8b6f44..54e6e9c 100644
--- a/resources/colors/colors.properties
+++ b/resources/colors/colors.properties
@@ -203,4 +203,13 @@ service.gui.SEARCH_BORDER_GRADIENT=ACACAC
 service.gui.SEARCH_FOREGROUND=000000
 
 # The default text foreground of the search field
-service.gui.SEARCH_DEFAULT_FOREGROUND=ACACAC
-\ No newline at end of file
+service.gui.SEARCH_DEFAULT_FOREGROUND=ACACAC
+
+# The security on status color.
+service.gui.SECURITY_ON=6FC93C
+
+# The security off status color.
+service.gui.SECURITY_OFF=ED0000
+
+# Going secure status color.
+service.gui.GOING_SECURE=FFC01B
+\ No newline at end of file
diff --git a/resources/config/defaults.properties b/resources/config/defaults.properties
index 8b285b5..51ea8c0 100644
--- a/resources/config/defaults.properties
+++ b/resources/config/defaults.properties
@@ -89,3 +89,5 @@ net.java.sip.communicator.util.dns.DS_ROOT.1=. IN DS 19036 8 2 49AAC11D7B6F64467
 plugin.jabberaccregwizz.NEW_ACCOUNT_DEFAULT_SERVER=jit.si
 
 net.java.sip.communicator.service.neomedia.SDES_CIPHER_SUITES=AES_CM_128_HMAC_SHA1_80,AES_CM_128_HMAC_SHA1_32
+
+impl.gui.PARANOIA_UI=false
+\ No newline at end of file
diff --git a/resources/images/impl/gui/buttons/encrypted_verified.png b/resources/images/impl/gui/buttons/encrypted_verified.png
index d5ba163..c9fd25f 100755
--- a/resources/images/impl/gui/buttons/encrypted_verified.png
+++ b/resources/images/impl/gui/buttons/encrypted_verified.png
diff --git a/resources/images/impl/gui/buttons/goingSecureAudio.png b/resources/images/impl/gui/buttons/goingSecureAudio.png
new file mode 100644
index 0000000..6e019bb
--- /dev/null
+++ b/resources/images/impl/gui/buttons/goingSecureAudio.png
diff --git a/resources/images/impl/gui/buttons/goingSecureVideo.png b/resources/images/impl/gui/buttons/goingSecureVideo.png
new file mode 100644
index 0000000..9e610a6
--- /dev/null
+++ b/resources/images/impl/gui/buttons/goingSecureVideo.png
diff --git a/resources/images/impl/gui/buttons/secureAudioOff.png b/resources/images/impl/gui/buttons/secureAudioOff.png
index 201e782..d32800c 100644
--- a/resources/images/impl/gui/buttons/secureAudioOff.png
+++ b/resources/images/impl/gui/buttons/secureAudioOff.png
diff --git a/resources/images/impl/gui/buttons/secureAudioOn.png b/resources/images/impl/gui/buttons/secureAudioOn.png
index 7bbbb51..c408c4f 100644
--- a/resources/images/impl/gui/buttons/secureAudioOn.png
+++ b/resources/images/impl/gui/buttons/secureAudioOn.png
diff --git a/resources/images/impl/gui/buttons/secureVideoOff.png b/resources/images/impl/gui/buttons/secureVideoOff.png
index 546aaad..d4d144b 100644
--- a/resources/images/impl/gui/buttons/secureVideoOff.png
+++ b/resources/images/impl/gui/buttons/secureVideoOff.png
diff --git a/resources/images/impl/gui/buttons/secureVideoOn.png b/resources/images/impl/gui/buttons/secureVideoOn.png
index 489784b..4f020a6 100644
--- a/resources/images/impl/gui/buttons/secureVideoOn.png
+++ b/resources/images/impl/gui/buttons/secureVideoOn.png
diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 80f467c..934f590 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -120,12 +120,11 @@ service.gui.CHAT_ROOM_SUBJECT_CHANGED={0} has changed the subject to {1}
 service.gui.CHOOSE_CONTACT=Choose contact
 service.gui.CHOOSE_ACCOUNT=Please select one of the listed accounts.
 service.gui.SHOW_MORE_TOOLTIP=Click to show more results
+servoce.gui.CLEAR=Clear
 service.gui.CLOSE=Cl&ose
 service.gui.CLOSE_CHAT_AFTER_NEW_MESSAGE=You have received a new message less than 2 seconds ago. Are you sure you want to close this chat?
 service.gui.CLOSE_CHAT_ACTIVE_FILE_TRANSFER=You have active file transfers. Are you sure you want to cancel them?
-service.gui.COMPARE_WITH_PARTNER=Compare with partner and click the padlock to confirm.
-# keep the following string short
-service.gui.COMPARE_WITH_PARTNER_SHORT=Compare with partner: {0}
+servoce.gui.CONFIRM=Confirm
 service.gui.CONNECTED_STATUS=Connected
 service.gui.CONNECTING=Connecting...
 service.gui.CONNECTING_STATUS=Connecting
@@ -611,6 +610,29 @@ service.gui.AUTO_ANSWER_DESCR_VLUE=leave empty for any
 service.gui.AUTO_ANSWER_FWD_CALLS=Forward Calls
 service.gui.AUTO_ANSWER_FWD_CALLS_TO=Forward all calls to the following number or URI:
 
+service.gui.security.SECURE_AUDIO=Secure audio
+service.gui.security.AUDIO_NOT_SECURED=Audio not secured
+service.gui.security.SECURE_VIDEO=Secure video
+service.gui.security.VIDEO_NOT_SECURED=Video not secured
+service.gui.security.NO_VIDEO=No video
+service.gui.security.CIPHER=Cipher: {0}
+service.gui.security.CALL_SECURED_TOOLTIP=Call secured. Fore more information press here.
+service.gui.security.CALL_NOT_SECURED_TOOLTIP=Call not secured. Fore more information press here.
+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!
+service.gui.security.SAS_INFO_TOOLTIP=\
+<html>In order to be completely secured you<br/>\
+need to verbally <b>compare</b> the short<br/>\
+authentication string here left with your<br/>\
+partner and press the confirm button when the <br/>\
+string is verified.<br/><br/\
+If you clear the confirmation, you'll be asked to verify<br/>\
+next time when you call this partner.</html>
+service.gui.security.SECURITY_ALERT=Trying to secure call. Will disconnect in
+
 service.gui.avatar.CHOOSE_ICON=Choose picture
 service.gui.avatar.REMOVE_ICON=Remove current picture
 service.gui.avatar.CLEAR_RECENT=Clear recent pictures