Mercurial Repositories > eric / changeset
changeset
Added code to indicate invalid SSL certificates in the URL entry and the SSL info dialog.
Tue, 27 Sep 2011 19:03:52 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 27 Sep 2011 19:03:52 +0200
- changeset 1341
- 6104ae9ceb55
- parent 1339
- 913182fdc3dd
- child 1342
- 30226d5a7ffb
Added code to indicate invalid SSL certificates in the URL entry and the SSL info dialog.
--- a/Helpviewer/SslInfoDialog.py Mon Sep 26 18:07:55 2011 +0200 +++ b/Helpviewer/SslInfoDialog.py Tue Sep 27 19:03:52 2011 +0200 @@ -7,7 +7,7 @@ Module implementing a dialog to show SSL certificate infos. """ -from PyQt4.QtCore import QCryptographicHash +from PyQt4.QtCore import QCryptographicHash, QDateTime from PyQt4.QtGui import QDialog from PyQt4.QtNetwork import QSslCertificate @@ -30,6 +30,13 @@ super().__init__(parent) self.setupUi(self) + self.blacklistedLabel.setVisible(False) + self.blacklistedLabel.setStyleSheet( + "QLabel { color : white; background-color : red; }") + self.expiredLabel.setVisible(False) + self.expiredLabel.setStyleSheet( + "QLabel { color : white; background-color : red; }") + self.subjectCommonNameLabel.setText(self.__certificateString( certificate.subjectInfo(QSslCertificate.CommonName))) self.subjectOrganizationLabel.setText(self.__certificateString( @@ -49,6 +56,13 @@ str(certificate.digest(QCryptographicHash.Sha1).toHex(), encoding="ascii"))) self.md5Label.setText(self.__formatHexString( str(certificate.digest(QCryptographicHash.Md5).toHex(), encoding="ascii"))) + + if not certificate.isValid(): + # something is wrong; indicate it to the user + if self.__hasExpired(certificate.effectiveDate(), certificate.expiryDate()): + self.expiredLabel.setVisible(True) + else: + self.blacklistedLabel.setVisible(True) def __certificateString(self, txt): """ @@ -78,7 +92,7 @@ else: hexString = hex(int(serial))[2:] return self.__formatHexString(hexString) - + def __formatHexString(self, hexString): """ Private method to format a hex string for display. @@ -97,3 +111,15 @@ hexString = hexString[2:] return ':'.join(hexList) + + def __hasExpired(self, effectiveDate, expiryDate): + """ + Private method to check for a certificate expiration. + + @param effectiveDate date the certificate becomes effective (QDateTime) + @param expiryDate date the certificate expires (QDateTime) + @return flag indicating the expiration status (boolean) + """ + now = QDateTime.currentDateTime() + + return now < effectiveDate or now >= expiryDate
--- a/Helpviewer/SslInfoDialog.ui Mon Sep 26 18:07:55 2011 +0200 +++ b/Helpviewer/SslInfoDialog.ui Tue Sep 27 19:03:52 2011 +0200 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>556</width> - <height>337</height> + <height>385</height> </rect> </property> <property name="windowTitle"> @@ -19,24 +19,28 @@ <layout class="QVBoxLayout" name="verticalLayout"> <item> <layout class="QGridLayout" name="gridLayout"> - <property name="horizontalSpacing"> - <number>15</number> - </property> <item row="0" column="0" colspan="2"> + <widget class="QLabel" name="blacklistedLabel"> + <property name="text"> + <string>This certificated has been blacklisted.</string> + </property> + </widget> + </item> + <item row="1" column="0" colspan="2"> <widget class="QLabel" name="label"> <property name="text"> <string><b>Issued for</b></string> </property> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> <widget class="QLabel" name="label_2"> <property name="text"> <string>Common Name (CN)</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="2" column="1"> <widget class="QLabel" name="subjectCommonNameLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -49,14 +53,14 @@ </property> </widget> </item> - <item row="2" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> <string>Organization (O)</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="3" column="1"> <widget class="QLabel" name="subjectOrganizationLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -69,14 +73,14 @@ </property> </widget> </item> - <item row="3" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="label_4"> <property name="text"> <string>Organizational Unit (OU)</string> </property> </widget> </item> - <item row="3" column="1"> + <item row="4" column="1"> <widget class="QLabel" name="subjectOrganizationalUnitLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -89,14 +93,14 @@ </property> </widget> </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QLabel" name="label_5"> <property name="text"> <string>Serialnumber</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="5" column="1"> <widget class="QLabel" name="serialNumberLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -109,21 +113,21 @@ </property> </widget> </item> - <item row="5" column="0" colspan="2"> + <item row="6" column="0" colspan="2"> <widget class="QLabel" name="label_6"> <property name="text"> <string><b>Issued by</b></string> </property> </widget> </item> - <item row="6" column="0"> + <item row="7" column="0"> <widget class="QLabel" name="label_9"> <property name="text"> <string>Common Name (CN)</string> </property> </widget> </item> - <item row="6" column="1"> + <item row="7" column="1"> <widget class="QLabel" name="issuerCommonNameLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -136,14 +140,14 @@ </property> </widget> </item> - <item row="7" column="0"> + <item row="8" column="0"> <widget class="QLabel" name="label_8"> <property name="text"> <string>Organization (O)</string> </property> </widget> </item> - <item row="7" column="1"> + <item row="8" column="1"> <widget class="QLabel" name="issuerOrganizationLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -156,14 +160,14 @@ </property> </widget> </item> - <item row="8" column="0"> + <item row="9" column="0"> <widget class="QLabel" name="label_7"> <property name="text"> <string>Organizational Unit (OU)</string> </property> </widget> </item> - <item row="8" column="1"> + <item row="9" column="1"> <widget class="QLabel" name="issuerOrganizationalUnitLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -176,21 +180,21 @@ </property> </widget> </item> - <item row="9" column="0" colspan="2"> + <item row="10" column="0" colspan="2"> <widget class="QLabel" name="label_10"> <property name="text"> <string><b>Validity</b></string> </property> </widget> </item> - <item row="10" column="0"> + <item row="11" column="0"> <widget class="QLabel" name="label_11"> <property name="text"> <string>Issued on</string> </property> </widget> </item> - <item row="10" column="1"> + <item row="11" column="1"> <widget class="QLabel" name="effectiveLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -203,14 +207,14 @@ </property> </widget> </item> - <item row="11" column="0"> + <item row="12" column="0"> <widget class="QLabel" name="label_12"> <property name="text"> <string>Expires on</string> </property> </widget> </item> - <item row="11" column="1"> + <item row="12" column="1"> <widget class="QLabel" name="expiresLabel"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -223,21 +227,28 @@ </property> </widget> </item> - <item row="12" column="0" colspan="2"> + <item row="13" column="0" colspan="2"> + <widget class="QLabel" name="expiredLabel"> + <property name="text"> + <string>This certificate is not valid yet or has expired.</string> + </property> + </widget> + </item> + <item row="14" column="0" colspan="2"> <widget class="QLabel" name="label_13"> <property name="text"> <string><b>Fingerprints</b></string> </property> </widget> </item> - <item row="13" column="0"> + <item row="15" column="0"> <widget class="QLabel" name="label_14"> <property name="text"> <string>SHA1-Fingerprint</string> </property> </widget> </item> - <item row="13" column="1"> + <item row="15" column="1"> <widget class="QLabel" name="sha1Label"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -250,14 +261,14 @@ </property> </widget> </item> - <item row="14" column="0"> + <item row="16" column="0"> <widget class="QLabel" name="label_15"> <property name="text"> <string>MD5-Fingerprint</string> </property> </widget> </item> - <item row="14" column="1"> + <item row="16" column="1"> <widget class="QLabel" name="md5Label"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
--- a/Helpviewer/UrlBar/SslLabel.py Mon Sep 26 18:07:55 2011 +0200 +++ b/Helpviewer/UrlBar/SslLabel.py Tue Sep 27 19:03:52 2011 +0200 @@ -17,6 +17,9 @@ """ clicked = pyqtSignal() + okStyle = "QLabel { color : white; background-color : green; }" + nokStyle = "QLabel { color : white; background-color : red; }" + def __init__(self, parent=None): """ Constructor @@ -49,3 +52,14 @@ self.clicked.emit() else: super().mouseDoubleClickEvent(evt) + + def setValidity(self, valid): + """ + Public method to set the validity indication. + + @param valid flag indicating the certificate validity (boolean) + """ + if valid: + self.setStyleSheet(SslLabel.okStyle) + else: + self.setStyleSheet(SslLabel.nokStyle)
--- a/Helpviewer/UrlBar/UrlBar.py Mon Sep 26 18:07:55 2011 +0200 +++ b/Helpviewer/UrlBar/UrlBar.py Tue Sep 27 19:03:52 2011 +0200 @@ -56,8 +56,6 @@ self.addWidget(self.__favicon, E5LineEdit.LeftSide) self.__sslLabel = SslLabel(self) - self.__sslLabel.setStyleSheet( - "QLabel { color : white; background-color : green; }") self.addWidget(self.__sslLabel, E5LineEdit.LeftSide) self.__sslLabel.setVisible(False) @@ -159,6 +157,7 @@ org = self.trUtf8("Unknown") self.__sslLabel.setText(" {0} ".format(org)) self.__sslLabel.setVisible(True) + self.__sslLabel.setValidity(sslInfo.isValid()) return self.__sslLabel.setVisible(False)
--- a/changelog Mon Sep 26 18:07:55 2011 +0200 +++ b/changelog Tue Sep 27 19:03:52 2011 +0200 @@ -35,6 +35,8 @@ --- added configuration option to create backup files when reverting changes - enhancements to the web browser -- added the "Do Not Track" feature + -- added code to indicate invalid SSL certificates in the URL entry and the SSL + info dialog Version 5.2-snapshot-20110724: - bug fixes
--- a/i18n/eric5_cs.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_cs.ts Tue Sep 27 19:03:52 2011 +0200 @@ -35276,70 +35276,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -43904,7 +43914,7 @@ <context> <name>UrlBar</name> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation type="unfinished">Neznámý</translation> </message>
--- a/i18n/eric5_de.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_de.ts Tue Sep 27 19:03:52 2011 +0200 @@ -34601,70 +34601,80 @@ <translation>SSL Zertifikat</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation><b>Ausgestellt für</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation>Allgemeiner Name (CN)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation>Organisation (O)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation>Organisationseinheit (OU)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation>Seriennummer</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation><b>Ausgestellt von</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation><b>Gültigkeit</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation>Ausgestellt am</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation>Läuft ab am</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation><b>Fingerabdrücke</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation>SHA1-Fingerabdruck</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation>MD5-Fingerabdruck</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation><kein Teil des Zertifikates></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation>Dieses Zertifikat steht auf der schwarzen Liste.</translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation>Dieses Zertifikat ist noch nicht gültig oder ist abgelaufen.</translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -43240,7 +43250,7 @@ <context> <name>UrlBar</name> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation>Unbekannt</translation> </message>
--- a/i18n/eric5_en.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_en.ts Tue Sep 27 19:03:52 2011 +0200 @@ -34289,70 +34289,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -42800,7 +42810,7 @@ <context> <name>UrlBar</name> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_es.ts Tue Sep 27 19:03:52 2011 +0200 @@ -34850,70 +34850,80 @@ <translation>Información del Certificado SSL</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation><b>Emitido para</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation>Nombre Común (CN)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation>Organización (O)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation>Unidad Organizacional (OU)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation>Número de serie</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation><b>Emitido por</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation><b>Validez</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation>Emitido a</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation>Expira en</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation><b>Fingerprints</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation>SHA1-Fingerprint</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation>MD5-Fingerprint</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation><not part of the certificate></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -43527,7 +43537,7 @@ <translation type="obsolete">Introducir aquí la ubicación.</translation> </message> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation>Desconocido</translation> </message>
--- a/i18n/eric5_fr.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_fr.ts Tue Sep 27 19:03:52 2011 +0200 @@ -37900,70 +37900,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -47302,7 +47312,7 @@ <context> <name>UrlBar</name> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation type="unfinished">Inconnu</translation> </message>
--- a/i18n/eric5_it.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_it.ts Tue Sep 27 19:03:52 2011 +0200 @@ -34763,70 +34763,80 @@ <translation>Informazioni certificato SSL</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation><b>Emesso per</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation>Nome Comune (CN)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation>Organizzazione (O)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation>Organizational Unit (OU)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation>Numero seriale</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation><b>Emesso da</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation><B>Validità</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation>Emesso il</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation>Scade il</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation><b>Fingerprints</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation>SHA1-Fingerprint</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation>MD5-Fingerprint</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation><non parte del certificato></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -43439,7 +43449,7 @@ <translation type="obsolete">Inserisci l'indirizzo qui.</translation> </message> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation>Sconosciuto</translation> </message>
--- a/i18n/eric5_ru.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_ru.ts Tue Sep 27 19:03:52 2011 +0200 @@ -34914,70 +34914,80 @@ <translation>SLL сертификат</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation><b>Выдан для</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation>Общее имя (CN)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation>Организация (O)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation>Организационное подразделение (OU)</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation>Серийный номер</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation><b>Выдан</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation><b>Верен</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation>Дата выдачи</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation>Дата окончания</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation><b>Отпечатки</b></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation>SHA1</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation>MD5</translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation><Не является частью сертификата></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -43614,7 +43624,7 @@ <translation type="obsolete">Задайте адрес.</translation> </message> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation>Неизвестный</translation> </message>
--- a/i18n/eric5_tr.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_tr.ts Tue Sep 27 19:03:52 2011 +0200 @@ -35072,70 +35072,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -43677,7 +43687,7 @@ <translation type="obsolete">Konumunuzu buraya giriniz.</translation> </message> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation>Bilinmeyen</translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon Sep 26 18:07:55 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue Sep 27 19:03:52 2011 +0200 @@ -37864,70 +37864,80 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="28"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="32"/> <source><b>Issued for</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="122"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="126"/> <source>Common Name (CN)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="142"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="146"/> <source>Organization (O)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="162"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="166"/> <source>Organizational Unit (OU)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="95"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="99"/> <source>Serialnumber</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="115"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="119"/> <source><b>Issued by</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="182"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="186"/> <source><b>Validity</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="189"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="193"/> <source>Issued on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="209"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="213"/> <source>Expires on</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="229"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="240"/> <source><b>Fingerprints</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="236"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="247"/> <source>SHA1-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.ui" line="256"/> + <location filename="Helpviewer/SslInfoDialog.ui" line="267"/> <source>MD5-Fingerprint</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/SslInfoDialog.py" line="74"/> + <location filename="Helpviewer/SslInfoDialog.py" line="88"/> <source><not part of the certificate></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="25"/> + <source>This certificated has been blacklisted.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/SslInfoDialog.ui" line="233"/> + <source>This certificate is not valid yet or has expired.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>StartCoverageDialog</name> @@ -47272,7 +47282,7 @@ <context> <name>UrlBar</name> <message> - <location filename="Helpviewer/UrlBar/UrlBar.py" line="159"/> + <location filename="Helpviewer/UrlBar/UrlBar.py" line="157"/> <source>Unknown</source> <translation type="unfinished">未知</translation> </message>
