Mercurial Repositories > eric / changeset

--- a/Helpviewer/Sync/DirectorySyncHandler.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/DirectorySyncHandler.py	Sun Mar 11 17:20:43 2012 +0100
@@ -77,7 +77,7 @@
         Private method to downlaod the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be downloaded (string)
         @param timestamp time stamp in seconds of the file to be downloaded (int)
         """
@@ -94,7 +94,7 @@
             return
         
         QCoreApplication.processEvents()
-        ok, error = self.writeFile(QByteArray(data), fileName,  timestamp)
+        ok, error = self.writeFile(QByteArray(data), fileName, type_, timestamp)
         if not ok:
             self.syncStatus.emit(type_, error)
         self.syncFinished.emit(type_, ok, True)
@@ -104,11 +104,11 @@
         Private method to upload the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be uploaded (string)
         """
         QCoreApplication.processEvents()
-        data = self.readFile(fileName)
+        data = self.readFile(fileName, type_)
         if data.isEmpty():
             self.syncStatus.emit(type_, self._messages[type_]["LocalMissing"])
             self.syncFinished(type_, False, False)
@@ -132,7 +132,7 @@
         Private method to do the initial synchronization of the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be synchronized (string)
         """
         if not self.__forceUpload and \
@@ -194,7 +194,7 @@
         Private method to synchronize the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be synchronized (string)
         """
         self.syncStatus.emit(type_, self._messages[type_]["Uploading"])

--- a/Helpviewer/Sync/FtpSyncHandler.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/FtpSyncHandler.py	Sun Mar 11 17:20:43 2012 +0100
@@ -151,6 +151,7 @@
                         self.__syncIDs[id][1].close()
                         ok, error = self.writeFile(self.__syncIDs[id][1].buffer(),
                                                    self.__syncIDs[id][3],
+                                                   self.__syncIDs[id][0],
                                                    self.__syncIDs[id][4])
                         if not ok:
                             self.syncStatus.emit(self.__syncIDs[id][0], error)
@@ -184,7 +185,7 @@
         Private method to downlaod the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be downloaded (string)
         @param timestamp time stamp in seconds of the file to be downloaded (int)
         """
@@ -199,10 +200,10 @@
         Private method to upload the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be uploaded (string)
         """
-        data = self.readFile(fileName)
+        data = self.readFile(fileName, type_)
         if data.isEmpty():
             self.syncStatus.emit(type_, self._messages[type_]["LocalMissing"])
             self.syncFinished(type_, False, False)
@@ -215,7 +216,7 @@
         Private method to do the initial synchronization of the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be synchronized (string)
         """
         if not self.__forceUpload and \
@@ -267,7 +268,7 @@
         Private method to synchronize the given file.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param fileName name of the file to be synchronized (string)
         """
         if self.__state == "initializing":

--- a/Helpviewer/Sync/SyncCheckPage.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/SyncCheckPage.py	Sun Mar 11 17:20:43 2012 +0100
@@ -145,7 +145,7 @@
         Private slot to handle a finished synchronization event.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param status flag indicating success (boolean)
         @param download flag indicating a download of a file (boolean)
         """

--- a/Helpviewer/Sync/SyncEncryptionPage.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/SyncEncryptionPage.py	Sun Mar 11 17:20:43 2012 +0100
@@ -41,6 +41,8 @@
         self.encryptionKeyAgainEdit.setEnabled(False)
         self.keySizeComboBox.setCurrentIndex(self.keySizeComboBox.findData(
             Preferences.getHelp("SyncEncryptionKeyLength")))
+        self.loginsOnlyCheckBox.setChecked(
+            Preferences.getHelp("SyncEncryptPasswordsOnly"))
     
     def nextId(self):
         """
@@ -52,6 +54,8 @@
         Preferences.setHelp("SyncEncryptionKey", self.encryptionKeyEdit.text())
         Preferences.setHelp("SyncEncryptionKeyLength", self.keySizeComboBox.itemData(
             self.keySizeComboBox.currentIndex()))
+        Preferences.setHelp("SyncEncryptPasswordsOnly",
+            self.loginsOnlyCheckBox.isChecked())
         
         return SyncGlobals.PageType
     

--- a/Helpviewer/Sync/SyncEncryptionPage.ui	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/SyncEncryptionPage.ui	Sun Mar 11 17:20:43 2012 +0100
@@ -131,6 +131,16 @@
         </property>
        </widget>
       </item>
+      <item row="7" column="0" colspan="2">
+       <widget class="QCheckBox" name="loginsOnlyCheckBox">
+        <property name="toolTip">
+         <string>Select to encrypt only the passwords</string>
+        </property>
+        <property name="text">
+         <string>Encrypt Passwords Only</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -161,6 +171,8 @@
   <tabstop>reencryptCheckBox</tabstop>
   <tabstop>encryptionKeyEdit</tabstop>
   <tabstop>encryptionKeyAgainEdit</tabstop>
