Mon, 27 Feb 2012 19:33:51 +0100
Changed the hash iterations for sync encryption to 100 and made the key length user configurable (user can optimize for speed).
--- a/APIs/Python3/eric5.api Sun Feb 26 19:43:27 2012 +0100 +++ b/APIs/Python3/eric5.api Mon Feb 27 19:33:51 2012 +0100 @@ -6971,8 +6971,8 @@ eric5.Utilities.crypto.EncodeMarker?7 eric5.Utilities.crypto.MasterPassword?7 eric5.Utilities.crypto.changeRememberedMaster?4(newPassword) -eric5.Utilities.crypto.dataDecrypt?4(edata, password) -eric5.Utilities.crypto.dataEncrypt?4(data, password) +eric5.Utilities.crypto.dataDecrypt?4(edata, password, keyLength=32) +eric5.Utilities.crypto.dataEncrypt?4(data, password, keyLength=32, hashIterations=10000) eric5.Utilities.crypto.pwConvert?4(pw, encode=True) eric5.Utilities.crypto.pwDecode?4(epw) eric5.Utilities.crypto.pwDecrypt?4(epw, masterPW=None)
--- a/APIs/Python3/eric5.bas Sun Feb 26 19:43:27 2012 +0100 +++ b/APIs/Python3/eric5.bas Mon Feb 27 19:33:51 2012 +0100 @@ -55,7 +55,7 @@ BrowserSysPathItem BrowserItem ChangeBookmarkCommand QUndoCommand ChatWidget QWidget Ui_ChatWidget -Class ClbrBase +Class ClbrBaseClasses.Class VisibilityMixin ClassItem UMLItem ClassScope Scope ClbrBase _ClbrBase
--- a/Documentation/Source/eric5.Utilities.crypto.__init__.html Sun Feb 26 19:43:27 2012 +0100 +++ b/Documentation/Source/eric5.Utilities.crypto.__init__.html Mon Feb 27 19:33:51 2012 +0100 @@ -93,7 +93,7 @@ <hr /><hr /> <a NAME="dataDecrypt" ID="dataDecrypt"></a> <h2>dataDecrypt</h2> -<b>dataDecrypt</b>(<i>edata, password</i>) +<b>dataDecrypt</b>(<i>edata, password, keyLength=32</i>) <p> Module function to decrypt a password. </p><dl> @@ -103,6 +103,9 @@ </dd><dt><i>password</i></dt> <dd> password to be used for decryption (string) +</dd><dt><i>keyLength=</i></dt> +<dd> +length of the key to be generated for decryption (16, 24 or 32) </dd> </dl><dl> <dt>Returns:</dt> @@ -115,7 +118,7 @@ <hr /><hr /> <a NAME="dataEncrypt" ID="dataEncrypt"></a> <h2>dataEncrypt</h2> -<b>dataEncrypt</b>(<i>data, password</i>) +<b>dataEncrypt</b>(<i>data, password, keyLength=32, hashIterations=10000</i>) <p> Module function to encrypt a password. </p><dl> @@ -125,6 +128,13 @@ </dd><dt><i>password</i></dt> <dd> password to be used for encryption (string) +</dd><dt><i>keyLength=</i></dt> +<dd> +length of the key to be generated for encryption (16, 24 or 32) +</dd><dt><i>hashIterations=</i></dt> +<dd> +number of hashes to be applied to the password for + generating the encryption key (integer) </dd> </dl><dl> <dt>Returns:</dt>
--- a/Documentation/Source/eric5.Utilities.crypto.py3AES.html Sun Feb 26 19:43:27 2012 +0100 +++ b/Documentation/Source/eric5.Utilities.crypto.py3AES.html Mon Feb 27 19:33:51 2012 +0100 @@ -593,7 +593,7 @@ key to be used (bytes) </dd><dt><i>size</i></dt> <dd> -length of the key (integer) +length of the key (16, 24 or 32) </dd><dt><i>IV</i></dt> <dd> initialisation vector (bytearray) @@ -620,7 +620,7 @@ key to be used (bytes) </dd><dt><i>size</i></dt> <dd> -length of the key (integer) +length of the key (16, 24 or 32) </dd><dt><i>IV</i></dt> <dd> initialisation vector (bytearray)
--- a/Helpviewer/Sync/SyncEncryptionPage.py Sun Feb 26 19:43:27 2012 +0100 +++ b/Helpviewer/Sync/SyncEncryptionPage.py Mon Feb 27 19:33:51 2012 +0100 @@ -30,11 +30,17 @@ super().__init__(parent) self.setupUi(self) + self.keySizeComboBox.addItem(self.trUtf8("128 Bits"), 16) + self.keySizeComboBox.addItem(self.trUtf8("192 Bits"), 24) + self.keySizeComboBox.addItem(self.trUtf8("256 Bits"), 32) + self.registerField("ReencryptData", self.reencryptCheckBox) self.encryptionGroupBox.setChecked(Preferences.getHelp("SyncEncryptData")) self.encryptionKeyEdit.setText(Preferences.getHelp("SyncEncryptionKey")) self.encryptionKeyAgainEdit.setEnabled(False) + self.keySizeComboBox.setCurrentIndex(self.keySizeComboBox.findData( + Preferences.getHelp("SyncEncryptionKeyLength"))) def nextId(self): """ @@ -44,6 +50,8 @@ """ Preferences.setHelp("SyncEncryptData", self.encryptionGroupBox.isChecked()) Preferences.setHelp("SyncEncryptionKey", self.encryptionKeyEdit.text()) + Preferences.setHelp("SyncEncryptionKeyLength", self.keySizeComboBox.itemData( + self.keySizeComboBox.currentIndex())) return SyncGlobals.PageType
--- a/Helpviewer/Sync/SyncEncryptionPage.ui Sun Feb 26 19:43:27 2012 +0100 +++ b/Helpviewer/Sync/SyncEncryptionPage.ui Mon Feb 27 19:33:51 2012 +0100 @@ -91,6 +91,37 @@ </widget> </item> <item row="5" column="0" colspan="2"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Size of generated encryption key:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="keySizeComboBox"> + <property name="toolTip"> + <string>Select the size of the generated encryption key</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item row="6" column="0" colspan="2"> <widget class="QLabel" name="errorLabel"> <property name="styleSheet"> <string notr="true">color : red;</string>
--- a/Helpviewer/Sync/SyncHandler.py Sun Feb 26 19:43:27 2012 +0100 +++ b/Helpviewer/Sync/SyncHandler.py Mon Feb 27 19:33:51 2012 +0100 @@ -105,7 +105,9 @@ if not key: return QByteArray() - data, ok = dataEncrypt(data, key) + data, ok = dataEncrypt(data, key, + keyLength=Preferences.getHelp("SyncEncryptionKeyLength"), + hashIterations=100) if not ok: return QByteArray() @@ -131,7 +133,8 @@ if not key: return False, self.trUtf8("Invalid encryption key given.") - data, ok = dataDecrypt(data, key) + data, ok = dataDecrypt(data, key, + keyLength=Preferences.getHelp("SyncEncryptionKeyLength")) if not ok: return False, self.trUtf8("Data cannot be decrypted.")
--- a/Preferences/__init__.py Sun Feb 26 19:43:27 2012 +0100 +++ b/Preferences/__init__.py Mon Feb 27 19:33:51 2012 +0100 @@ -659,6 +659,7 @@ "SyncUserAgents": True, "SyncEncryptData": False, "SyncEncryptionKey": "", + "SyncEncryptionKeyLength": 32, # 16, 24 or 32 "SyncType": 0, "SyncFtpServer": "", "SyncFtpUser": "", @@ -2034,7 +2035,8 @@ "KeepCookiesUntil", "StartupBehavior", "HistoryLimit", "OfflineStorageDatabaseQuota", "OfflineWebApplicationCacheQuota", "CachePolicy", "DownloadManagerRemovePolicy", - "SearchLanguage", "SyncType", "SyncFtpPort", "SyncFtpIdleTimeout"]: + "SearchLanguage", "SyncType", "SyncFtpPort", "SyncFtpIdleTimeout", + "SyncEncryptionKeyLength"]: return int(prefClass.settings.value("Help/" + key, prefClass.helpDefaults[key])) elif key in ["SingleHelpWindow", "SaveGeometry", "WebSearchSuggestions",
--- a/Utilities/crypto/__init__.py Sun Feb 26 19:43:27 2012 +0100 +++ b/Utilities/crypto/__init__.py Mon Feb 27 19:33:51 2012 +0100 @@ -243,17 +243,21 @@ MasterPassword = pwEncode(newPassword) -def dataEncrypt(data, password): +def dataEncrypt(data, password, keyLength=32, hashIterations=10000): """ Module function to encrypt a password. @param data data to encrypt (bytes) @param password password to be used for encryption (string) + @keyparam keyLength length of the key to be generated for encryption (16, 24 or 32) + @keyparam hashIterations number of hashes to be applied to the password for + generating the encryption key (integer) @return encrypted data (bytes) and flag indicating success (boolean) """ - digestname, iterations, salt, hash = hashPasswordTuple(password) - key = hash[:32] + digestname, iterations, salt, hash = \ + hashPasswordTuple(password, iterations=hashIterations) + key = hash[:keyLength] try: cipher = encryptData(key, data) except ValueError: @@ -266,12 +270,13 @@ ]), True -def dataDecrypt(edata, password): +def dataDecrypt(edata, password, keyLength=32): """ Module function to decrypt a password. @param edata hashed data to decrypt (string) @param password password to be used for decryption (string) + @keyparam keyLength length of the key to be generated for decryption (16, 24 or 32) @return decrypted data (bytes) and flag indicating success (boolean) """ @@ -282,7 +287,7 @@ hashParameters = hashParametersBytes.decode() try: # recreate the key used to encrypt - key = rehashPassword(password, hashParameters)[:32] + key = rehashPassword(password, hashParameters)[:keyLength] plaintext = decryptData(key, base64.b64decode(edata)) except ValueError: return "", False
--- a/Utilities/crypto/py3AES.py Sun Feb 26 19:43:27 2012 +0100 +++ b/Utilities/crypto/py3AES.py Mon Feb 27 19:33:51 2012 +0100 @@ -617,7 +617,7 @@ @param input data to be encrypted (bytes) @param mode mode of operation (0, 1 or 2) @param key key to be used (bytes) - @param size length of the key (integer) + @param size length of the key (16, 24 or 32) @param IV initialisation vector (bytearray) @return tuple with mode of operation, length of the input and the encrypted data (integer, integer, bytes) @@ -709,7 +709,7 @@ (integer) @param mode mode of operation (0, 1 or 2) @param key key to be used (bytes) - @param size length of the key (integer) + @param size length of the key (16, 24 or 32) @param IV initialisation vector (bytearray) @return decrypted data (bytes) """
--- a/i18n/eric5_cs.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_cs.ts Mon Feb 27 19:33:51 2012 +0100 @@ -28997,27 +28997,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Předvolby exportu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Předvolby importu</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -42116,12 +42116,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -42135,6 +42135,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -42222,12 +42247,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_de.ts Mon Feb 27 19:33:51 2012 +0100 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.0" language="de"> <context> <name>AboutDialog</name> <message> @@ -1660,8 +1661,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="148"/> @@ -1897,7 +1898,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open in New &Tab Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -13185,7 +13186,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="899"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> + <source>Open Link in New Tab Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -28170,27 +28171,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Einstellungen exportieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Einstellungen importieren</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation>Wähle den Python2 Interpreter</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation> </message> @@ -41232,12 +41233,12 @@ <translation>Gib den Schlüssel erneut ein</translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation>Der Schlüssel darf nicht leer sein.</translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation>Die Schlüsselwiederholung ist falsch.</translation> </message> @@ -41251,6 +41252,31 @@ <source>Shows an indication for the encryption key strength</source> <translation>Zeigt eine Indikation für die Schlüsselstärke an</translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation>Länge des erzeugten Schlüssels:</translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation>Wähle die Länge des erzeugten Schlüssels</translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation>128 Bits</translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation>192 Bits</translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation>256 Bits</translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -41338,12 +41364,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation>Ungültiger Schlüssel angegeben.</translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation>Daten können nicht entschlüsselt werden.</translation> </message>
--- a/i18n/eric5_en.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_en.ts Mon Feb 27 19:33:51 2012 +0100 @@ -28015,27 +28015,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -40836,12 +40836,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -40855,6 +40855,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -40942,12 +40967,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_es.ts Mon Feb 27 19:33:51 2012 +0100 @@ -28700,27 +28700,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Exportar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Importar Preferencias</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation>Seleccionar Intérprete de Python2</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation>Seleccionar el intérprete de Python2 a utilizar:</translation> </message> @@ -41869,12 +41869,12 @@ <translation type="obsolete">Muestra una indicación sobre la fuerza de la contraseña</translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -41888,6 +41888,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -41975,12 +42000,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_fr.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_fr.ts Mon Feb 27 19:33:51 2012 +0100 @@ -30574,27 +30574,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Export des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Import des préférences</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -45178,12 +45178,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -45197,6 +45197,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -45284,12 +45309,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_it.ts Mon Feb 27 19:33:51 2012 +0100 @@ -28596,27 +28596,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41711,12 +41711,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -41730,6 +41730,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -41817,12 +41842,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_ru.ts Mon Feb 27 19:33:51 2012 +0100 @@ -28731,27 +28731,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41876,12 +41876,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -41895,6 +41895,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -41982,12 +42007,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_tr.ts Mon Feb 27 19:33:51 2012 +0100 @@ -28896,27 +28896,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>Seçenekleri Dışa Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>Seçenekleri İçe Aktar</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -41896,12 +41896,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -41915,6 +41915,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -42002,12 +42027,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Sun Feb 26 19:43:27 2012 +0100 +++ b/i18n/eric5_zh_CN.GB2312.ts Mon Feb 27 19:33:51 2012 +0100 @@ -30535,27 +30535,27 @@ <context> <name>Preferences</name> <message> - <location filename="Preferences/__init__.py" line="995"/> + <location filename="Preferences/__init__.py" line="996"/> <source>Export Preferences</source> <translation>导出首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Import Preferences</source> <translation>导入首选项</translation> </message> <message> - <location filename="Preferences/__init__.py" line="1022"/> + <location filename="Preferences/__init__.py" line="1023"/> <source>Properties File (*.ini);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select Python2 Interpreter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Preferences/__init__.py" line="1115"/> + <location filename="Preferences/__init__.py" line="1116"/> <source>Select the Python2 interpreter to be used:</source> <translation type="unfinished"></translation> </message> @@ -45147,12 +45147,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="81"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/> <source>Encryption key must not be empty.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="86"/> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/> <source>Repeated encryption key is wrong.</source> <translation type="unfinished"></translation> </message> @@ -45166,6 +45166,31 @@ <source>Shows an indication for the encryption key strength</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="98"/> + <source>Size of generated encryption key:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="105"/> + <source>Select the size of the generated encryption key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="33"/> + <source>128 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="34"/> + <source>192 Bits</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="35"/> + <source>256 Bits</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SyncFtpSettingsPage</name> @@ -45253,12 +45278,12 @@ <context> <name>SyncHandler</name> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="132"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="134"/> <source>Invalid encryption key given.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Helpviewer/Sync/SyncHandler.py" line="136"/> + <location filename="Helpviewer/Sync/SyncHandler.py" line="139"/> <source>Data cannot be decrypted.</source> <translation type="unfinished"></translation> </message>