summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/kopete/index.docbook2
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui6
-rw-r--r--kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui6
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/kopete/index.docbook b/doc/kopete/index.docbook
index 82ed8d31..99893923 100644
--- a/doc/kopete/index.docbook
+++ b/doc/kopete/index.docbook
@@ -715,7 +715,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
<sect2 id="protocols-gtalk">
<title>Google Talk</title>
<para>Since Google Talk is based upon Jabber, it is well supported in &kopete; with the exception of voice chat, which is worked upon.</para>
- <para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name. Check <guilabel>Use protocol encryption (SSL)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>. The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
+ <para>To configure &kopete; for Google Talk: Use your complete Google Mail address as the user name. Check <guilabel>Use old style SSL encryption protocol (not recommended)</guilabel>, <guilabel>Allow plain-text password authentication</guilabel> and <guilabel>Override default server information</guilabel>. The server is <quote>talk.google.com</quote> or <quote>gmail.com</quote> and ports 443 or 5223 should be used.</para>
</sect2>
<sect2 id="protocols-groupwise">
<title>Novell GroupWise</title>
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
index 5a13dbd9..cab16996 100644
--- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
+++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
@@ -279,13 +279,13 @@
<cstring>cbUseSSL</cstring>
</property>
<property name="text">
- <string>Use protocol encr&amp;yption (SSL)</string>
+ <string>Use old style SSL encr&amp;yption protocol (not recommended)</string>
</property>
<property name="toolTip" stdset="0">
- <string>Check this box to enable SSL encrypted communication with the server.</string>
+ <string>Check this box to enable the old style SSL encrypted communication with the server. This is not recommended and only works on very old servers.</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string>
+ <string>Check this box to enable the old style SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server. This is not recommended and only works on very old servers.</string>
</property>
</widget>
<widget class="TQLabel">
diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
index 3133542d..9ed63b24 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
@@ -119,16 +119,16 @@
</sizepolicy>
</property>
<property name="text">
- <string>Use protocol encr&amp;yption (SSL)</string>
+ <string>Use old style SSL encr&amp;yption protocol (not recommended)</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="toolTip" stdset="0">
- <string>Check this box to enable SSL encrypted communication with the server.</string>
+ <string>Check this box to enable the old style SSL encrypted communication with the server. This is not recommended and only works on very old servers.</string>
</property>
<property name="whatsThis" stdset="0">
- <string>Check this box to enable SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server.</string>
+ <string>Check this box to enable the old style SSL encrypted communication with the server. Note that this is not end-to-end encryption, but rather encrypted communication with the server. This is not recommended and only works on very old servers.</string>
</property>
</widget>
<widget class="TQLabel" row="1" column="0">