+  <tabstop>keySizeComboBox</tabstop>
+  <tabstop>loginsOnlyCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>

--- a/Helpviewer/Sync/SyncHandler.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/SyncHandler.py	Sun Mar 11 17:20:43 2012 +0100
@@ -158,7 +158,7 @@
         """
         raise NotImplementedError
     
-    def readFile(self, fileName):
+    def readFile(self, fileName, type_):
         """
         Public method to read a file.
         
@@ -166,6 +166,8 @@
         the relevant encryption key.
         
         @param fileName name of the file to be read (string)
+        @param type_ type of the synchronization event (string one
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @return data of the file, optionally encrypted (QByteArray)
         """
         if os.path.exists(fileName):
@@ -176,7 +178,10 @@
             except IOError:
                 return QByteArray()
             
-            if Preferences.getHelp("SyncEncryptData"):
+            if Preferences.getHelp("SyncEncryptData") and \
+               (not Preferences.getHelp("SyncEncryptPasswordsOnly") or \
+                (Preferences.getHelp("SyncEncryptPasswordsOnly") and \
+                 type_ == "passwords")):
                 key = Preferences.getHelp("SyncEncryptionKey")
                 if not key:
                     return QByteArray()
@@ -191,7 +196,7 @@
         
         return QByteArray()
     
-    def writeFile(self, data, fileName, timestamp=0):
+    def writeFile(self, data, fileName, type_, timestamp=0):
         """
         Public method to write the data to a file.
         
@@ -200,12 +205,16 @@
         
         @param data data to be written and optionally decrypted (QByteArray)
         @param fileName name of the file the data is to be written to (string)
+        @param type_ type of the synchronization event (string one
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param timestamp timestamp to be given to the file (int)
         @return tuple giving a success flag and an error string (boolean, string)
         """
         data = bytes(data)
         
-        if Preferences.getHelp("SyncEncryptData"):
+        if Preferences.getHelp("SyncEncryptData") and \
+           (not Preferences.getHelp("SyncEncryptPasswordsOnly") or \
+            (Preferences.getHelp("SyncEncryptPasswordsOnly") and type_ == "passwords")):
             key = Preferences.getHelp("SyncEncryptionKey")
             if not key:
                 return False, self.trUtf8("Invalid encryption key given.")

--- a/Helpviewer/Sync/SyncManager.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Helpviewer/Sync/SyncManager.py	Sun Mar 11 17:20:43 2012 +0100
@@ -229,7 +229,7 @@
         Private slot to handle a finished synchronization event.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param status flag indicating success (boolean)
         @param download flag indicating a download of a file (boolean)
         """
@@ -251,7 +251,7 @@
         Private slot to handle a status update of a synchronization event.
         
         @param type_ type of the synchronization event (string one
-            of "bookmarks", "history", "passwords" or "useragents")
+            of "bookmarks", "history", "passwords", "useragents" or "speeddial")
         @param message status message for the event (string)
         """
         self.syncMessage.emit(message)

--- a/Preferences/__init__.py	Sun Mar 11 16:46:46 2012 +0100
+++ b/Preferences/__init__.py	Sun Mar 11 17:20:43 2012 +0100
@@ -661,6 +661,7 @@
         "SyncEncryptData": False,
         "SyncEncryptionKey": "",
         "SyncEncryptionKeyLength": 32,      # 16, 24 or 32
+        "SyncEncryptPasswordsOnly": False,
         "SyncType": 0,
         "SyncFtpServer": "",
         "SyncFtpUser": "",
@@ -2053,8 +2054,8 @@
                  "LocalContentCanAccessRemoteUrls", "LocalContentCanAccessFileUrls",
                  "XSSAuditingEnabled", "SiteSpecificQuirksEnabled", "SyncEnabled",
                  "SyncBookmarks", "SyncHistory", "SyncPasswords", "SyncUserAgents",
-                 "SyncSpeedDial", "SyncEncryptData","WarnOnMultipleClose",
-                 "ClickToFlashEnabled"
+                 "SyncSpeedDial", "SyncEncryptData", "SyncEncryptPasswordsOnly",
+                 "WarnOnMultipleClose", "ClickToFlashEnabled"
                 ]:
         return toBool(prefClass.settings.value("Help/" + key,
             prefClass.helpDefaults[key]))

--- a/i18n/eric5_cs.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_cs.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -13119,7 +13119,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29007,27 +29007,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Předvolby exportu</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Předvolby importu</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42212,12 +42212,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42256,6 +42256,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -42343,12 +42353,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>

Binary file i18n/eric5_de.qm has changed

--- a/i18n/eric5_de.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_de.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -12884,7 +12884,7 @@
         <translation>Kein geeigneter Proxy gefunden.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation>Synchronisation beendet</translation>
     </message>
@@ -28180,27 +28180,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Einstellungen exportieren</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Einstellungen importieren</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Properties Dateien (*.ini);;Alle Dateien (*)</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation>Wähle den Python2 Interpreter</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation>Wähle den zu verwendenden Python2 Interpreter aus:</translation>
     </message>
@@ -41328,12 +41328,12 @@
         <translation>Gib den Schlüssel erneut ein</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <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="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation>Die Schlüsselwiederholung ist falsch.</translation>
     </message>
@@ -41372,6 +41372,16 @@
         <source>256 Bits</source>
         <translation>256 Bits</translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation>Auswählen, um nur Kennwörter zu verschlüsseln</translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation>nur Kennwörter verschlüsseln</translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -41459,12 +41469,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation>Ungültiger Schlüssel angegeben.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation>Daten können nicht entschlüsselt werden.</translation>
     </message>

--- a/i18n/eric5_en.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_en.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -12798,7 +12798,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28020,27 +28020,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40927,12 +40927,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -40971,6 +40971,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -41058,12 +41068,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric5_es.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_es.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -13015,7 +13015,7 @@
         <translation>¡El archivo remoto de marcadores ya existe! Sincronizando copia local...</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation>Subiendo archivo local de marcadores...</translation>
     </message>
@@ -28713,27 +28713,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Exportar Preferencias</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Importar Preferencias</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Archivo de Propiedades (*.ini);;Todos los archivos (*)</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation>Seleccionar Intérprete de Python2</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation>Seleccionar el intérprete de Python2 a utilizar:</translation>
     </message>
@@ -41968,12 +41968,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="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation>La clave de encriptación no puede estar vacía.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation>La clave de encriptación repetida es errónea.</translation>
     </message>
@@ -42012,6 +42012,16 @@
         <source>256 Bits</source>
         <translation>256 Bits</translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -42099,12 +42109,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation>Clave de encriptación proporcionada inválida.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation>No se pueden desencriptar los datos.</translation>
     </message>

--- a/i18n/eric5_fr.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_fr.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -14016,7 +14016,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30579,27 +30579,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Export des préférences</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Import des préférences</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45269,12 +45269,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45313,6 +45313,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -45400,12 +45410,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric5_it.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_it.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -12954,7 +12954,7 @@
         <translation type="unfinished">Nessun proxy utilizzabile trovato.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28606,27 +28606,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Esporta Preferenze</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Importa Preferenze</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>File proprietà (*.ini);;Tutti i file(*)</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41807,12 +41807,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41851,6 +41851,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -41938,12 +41948,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric5_ru.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_ru.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -13052,7 +13052,7 @@
         <translation type="unfinished">Не найдено подходящего прокси.</translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28741,27 +28741,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Экспорт предпочтений</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Импорт предпочтений</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41972,12 +41972,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42016,6 +42016,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -42103,12 +42113,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric5_tr.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_tr.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -13131,7 +13131,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28906,27 +28906,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>Seçenekleri Dışa Aktar</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>Seçenekleri İçe Aktar</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -41992,12 +41992,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -42036,6 +42036,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -42123,12 +42133,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>

--- a/i18n/eric5_zh_CN.GB2312.ts	Sun Mar 11 16:46:46 2012 +0100
+++ b/i18n/eric5_zh_CN.GB2312.ts	Sun Mar 11 17:20:43 2012 +0100
@@ -13963,7 +13963,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="162"/>
+        <location filename="Helpviewer/Sync/FtpSyncHandler.py" line="163"/>
         <source>Synchronization finished</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30540,27 +30540,27 @@
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="Preferences/__init__.py" line="998"/>
+        <location filename="Preferences/__init__.py" line="999"/>
         <source>Export Preferences</source>
         <translation>导出首选项</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Import Preferences</source>
         <translation>导入首选项</translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1025"/>
+        <location filename="Preferences/__init__.py" line="1026"/>
         <source>Properties File (*.ini);;All Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select Python2 Interpreter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Preferences/__init__.py" line="1118"/>
+        <location filename="Preferences/__init__.py" line="1119"/>
         <source>Select the Python2 interpreter to be used:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45238,12 +45238,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="89"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="93"/>
         <source>Encryption key must not be empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="94"/>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.py" line="98"/>
         <source>Repeated encryption key is wrong.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -45282,6 +45282,16 @@
         <source>256 Bits</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="137"/>
+        <source>Select to encrypt only the passwords</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="Helpviewer/Sync/SyncEncryptionPage.ui" line="140"/>
+        <source>Encrypt Passwords Only</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncFtpSettingsPage</name>
@@ -45369,12 +45379,12 @@
 <context>
     <name>SyncHandler</name>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="211"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="220"/>
         <source>Invalid encryption key given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Helpviewer/Sync/SyncHandler.py" line="216"/>
+        <location filename="Helpviewer/Sync/SyncHandler.py" line="225"/>
         <source>Data cannot be decrypted.</source>
         <translation type="unfinished"></translation>
     </message>