Merge latest changes with public repository

author: Clipperz <info@clipperz.com> 2013-01-09 11:45:31 (UTC)
committer: Clipperz <info@clipperz.com> 2013-01-09 11:45:31 (UTC)
commit: 9741a93a9f5c76827135b43c03b20c0a48f12604 (patch) (unidiff)
tree: 1a8fff379a033d873c9e1c7faff755fb6bb7b118
parent: 8ef30d00eb96004c39540019336c0ec99dae01cb (diff)
download: clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.zip
clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.gz
clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.bz2
3 files changed, 8 insertions, 7 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index d6ebb39..f89f79c 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -1,769 +1,768 @@
 /*
 Copyright 2008-2011 Clipperz Srl
 This file is part of Clipperz Community Edition.
 Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz Community Edition is free software: you can redistribute
  it and/or modify it under the terms of the GNU Affero General Public
  License as published by the Free Software Foundation, either version
  3 of the License, or (at your option) any later version.
 * Clipperz Community Edition is distributed in the hope that it will
  be useful, but WITHOUT ANY WARRANTY; without even the implied
  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
 * You should have received a copy of the GNU Affero General Public
  License along with Clipperz Community Edition.  If not, see
  <http://www.gnu.org/licenses/>.
 */
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.DataModel) == 'undefined') { Clipperz.PM.DataModel = {}; }
 //#############################################################################
 Clipperz.PM.DataModel.Record = function(args) {
        args = args || {};
        this._user = args['user'] || null;
        this._reference = args['reference'] || Clipperz.PM.Crypto.randomKey();
        this._version = args['version'] || Clipperz.PM.Crypto.encryptingFunctions.currentVersion;
        this._key = args['key'] || Clipperz.PM.Crypto.randomKey();
        this.setLabel(args['label'] || Clipperz.PM.Strings['newRecordTitleLabel']);
        
        this.setHeaderNotes(args['headerNotes'] || null);
        this.setNotes(args['notes'] || args['headerNotes'] || "");
 //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _headerNotes: '" + this._headerNotes + "'");
 //MochiKit.Logging.logDebug("--- new Record ('" + this._label + "')- _notes: '" + this._notes + "'");
        //this._notes = args.notes || "";
        
        this._versions = {};
        this._directLogins = {};
        this._removedDirectLogins = [];
        
        this.setIsBrandNew(args['reference'] == null);
        this.setShouldLoadData(this.isBrandNew() ? false: true);
        this.setShouldDecryptData(this.isBrandNew() ? false: true);
        this.setShouldProcessData(this.isBrandNew() ? false: true);
        this.setCurrentVersion(this.isBrandNew() ? new Clipperz.PM.DataModel.RecordVersion(this, null): null);
        this.setCurrentVersionKey(null);
        this._serverData = null;
        this._decryptedData = null;
        this._cachedData = null;
        
        return this;
 }
 Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
        'toString': function() {
                return "Record (" + this.label() + ")";
        },
        //-------------------------------------------------------------------------
        'isBrandNew': function() {
                return this._isBrandNew;
        },
        
        'setIsBrandNew': function(aValue) {
                this._isBrandNew = aValue;
        },
        //-------------------------------------------------------------------------
 /*
        'shouldRunTheRecordCreationWizard': function() {
                return (this.isBrandNew() && (MochiKit.Base.keys(this.currentVersion().fields()).length == 0));
        },
        */
        //-------------------------------------------------------------------------
        'user': function() {
                return this._user;
        },
        
        //-------------------------------------------------------------------------
        'reference': function() {
                return this._reference;
        },
        
        //-------------------------------------------------------------------------
        'key': function() {
                return this._key;
        },
        
        'updateKey': function() {
                this._key = Clipperz.PM.Crypto.randomKey();
        },
        
        //-------------------------------------------------------------------------
        
        'label': function() {
                return this._label;
        },
        'setLabel': function(aValue) {
                this._label = aValue;
        },
        
        'lowerCaseLabel': function() {
                return this.label().toLowerCase();
        },
        
        //-------------------------------------------------------------------------
        'versions': function() {
                return this._versions;
        },
        
        //-------------------------------------------------------------------------
        'currentVersion': function() {
                return this._currentVersion;
        },
        
        'setCurrentVersion': function(aValue) {
                this._currentVersion = aValue;
        },
        
        //-------------------------------------------------------------------------
        'currentVersionKey': function() {
                return this._currentVersionKey;
        },
        'setCurrentVersionKey': function(aValue) {
                this._currentVersionKey = aValue;
        },
        
        //-------------------------------------------------------------------------
        'deferredData': function() {
                        vardeferredResult;
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.deferredData - this: " + this);
                deferredResult = new MochiKit.Async.Deferred();
                deferredResult.addCallback(MochiKit.Base.method(this, 'loadData'));
                deferredResult.addCallback(MochiKit.Base.method(this, 'decryptData'));
                deferredResult.addCallback(MochiKit.Base.method(this, 'processData'));
                deferredResult.addCallback(function(aRecord) {
                        return aRecord.currentVersion().deferredData();
                });
                deferredResult.addCallback(MochiKit.Base.method(this, 'takeSnapshotOfCurrentData'));
                deferredResult.addCallback(MochiKit.Async.succeed, this);
                deferredResult.callback();
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.deferredData");
                
                return deferredResult;
        },
        //-------------------------------------------------------------------------
        'exportedData': function() {
                var result;
                
                result = {};
                result['label'] = this.label();
                result['data'] = this.serializedData();
                result['currentVersion'] = this.currentVersion().serializedData();
                result['currentVersion']['reference'] = this.currentVersion().reference();
        //      result['versions'] = MochiKit.Base.map(MochiKit.Base.methodcaller("serializedData"), MochiKit.Base.values(this.versions()));
                
                return Clipperz.Base.serializeJSON(result);
        },
        
        //-------------------------------------------------------------------------
        'shouldLoadData': function() {
                return this._shouldLoadData;
        },
        'setShouldLoadData': function(aValue) {
                this._shouldLoadData = aValue;
        },
        //-------------------------------------------------------------------------
        'shouldDecryptData': function() {
                return this._shouldDecryptData;
        },
        'setShouldDecryptData': function(aValue) {
                this._shouldDecryptData = aValue;
        },
        //-------------------------------------------------------------------------
        'shouldProcessData': function() {
                return this._shouldProcessData;
        },
        
        'setShouldProcessData': function(aValue) {
                this._shouldProcessData = aValue;
        },
        //-------------------------------------------------------------------------
        
        'loadData': function() {
                var result;
                
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.loadData - this: " + this);
                if (this.shouldLoadData()) {
                        var deferredResult;
                
                        deferredResult = new MochiKit.Async.Deferred();
                        deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'loadingRecordData');
                        deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'getRecordDetail', {reference: this.reference()});
                        deferredResult.addCallback(MochiKit.Base.method(this,'setServerData'));
                        deferredResult.callback();
                        result = deferredResult;
                } else {
                        result = MochiKit.Async.succeed(this.serverData());
                }
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.loadData");
                return result;
        },
        //-------------------------------------------------------------------------
        
        'decryptData': function(anEncryptedData) {
                var result;
                
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.decryptData - this: " + this + " (" + anEncryptedData + ")");
                if (this.shouldDecryptData()) {
                        var deferredResult;
                
                        deferredResult = new MochiKit.Async.Deferred();
                        deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'decryptingRecordData');
                        deferredResult.addCallback(Clipperz.PM.Crypto.deferredDecrypt, this.key(), anEncryptedData['data'], anEncryptedData['version']);
                        deferredResult.addCallback(function(anEncryptedData, someDecryptedValues) {
                                        varresult;
                                result = anEncryptedData;
                                result['data'] = someDecryptedValues;
                        
                                return result;
                        }, anEncryptedData);
                        deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData'));
                        deferredResult.callback();
                        result = deferredResult;
                } else {
                        result = MochiKit.Async.succeed(this.decryptedData());
                }
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData");
                return result;
        },
        //-------------------------------------------------------------------------
        'processData': function(someValues) {
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues));
                if (this.shouldProcessData()) {
                        var currentVersionParameters;
-console.log("Record.processData", someValues);
                        this.processDataToExtractLegacyValues(someValues['data']);
                        if (typeof(someValues['data']['notes']) != 'undefined') {
                                this.setNotes(someValues['data']['notes']);
                        }
                        if (someValues['data']['currentVersionKey'] != null) {
                                this.setCurrentVersionKey(someValues['data']['currentVersionKey']);
                        } else {
                                this.setCurrentVersionKey(this.key());
                        }
-        //              community edition doesn't currently pass version
+        //              community edition doesn't currently pass version information
-        //              information
                        if (someValues['versions'] == null) {
                                currentVersionParameters = someValues['currentVersion'];
                        } else {
                                currentVersionParameters = someValues['versions'][someValues['currentVersion']];
                        }
-console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
+        //-             currentVersionParameters = someValues['currentVersion'];
-console.log("Record.processData - currentVersionParameters", currentVersionParameters);
+        //              currentVersionParameters = someValues['versions'][someValues['currentVersion']];
                        currentVersionParameters['key'] = this.currentVersionKey();
                        this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
                        
                        if (someValues['data']['directLogins'] != null) {
                                        vardirectLoginReference;
                        
                                for (directLoginReference in someValues['data']['directLogins']) {
                                        var directLogin;
                                        var directLoginParameters;
                                
                                        directLoginParameters = someValues['data']['directLogins'][directLoginReference];
                                        directLoginParameters.record = this;
                                        directLoginParameters.reference = directLoginReference;
                                
                                        directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters);
                                        this.addDirectLogin(directLogin, true);
                                }
                        }
                        this.setShouldProcessData(false);
                }
                
                Clipperz.NotificationCenter.notify(this, 'recordDataReady');
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData");
 //MochiKit.Logging.logDebug("<<< Record.processData");
                
                return this;
        },
        //-------------------------------------------------------------------------
        'processDataToExtractLegacyValues': function(someValues) {
 //MochiKit.Logging.logDebug(">>> Record.processDataToExtractLegacyValues");
                if (someValues['data'] != null) {
                        this.setNotes(someValues['data']);
                }
                if (
                                (typeof(someValues['loginFormData']) != "undefined")
                                &&(typeof(someValues['loginBindings'] != "undefined"))
                                &&(someValues['loginFormData'] != "")
                                &&(someValues['loginBindings'] != "")
                ) {
                                vardirectLogin;
                        directLogin = new Clipperz.PM.DataModel.DirectLogin({
                                record:this,
                                label:this.label() + Clipperz.PM.Strings['newDirectLoginLabelSuffix'],
                                reference:Clipperz.Crypto.SHA.sha256(new Clipperz.ByteArray(this.label() +
                                                                                                                                                        someValues['loginFormData'] +
                                                                                                                                                        someValues['loginBindings'])).toHexString().substring(2),
                                formData:Clipperz.Base.evalJSON(someValues['loginFormData']),
                                legacyBindingData:Clipperz.Base.evalJSON(someValues['loginBindings']),
                                bookmarkletVersion:'0.1'
                        });
                        this.addDirectLogin(directLogin, true);
                }
 //MochiKit.Logging.logDebug("<<< Record.processDataToExtractLegacyValues");
        },
        
        //-------------------------------------------------------------------------
        'getReadyBeforeUpdatingVersionValues': function() {
        },
        //-------------------------------------------------------------------------
        
        'addNewField': function() {
                        varnewField;
 //MochiKit.Logging.logDebug(">>> Record.addNewField - " + this);
                this.getReadyBeforeUpdatingVersionValues();
                newField = this.currentVersion().addNewField();
                Clipperz.NotificationCenter.notify(this, 'recordUpdated');
 //MochiKit.Logging.logDebug("<<< Record.addNewField");
                
                return newField;
        },
        //-------------------------------------------------------------------------
        'removeField': function(aField) {
                this.getReadyBeforeUpdatingVersionValues();
                this.currentVersion().removeField(aField);
                Clipperz.NotificationCenter.notify(this, 'recordUpdated');
        },
        'removeEmptyFields': function() {
                MochiKit.Iter.forEach(MochiKit.Base.values(this.currentVersion().fields()), MochiKit.Base.bind(function(aField) {
                        if (aField.isEmpty()) {
                                this.removeField(aField);
        //                      this.currentVersion().removeField(aField);
                        }
                }, this));
        },
        
        //-------------------------------------------------------------------------
        'notes': function() {
                return this._notes;
        },
        
        'setNotes': function(aValue) {
                this._notes = aValue;
                this.setHeaderNotes(null);
        },
        //-------------------------------------------------------------------------
        'headerNotes': function() {
                return this._headerNotes;
        },
        
        'setHeaderNotes': function(aValue) {
                this._headerNotes = aValue;
        },
        
        //-------------------------------------------------------------------------
        'remove': function() {
 //MochiKit.Logging.logDebug(">>> Record.remove - " + this);
                MochiKit.Iter.forEach(MochiKit.Base.values(this.directLogins()), MochiKit.Base.method(this, 'removeDirectLogin'));
                this.syncDirectLoginReferenceValues();
                this.user().removeRecord(this);
 //MochiKit.Logging.logDebug("<<< Record.remove");
        },
        
        //-------------------------------------------------------------------------
        'directLogins': function() {
                return this._directLogins;
        },
        
        'addDirectLogin': function(aDirectLogin, shouldUpdateUser) {
                this.directLogins()[aDirectLogin.reference()] = aDirectLogin;
                if (shouldUpdateUser == true) {
                        this.user().addDirectLogin(aDirectLogin);
                }
        },
        'removeDirectLogin': function(aDirectLogin) {
                this.removedDirectLogins().push(aDirectLogin);
                delete this.directLogins()[aDirectLogin.reference()];
        //      this.user().removeDirectLogin(aDirectLogin);
        },
        'resetDirectLogins': function() {
                this._directLogins = {};
        },
        'removedDirectLogins': function() {
                return this._removedDirectLogins;
        },
        'resetRemovedDirectLogins': function() {
                this._removedDirectLogins = [];
        },
        
        //-------------------------------------------------------------------------
        'serverData': function() {
                return this._serverData;
        },
        
        'setServerData': function(aValue) {
                this._serverData = aValue;
                this.setShouldLoadData(false);
                return aValue;
        },
        //-------------------------------------------------------------------------
        'decryptedData': function() {
                return this._decryptedData;
        },
        
        'setDecryptedData': function(aValue) {
                this._decryptedData = aValue;
                this.setShouldDecryptData(false);
                return aValue;
        },
        //-------------------------------------------------------------------------
        'cachedData': function() {
                return this._cachedData;
        },
        
        'setCachedData': function(aValue) {
 //MochiKit.Logging.logDebug(">>> Record.setCachedData");
 //MochiKit.Logging.logDebug("--- Record.setCachedData - aValue: " + Clipperz.Base.serializeJSON(aValue));
                this._cachedData = aValue;
                this.setShouldProcessData(false);
 //MochiKit.Logging.logDebug("<<< Record.setCachedData");
                return aValue;
        },
        //-------------------------------------------------------------------------
        'hasPendingChanges': function() {
                var result;
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.hasPendingChanges");
 //MochiKit.Logging.logDebug(">>> Record.hasPendingChanges - cachedData: " + this.cachedData());
 //MochiKit.Logging.logDebug(">>> Record.hasPendingChanges - cachedData: " + Clipperz.Base.serializeJSON(this.cachedData()));
 //MochiKit.Logging.logDebug(">>> Record.hasPendingChanges - currentSnapshot: " + this.currentDataSnapshot());
 //MochiKit.Logging.logDebug(">>> Record.hasPendingChanges - currentSnapshot: " + Clipperz.Base.serializeJSON(this.currentDataSnapshot()));
 //console.log(">>> Record.hasPendingChanges - cachedData: %o", this.cachedData());
 //console.log(">>> Record.hasPendingChanges - currentSnapshot: %o", this.currentDataSnapshot());
                result = (MochiKit.Base.compare(this.cachedData(), this.currentDataSnapshot()) != 0);
 //MochiKit.Logging.logDebug("<<< Record.hasPendingChanges - " + result);
                if ((result == false) && this.isBrandNew() && (this.label() != Clipperz.PM.Strings['newRecordTitleLabel'])) {
                        result = true;
                }
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.hasPendingChanges");
                
                return result;
        },
        //-------------------------------------------------------------------------
        'currentDataSnapshot': function() {
                        varresult;
                
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.currentDataSnapshot");
                result = {
                        'label': this.label(),
                        'data': this.serializedData(),
                        'currentVersion': this.currentVersion().currentDataSnapshot()
                };
                
        //      result['data']['data'] = this.notes();
                result = Clipperz.Base.serializeJSON(result);
                
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.currentDataSnapshot");
 //MochiKit.Logging.logDebug("<<< Record.currentDataSnapshot");
                return result;
        },
        //.........................................................................
        'takeSnapshotOfCurrentData': function() {
                this.setCachedData(this.currentDataSnapshot());
        },
        //-------------------------------------------------------------------------
        'headerData': function() {
                var result;
                
                result = {
                                'label':        this.label(),
                                'key':          this.key()
                };
                if (this.headerNotes() != null) {
                        result['headerNotes'] = this.headerNotes();
                }
                
                return result;
        },
        //-------------------------------------------------------------------------
        
        'serializedData': function() {
                var result;
                var directLoginReference;
                result = {};
                result['currentVersionKey'] = this.currentVersion().key();
                
                result['directLogins'] = {};
                for (directLoginReference in this.directLogins()) {
                        result['directLogins'][directLoginReference] = this.directLogins()[directLoginReference].serializedData();
                }
                result['notes'] = this.notes();
                
                return result;
        },
        //-------------------------------------------------------------------------
        'encryptedData': function() {
                var deferredResult;
                        varresult;
                
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.encryptedData");
                result = {}
 //MochiKit.Logging.logDebug("--- Record.encryptedData - 1");
                deferredResult = new MochiKit.Async.Deferred();
 //MochiKit.Logging.logDebug("--- Record.encryptedData - 2");
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Record.encryptedData - 1: " + res); return res;});
                deferredResult.addCallback(function(aResult, aRecord) {
                        aResult['reference'] = aRecord.reference();
                        return aResult;
                }, result, this);
 //MochiKit.Logging.logDebug("--- Record.encryptedData - 3");
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Record.encryptedData - 2: " + res); return res;});
                deferredResult.addCallback(Clipperz.PM.Crypto.deferredEncryptWithCurrentVersion, this.key(), this.serializedData());
 //MochiKit.Logging.logDebug("--- Record.encryptedData - 4");
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Record.encryptedData - 3: " + res); return res;});
                deferredResult.addCallback(function(aResult, res) {
                        aResult['data'] = res;
                        return aResult;
                }, result);
 //MochiKit.Logging.logDebug("--- Record.encryptedData - 5");
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Record.encryptedData - 4: " + res); return res;});
                deferredResult.addCallback(function(aResult) {
                        aResult['version'] = Clipperz.PM.Crypto.encryptingFunctions.currentVersion;
                        return aResult;
                }, result);
 //MochiKit.Logging.logDebug("--- Record.encryptedData - 6");
 //deferredResult.addBoth(function(res) {MochiKit.Logging.logDebug("Record.encryptedData - 5: " + res); return res;});
                deferredResult.callback();
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.encryptedData");
                
                return deferredResult;
        },
        //-------------------------------------------------------------------------
        'syncDirectLoginReferenceValues': function() {
 //MochiKit.Logging.logDebug(">>> Record.syncDirectLoginReferenceValues");
                MochiKit.Iter.forEach(MochiKit.Base.values(this.directLogins()), function(aDirectLogin) {
                        aDirectLogin.record().user().synchronizeDirectLogin(aDirectLogin);
                });
                MochiKit.Iter.forEach(this.removedDirectLogins(), function(aDirectLogin) {
                        aDirectLogin.record().user().removeDirectLogin(aDirectLogin);
                });
                
                this.resetRemovedDirectLogins();
 //MochiKit.Logging.logDebug("<<< Record.syncDirectLoginReferenceValues");
        },
        
        //-------------------------------------------------------------------------
        'saveChanges': function() {
                var result;
                
        //      if (this.isBrandNew() == false) {
        //              result = this.user().saveRecords([this], 'updateData');
        //      } else {
        //              result = this.user().saveRecords([this], 'addNewRecords');
        //      }
                result = this.user().saveRecords([this]);
                
                return result;
        },
        
 /*
        'saveChanges': function() {
                var deferredResult;
                        varresult;
                Clipperz.NotificationCenter.notify(this.user(), 'updatedSection', 'records', true);
 //MochiKit.Logging.logDebug(">>> Record.saveChanges");
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.saveChanges");
                if (this.headerNotes() != null) {
                        this.setNotes(this.headerNotes());
                }
                this.syncDirectLoginReferenceValues();
                this.currentVersion().createNewVersion();
                result = {'records': [{}]};
                
                deferredResult = new MochiKit.Async.Deferred();
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_collectRecordInfo');
                deferredResult.addCallback(MochiKit.Base.method(this, 'updateKey'));
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_encryptUserData');
                deferredResult.addCallback(MochiKit.Base.method(this.user(), 'encryptedData'));
                deferredResult.addCallback(function(aResult, res) {
                        aResult['user'] = res;
                        return aResult;
                }, result);
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_encryptRecordData');
                deferredResult.addCallback(MochiKit.Base.method(this, 'encryptedData'));
                deferredResult.addCallback(function(aResult, res) {
        //#             aResult['record'] = res;
                        aResult['records'][0]['record'] = res;
                        return aResult;
                }, result);
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_encryptRecordVersions');
                deferredResult.addCallback(MochiKit.Base.method(this.currentVersion(), 'encryptedData'));
                deferredResult.addCallback(function(aResult, res) {
        //              aResult['currentRecordVersion'] = res;
                        aResult['records'][0]['currentRecordVersion'] = res;
                        return aResult;
                }, result);
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_sendingData');
                if (this.isBrandNew() == false) {
                        deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'updateData');
                } else {
        //#             deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'addNewRecord');
                        deferredResult.addCallback(MochiKit.Base.method(this.user().connection(), 'message'), 'addNewRecords');
                }
                deferredResult.addCallback(MochiKit.Base.method(this, 'takeSnapshotOfCurrentData'));
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'updatedProgressState', 'saveCard_updatingInterface');
                deferredResult.addCallback(MochiKit.Base.method(this, 'setIsBrandNew'), false);
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'recordUpdated');
                deferredResult.addCallback(Clipperz.NotificationCenter.deferredNotification, this, 'notify', 'directLoginUpdated');
                deferredResult.callback();
                
                return deferredResult;
        },
        */
        //-------------------------------------------------------------------------
        'cancelChanges': function() {
 //MochiKit.Logging.logDebug(">>> Record.cancelChanges");
 //MochiKit.Logging.logDebug("--- Record.cancelChanges - cachedData: " + Clipperz.Base.serializeJSON(this.cachedData()));
                if (this.isBrandNew()) {
                        this.user().removeRecord(this);
                } else {
                        this.restoreValuesFromSnapshot(this.cachedData());
                }
 //MochiKit.Logging.logDebug("<<< Record.cancelChanges");
        },
        
        //-------------------------------------------------------------------------
        'restoreValuesFromSnapshot': function(someSnapshotData) {
                        varsnapshotData;
                
 //MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.restoreValuesFromSnapshot");
                snapshotData = Clipperz.Base.evalJSON(someSnapshotData);
 //MochiKit.Logging.logDebug("--- Record.restoreValuesFromSnapshot - someSnapshotData (1): " + Clipperz.Base.serializeJSON(someSnapshotData));
                this.setLabel(snapshotData['label']);
                this.resetDirectLogins();
                this.setShouldProcessData(true);
                this.processData(snapshotData);
 //MochiKit.Logging.logDebug("--- Record.restoreValuesFromSnapshot - snapshotData: (2)" + Clipperz.Base.serializeJSON(snapshotData));
                
                this.resetRemovedDirectLogins();
                
                {
                        var currentSnapshot;
                                varcomparisonResult;
                        
                        currentSnapshot = this.currentDataSnapshot();
 //MochiKit.Logging.logDebug("--- Record.restoreValuesFromSnapshot - 1");
 //console.log("snapshot data: %o", someSnapshotData.currentVersion);
 //console.log("current data: %o", currentSnapshot.currentVersion);
 //MochiKit.Logging.logDebug("--- Record.restoreValuesFromSnapshot - someSnapshotData: " + Clipperz.Base.serializeJSON(someSnapshotData.currentVersion));
 //MochiKit.Logging.logDebug("--- Record.restoreValuesFromSnapshot - currentSnapshot: " + Clipperz.Base.serializeJSON(currentSnapshot.currentVersion));
                        comparisonResult = MochiKit.Base.compare(someSnapshotData.currentVersion, currentSnapshot.currentVersion);
 //MochiKit.Logging.logDebug("--- Record.restoreValuesFromSnapshot - " + comparisonResult);
                }
 //MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.restoreValuesFromSnapshot");
        },
        
        //-------------------------------------------------------------------------
        __syntaxFix__: "syntax fix"
 });
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
index 299ebc7..ab1bb0f 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -1,1256 +1,1256 @@
 /*
 Copyright 2008-2011 Clipperz Srl
 This file is part of Clipperz Community Edition.
 Clipperz Community Edition is an online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz Community Edition is free software: you can redistribute
  it and/or modify it under the terms of the GNU Affero General Public
  License as published by the Free Software Foundation, either version
  3 of the License, or (at your option) any later version.
 * Clipperz Community Edition is distributed in the hope that it will
  be useful, but WITHOUT ANY WARRANTY; without even the implied
  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the GNU Affero General Public License for more details.
 * You should have received a copy of the GNU Affero General Public
  License along with Clipperz Community Edition.  If not, see
  <http://www.gnu.org/licenses/>.
 */
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Strings) == 'undefined') { Clipperz.PM.Strings = {}; }
 if (typeof(Clipperz.PM.Strings.Languages) == 'undefined') { Clipperz.PM.Strings.Languages = {}; }
 //=============================================================================
 //
        //      E N G L I S H   A M E R I C A N  ( en_US )
 //
 //=============================================================================
 Clipperz.PM.Strings.Languages['en-us'] = {
        //Login page - description
 'clipperzServiceDescription': "\
                <!--    FIX CSS                 DONE    -->\
        <h2>Keep it to yourself!</h2>\
        <ul>\
                <li>\
                        <h3>Clipperz is:</h3>\
                        <ul>\
                                <li><p>a secure and simple password manager</p></li>\
                                <li><p>an effective single sign-on solution</p></li>\
                                <li><p>a digital vault for your personal data</p></li>\
                        </ul>\
                </li>\
                <li>\
                        <h3>With Clipperz you can:</h3>\
                        <ul>\
                                <li><p>store and manage your passwords and online credentials</p></li>\
                                <li><p>login to your web services without entering any username or password</p></li>\
                                <li><p>protect all your sensitive data: codes for burglar alarms, PINs, credit card numbers, …</p></li>\
                                <li><p>share secrets with family members and associates (coming soon)</p></li>\
                        </ul>\
                </li>\
                <li>\
                        <h3>Clipperz benefits:</h3>\
                        <ul>\
                                <li><p>free and completely anonymous</p></li>\
                                <li><p>access it any time from any computer</p></li>\
                                <li><p>no software to download and nothing to install</p></li>\
                                <li><p>avoid keeping secrets on your PC or on paper</p></li>\
                        </ul>\
                </li>\
                <li>\
                        <h3>Clipperz security:</h3>\
                        <ul>\
                                <li><p>your secrets are locally encrypted by your browser before being uploaded to Clipperz</p></li>\
                                <li><p>the encryption key is a passphrase known only to you</p></li>\
                                <li><p>Clipperz hosts your sensitive data in encrypted form and could never actually access the data in its plain form</p></li>\
                                <li><p>Clipperz is built upon standard encryption schemes, nothing fancies or homemade</p></li>\
                                <li><p>you can review the source code anytime you like, but you need to know nothing about cryptography to be an happy user!</p></li>\
                        </ul>\
                </li>\
                <li>\
                        <a href=\"http://www.clipperz.com\" target=\"_blank\">Learn more</a>\
                </li>\
        </ul>",
                
        'loginFormTitle':                                                       "login with your Clipperz account",
        'loginFormUsernameLabel':                                       "username",
        'loginFormPassphraseLabel':                                     "passphrase",
        'loginFormDontHaveAnAccountLabel':                      "don\'t have an account?",
        'loginFormCreateOneLabel':                                      "create one",
        'loginFormForgotYourCredentialsLabel':          "forgot your credentials?",
        'loginFormAarghThatsBadLabel':                          "aargh! that\'s bad!",
        'loginFormAfraidOfMaliciousScriptsLabel':       "afraid of malicious scripts?",
        'loginFormVerifyTheCodeLabel':                          "verify the code",
        'loginFormButtonLabel':                                                 "Login",
        'loginFormOneTimePasswordCheckboxLabel':    "use a one-time passphrase",
 'loginFormOneTimePasswordCheckboxDescription':  "",
 // Login page - language selection
        'loginPanelSwithLanguageDescription':           "<h5>Switch to your preferred language</h5>",
 // Login page - browser compatibility
        'browserCompatibilityDescription':                      "<p>Have a better and safer Clipperz experience with Firefox. However Clipperz works just fine also with Opera, Safari and MS Internet Explorer!</p>",
 // Login with OTP - message panel
        'OTPloginMessagePanelInitialTitle':                     "Logging in using a one-time passphrase",
        'OTPloginMessagePanelInitialText':                      "Sending OTP credentials …",
        'OTPloginMessagePanelLoadingTitle':                     "Logging in using a one-time passphrase",
        'OTPloginMessagePanelLoadingText':                      "Fetching encrypted authentication data from the server …",
        'OTPloginMessagePanelProcessingTitle':          "Logging in using a one-time passphrase",
        'OTPloginMessagePanelProcessingText':           "Local decryption of authentication data",
 // Regular login - message panel
        'loginMessagePanelInitialTitle':                        "Logging in …",
        'loginMessagePanelInitialText':                                 "---",
        'loginMessagePanelInitialButtonLabel':          "Cancel",
        'loginMessagePanelConnectedTitle':                      "Connected",
        'loginMessagePanelConnectedText':                       "Done",
        'loginMessagePanelFailureTitle':                        "Error",
        'loginMessagePanelFailureText':                                 "Login failed",
        'loginMessagePanelFailureButtonLabel':          "Close",
 // Regular login - message panel - connection
        'connectionLoginSendingCredentialsMessageTitle':        "Verifying credentials",
        'connectionLoginSendingCredentialsMessageText':                 "Sending credentials",
        'connectionLoginCredentialsVerificationMessageTitle':"Verifying credentials",
        'connectionLoginCredentialsVerificationMessageText':"Performing SRP authentication",
        'connectionLoginDoneMessageTitle':                                      "Verifying credentials",
        'connectionLoginDoneMessageText':                                       "Connected",
        
        //Regular login - message panel - user
        'userLoginPanelUpgradingUserCredentialsMessageTitle':                           "Verifying credentials",
        'userLoginPanelUpgradingUserCredentialsMessageText':                            "Upgrading your credentials to a new authentication schema",
        'userLoginPanelConnectedMessageTitle':                                                          "User authenticated",
        'userLoginPanelConnectedMessageText':                                                           "Successfully logged in",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':                      "Verifying credentials",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':                       "Trying an older authentication schema",
        'userLoginPanelLoadingUserDataMessageTitle':                                            "User authenticated",
        'userLoginPanelLoadingUserDataMessageText':                                                     "Downloading encrypted card headers from Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':                                                 "User authenticated",
        'userLoginPanelDecryptingUserDataMessageText':                                          "Local decryption of card headers",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':                           "User authenticated",
        'userLoginPanelDecryptingUserStatisticsMessageText':                            "Local decryption of usage statistics",
        
        //Registration page - splash alert
        'splashAlertTitle':"Welcome to Clipperz!",
 'splashAlertText': "\
                <!--    FIX CSS                 DONE!   -->\
        <p>Some security advice</p>\
        <ul>\
                <li><p>Storing your data at Clipperz is as secure as the passphrase you choose to protect them. Nobody can access them unless they know your passphrase.</p></li>\
                <li><p>If you are going to use Clipperz for safeguarding sensitive and critical information please make sure to use a strong passphrase. The longer the better!</p></li>\
                <li><p>Clipperz will not be able to recover a lost passphrase!</p></li>\
        </ul>\
        <p>For any further information, please refer to <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p>",
        'splashAlertCloseButtonLabel':"Ok",
        
        // Registration page - form
        'registrationFormTitle':                                                        "create your account",
        'registrationFormUsernameLabel':                                        "username",
        'registrationFormPassphraseLabel':                                      "passphrase",
        'registrationFormRetypePassphraseLabel':                        "re-enter passphrase",
        'registrationFormSafetyCheckLabel':                                     "I understand that Clipperz will not be able to recover a lost passphrase.",
        'registrationFormTermsOfServiceCheckLabel':                     "I have read and agreed to the <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Terms of Service</a>.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':       "do you already have an account?",
        'registrationFormSimplyLoginLabel':                                     "simply login",
        'registrationFormButtonLabel':                                          "Register",
 // Registration page - warning messages
        'registrationFormWarningMessageNotMatchingPassphrases':"Your passphrases don't match, please re-type them.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Please read and check all the boxes below.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"You need to agree to the Terms of Service.",
        // Registration page - message panel
        'registrationMessagePanelInitialTitle':                                 "Creating account …",
        'registrationMessagePanelInitialText':                          "---",
        'registrationMessagePanelInitialButtonLabel':           "Cancel",
        'registrationMessagePanelRegistrationDoneTitle':        "Registration",
        'registrationMessagePanelRegistrationDoneText':                 "Done",
        'registrationMessagePanelFailureTitle':                                 "Registration failed",
        'registrationMessagePanelFailureButtonLabel':           "Close",
 // Registration page - message panel - connection
        'connectionRegistrationSendingRequestMessageText':      "Verifying credentials",
        'connectionRegistrationSendingCredentialsMessageText':"Sending credentials",
 // Registration page - splash panel
        'registrationSplashPanelTitle':                         "Security advice",
        'registrationSplashPanelDescription':   "<p>These are your Clipperz credentials, take good care of them. Clipperz will never display your username and passphrase a second time!</p>",
        'registrationSplashPanelUsernameLabel':         "username",
        'registrationSplashPanelPassphraseLabel':"passphrase",
        
        'registrationSplashPanelShowPassphraseButtonLabel':"show passphrase",
        
        //Header links
        'donateHeaderLinkLabel':                                "donate",
        'creditsHeaderLinkLabel':                               "credits",
        'feedbackHeaderLinkLabel':                              "feedback",
        'helpHeaderLinkLabel':                                  "help",
        'forumHeaderLinkLabel':                                         "forum",
        
        //Menu labels
        'recordMenuLabel':                                              "cards",
        'accountMenuLabel':                                             "account",
        'dataMenuLabel':                                                "data",
        'contactsMenuLabel':                                    "contacts",
        'toolsMenuLabel':                                               "tools",
        'logoutMenuLabel':                                              "logout",
        'lockMenuLabel':                                                "lock",
        //Lock dialog
        'lockTitle':                                                    "The account is locked",
        'lockDescription':                                              "<p>To unlock your account, please enter your passphrase.</p>",
        'unlockButtonLabel':                                    "Unlock",
                
        //Account panel - change passphrase
        'changePasswordTabLabel':                               "Change your passphrase",
        'changePasswordTabTitle':                               "Change your passphrase",
        'changePasswordFormUsernameLabel':              "username",
        'changePasswordFormOldPassphraseLabel':         "old passphrase",
        'changePasswordFormNewPassphraseLabel':         "new passphrase",
        'changePasswordFormRetypePassphraseLabel':"re-enter new passphrase",
        'changePasswordFormSafetyCheckboxLabel':"I understand that Clipperz will not be able to recover a lost passphrase.",
        'changePasswordFormSubmitLabel':                "Change passphrase",
        //Account panel - change passphrase - warning messages
        'changePasswordFormWrongUsernameWarning':               "Wrong username",
        'changePasswordFormWrongPassphraseWarning':             "Wrong passphrase",
        'changePasswordFormWrongRetypePassphraseWarning':"Your passphrases don't match, please re-type them.",
        'changePasswordFormSafetyCheckWarning':                         "Please read and check the box below.",
        //Account panel - change passphrase - progress dialog
        'changePasswordFormProgressDialogTitle':                                                        "Changing user credentials",
        'changePasswordFormProgressDialogEmptyText':                                            "---",
        'changePasswordFormProgressDialogConnectedMessageTitle':                        "Connected",
        'changePasswordFormProgressDialogConnectedMessageText':                                 "Done",
        'changePasswordFormProgressDialogErrorMessageTitle':                            "Error",
        'changePasswordFormProgressDialogErrorMessageText':                                     "Credentials change failed!",
        'changeCredentialsPanelEncryptingDataMessageTitle':                                     "Changing your passphrase",
        'changeCredentialsPanelEncryptingDataMessageText':                                      "Local encryption of card headers",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':                     "Changing your passphrase",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':                      "Updating your credentials",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Changing your passphrase",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Uploading your encrypted credentials to Clipperz",
        'changeCredentialsPanelDoneMessageTitle':                                                       "Changing your passphrase",
        'changeCredentialsPanelDoneMessageText':                                                        "Done",
        //Account panel - OTP
        'manageOTPTabLabel':    "Manage your one-time passphrases",
        'manageOTPTabTitle':    "Manage your one-time passphrases",
        'manageOTPTabDescription':"\
        <p>A one-time passphrase works like your regular passphrase, but can be used only once.</p>\
        <p>If the same passphrase is used again at a later stage in a login attempt it will be rejected and the login process will fail.</p>\
        <p>Immediately after a successful login, your one-time passphrase will be deleted preventing any fraudulent access.</p>\
        <p>One-time passphrases are an excellent choice if one is concerned about keyloggers or spyware infections that may be collecting data from compromised machines.</p>\
        <p><b>It's strongly advisable to use one-time passphrases when accessing Clipperz from public terminals, such as Internet cafes and libraries.</b></p>",
        //Account panel - OTP - OTP table
 'oneTimePasswordReadOnlyMessage': "\
        <h6>Sorry!</h6>\
        <p>You cannot manage your one-time passphrases when using the offline version of Clipperz.</p>",
        'oneTimePasswordLoadingMessage':"\
        <h6>Loading data</h6>\
        <p>Please wait …</p>",
        'oneTimePasswordNoPasswordAvailable':"\
        <h6>No one-time passphrase available</h6>\
        <p>Click the “New” button above to add one-time passphrases to your account.</p>",
        'createNewOTPButtonLabel':                              "New",
        'deleteOTPButtonLabel':                                         "Delete",
        'printOTPButtonLabel':                                  "Print",
        'disabledOneTimePassword_warning':              "disabled",
        'oneTimePasswordSelectionLink_selectLabel':"Select:",
        'oneTimePasswordSelectionLink_all':             "all",
        'oneTimePasswordSelectionLink_none':    "none",
        'oneTimePasswordSelectionLink_used':    "used",
        'oneTimePasswordSelectionLink_unused':  "unused",
 //Account panel - OTP - saving new OTP dialog
        'saveOTP_encryptUserDataTitle':                         "Saving one-time passphrase",
        'saveOTP_encryptUserDataText':                  "Processing new OTP credentials …",
        'saveOTP_encryptOTPDataTitle':                  "Saving one-time passphrase",
        'saveOTP_encryptOTPDataText':                   "Local encryption of authentication data …",
        'saveOTP_sendingDataTitle':                             "Saving one-time passphrase",
        'saveOTP_sendingDataText':                              "Sending authentication data to the server …",
        'saveOTP_updatingInterfaceTitle':               "Saving one-time passphrase",
        'saveOTP_updatingInterfaceText':                "Updating interface",
                                                
 // Account panel - preferences
        'accountPreferencesLabel':                              "Preferences",
        'accountPreferencesTabTitle':                   "Preferences",
        'accountPreferencesLanguageTitle':              "Language",
        'accountPreferencesLanguageDescription':"<p>Choose your preferred language from the list below.</p>",
        'showDonationReminderPanelTitle':               "Donation reminders",
        'showDonationReminderPanelDescription':         "<p>Show donation reminders</p>",
        
        'saveUserPreferencesFormSubmitLabel':   "Save",
        'cancelUserPreferencesFormSubmitLabel':         "Cancel",
 // Account panel - preferences - saving dialog
        'accountPreferencesSavingPanelTitle_Step1':     "Saving preferences",
        'accountPreferencesSavingPanelText_Step1':      "Local encryption of your preferences",
        'accountPreferencesSavingPanelTitle_Step2':     "Saving preferences",
        'accountPreferencesSavingPanelText_Step2':      "Sending encrypted preferences to Clipperz",
        //Account panel - login history
        'accountLoginHistoryLabel':                                     "Login history",
        'loginHistoryTabTitle':                                                 "Login history",
        'loginHistoryReadOnlyMessage':  "\
        <h6>Sorry!</h6>\
        <p>The login history is not available while using the offline version of Clipperz.</p>",
        
        'loginHistoryLoadingMessage':   "\
        <h6>Loading data</h6>\
        <p>Please wait …</p>",
        
        'loginHistoryLoadedMessage':    "\
        <h6>Your latest 10 logins</h6>\
        <p></p>",
        'loginHistoryIPLabel':                                  "IP",
        'loginHistoryTimeLabel':                                "date",
        'loginHistoryCurrentSessionText':               "current session",
        'loginHistoryReloadButtonLabel':                "Reload login history",
        //Account panel - delete account
        'deleteAccountTabLabel':                                "Delete your account",
        'deleteAccountTabTitle':                                "Delete your account",
        'deleteAccountFormUsernameLabel':               "username",
        'deleteAccountFormPassphraseLabel':             "passphrase",
        'deleteAccountFormSafetyCheckboxLabel':         "I understand that all my data will be deleted and that this action is irreversible.",
        'deleteAccountFormSubmitLabel':                         "Delete my account",
 //Account panel - delete account - warnings
        'deleteAccountFormWrongUsernameWarning':"Wrong username",
        'deleteAccountFormWrongPassphraseWarning':"Wrong passphrase",
        'deleteAccountFormSafetyCheckWarning':  "Please read and check the box below.",
 //Account panel - delete account - confirmation
        'accountPanelDeletingAccountPanelConfirmationTitle':"ATTENTION",
        'accountPanelDeleteAccountPanelConfirmationText':       "Are your sure you want to delete your account?",
        'accountPanelDeleteAccountPanelConfirmButtonLabel':     "Yes",
        'accountPanelDeleteAccountPanelDenyButtonLabel':        "No",
 //Account panel - delete account - confirmation
        'accountPanelDeletingAccountPanelProgressTitle':        "Deleting the account data",
        'accountPanelDeletingAccountPanelProgressText':                 "The operation could take long, please be patient.",
 //Data panel - offline copy
        'offlineCopyTabLabel':                                                          "Offline copy",
        'offlineCopyTabTitle':                                                          "Offline copy",
        
 'offlineCopyTabDescription': "\
                <!--    FIX CSS                 DONE!   -->\
        <p>With just one click you can dump all your encrypted data from Clipperz servers to your hard disk and create a read-only offline version of Clipperz to be used when you are not connected to the Internet.</p>\
        <p>The read-only version is as secure as the read-and-write one and will not expose your data to higher risks since they both share the same code and security architecture.</p>\
        <ol>\
                <li><p>Click the link below to start the download.</p></li>\
                <li><p>The browser will ask you what to do with the “Clipperz_YYYYMMDD.html” file. Save it on your hard disk.</p></li>\
                <li><p>Double click on the downloaded file to launch the offline version in your browser.</p></li>\
                <li><p>Enter the usual username and passphrase.</p></li>\
        </ol>",
        'offlineCopyDownloadLinkLabel':         "Download",
        //Data panel - offline copy - not updated
        'offlineCopyDownloadWarning':   "\
                <!--    FIX CSS                 DONE!   -->\
        <h4><a href=\"#\" id=\"offlineCopyDownloadWarningLink\">Update your “offline copy”!</a></h4>\
        <p>You have recently created or modified one or more cards, it would be wise to download a new copy of the offline version.</p>",
        'offlineCopyDownloadOk':                                                        "",
        //Data panel - sharing
        'sharingTabLabel':                              "Sharing",
        'sharingTabTitle':                              "Sharing",
        'sharingTabDescription':                "\
        <p>Quite often a confidential piece of information needs to be shared with one or more persons.</p>\
        <p>This could be as simple as giving your colleague the access code of your voice mailbox when you are out of the office, or as complicated as enabling the entitled heirs to access your safe deposit box at the local bank when you pass on.</p>\
        <p>Clipperz can make sharing your secrets a secure and straightforward process.</p>\
        <p></p>\
        <p><b>Coming soon …</b></p>",
        
        // Data panel - import
        'importTabLabel':                               "Import",
        'importTabTitle':                               "Import",
        'importTabDescription':                         "<p>You can bulk import data to your Clipperz account from several file formats.</p>",
        
        //Data panel - export
        'printingTabLabel':                             "Export",
        'printingTabTitle':                             "Export",
        'printingTabDescription':               "\
        <h5>Printing</h5>\
        <p>Click on the link below to open a new window displaying all your cards in a printable format.</p>\
        <p>If you are going to print for backup purposes, please consider the safer option provided by the “offline copy”.</p>",
        'printingLinkLabel':                    "Printable version",
        'exportTabDescription':                         "\
        <h5>Exporting to JSON</h5>\
        <p>JSON enables a “lossless” export of your cards. All the information will be preserved, including direct login configurations.</p>\
        <p>This custom format it’s quite convenient if you need to move some of all of your cards to a different Clipperz account. Or if you want to restore a card that has been accidentally deleted.</p>\
        <p>Click on the link below to start the export process.</p>",
        'exportLinkLabel':                              "Export to JSON",
        'exportDataInProgressDescription':"<h4>Exporting, please wait while your data are being processed …</h4>",
        'exportDataDescription':                "\
        <h4>Instructions</h4>\
        <p>Copy the text below to your favorite editor and save it. (e.g. “clipperz_export_20071217.json”)</p>",
        
        //Contacts panel
        'contactsTabLabel':                             "Contacts",
        'contactsTabTitle':                             "Contacts",
 //Tools panel - password generator
        'passwordGeneratorTabLabel':    "Password generator",
        'bookmarkletTabLabel':                  "Bookmarklet",
        'compactTabLabel':                              "Compact edition",
        'httpAuthTabLabel':                             "HTTP authentication",
        'passwordGeneratorTabTitle':    "Password generator",
        'bookmarkletTabTitle':                  "Bookmarklet",
        'compactTabTitle':                              "Compact edition",
        'httpAuthTabTitle':                             "HTTP authentication",
        
        
        //Tools panel - password generator - description
        'paswordGeneratorTabDescription':"<p></p>",
        'passwordGeneratorTabButtonLabel':"Generate password",
        //Tools panel - bookmarklet
        'bookmarkletTabLabel':                  "Bookmarklet",
        'bookmarkletTabTitle':                  "Bookmarklet",
                
        'bookmarkletTabDescription':    "\
                <!--    FIX CSS                 DONE!   -->\
        <p>A bookmarklet is a simple “one-click” tool that can perform very useful tasks. It can be saved and used like a normal web page bookmark.</p>\
        <p>The Clipperz bookmarklet will help you to quickly create new cards and new “direct logins” within existing cards.</p>\
        <p><b>Please note that the bookmarklet does not include any information related to your account (e.g. your username or passphrase), the bookmarklet is a general tool containing the same code for every Clipperz user.</b></p>\
        <h3>How to install the bookmarklet</h3>\
        <h>Firefox, Camino, Opera, Safari</h5>\
        <ol>\
                <li><p>Make sure that the “Bookmarks Bar” is displayed by selecting “View > Toolbars > Bookmarks”, or similar menu items, from the browser menu.</p></li>\
                <li><p>Drag and drop the “Add to Clipperz” link below to the bookmark bar.</p></li>\
        </ol>\
        \
        <h5>Internet Explorer</h5>\
        <ol>\
                <li><p>Make sure that the “Links” toolbar is displayed by selecting “View > Toolbars > Links” from the browser menu.</p></li>\
                <li><p>Right-click on the “Add to Clipperz” link below.</p></li>\
                <li><p>Select “Add to favorites” from the contextual menu.</p></li>\
                <li><p>Click “Yes” for any security message that pops up.</p></li>\
                <li><p>Open the “Links” folder and click “OK”</p></li>\
        </ol>",
        
        'bookmarkletTabBookmarkletTitle':"Add to Clipperz",
        //Tools panel - bookmarklet - instructions
        'bookmarkletTabInstructions':   "\
                <!--    FIX CSS                 DONE!   -->\
        <h3>How to create a new card inclusive of a “direct login” link to an online service</h3>\
        <ol>\
                <li><p>Open the web page where the login form is hosted. (this is the page where you usually enter your sign-in credentials)</p></li>\
                <li><p>Launch the bookmarklet by clicking on it: a pop-up window will appear over the web page.</p></li>\
                <li><p>Copy to the clipboard the content of the large text area within the pop-up. (ctrl-C)</p></li>\
                <li><p>Enter your Clipperz account and click on the <b>Add new card</b> button.</p></li>\
                <li><p>Select the “Direct login” template and paste the content of the clipboard to the large text area in the form. (ctrl-V)</p></li>\
                <li><p>Press the <b>Create</b> button, complete and review the details, then click <b>Save</b>.</p></li>\
        </ol>\
        \
        <h3>How to add a “direct login” link to an existing card</h3>\
        <ol>\
                <li><p>Same as above.</p></li>\
                <li><p>Same as above.</p></li>\
                <li><p>Same as above.</p></li>\
                <li><p>Enter your Clipperz account and select the card containing the credentials for the web service you just visited and click the <b>Edit</b> button.</p></li>\
                <li><p>Paste the content of the clipboard to the large text area in the “Direct logins” section. (ctrl-V)</p></li>\
                <li><p>Press the <b>Add direct login</b> button, review the details and then click <b>Save</b>.</p></li>\
        </ol>\
        \
        <p></p>\
        <p>Further information about the bookmarklet are <a href=\"http://www.clipperz.com/support/user_guide/bookmarklet\" target=\"_blank\">available here</a>.</p>",
        //Tools panel - Compact - instructions
        'compactTabDescription':                        "\
                <!--    FIX CSS                 DONE!   -->\
        <p>Clipperz Compact is a special version of Clipperz designed to be opened in the Firefox sidebar.</p>\
        <p>Its purpose is to keep your collection of “direct logins” always at hand. Read more <a href=\"http://www.clipperz.com/support/user_guide/clipperz_compact\", target=\"blank\">here</a></p>\
        \
        <h3>How to launch Clipperz Compact in the sidebar</h3>\
        <ol>\
                <li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\
                <li>\
                        <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
-                        <div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
+                        <div id=\"compactLinkBox\"><a href=\"./index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
                </li>\
                <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
        </ol>\
        \
        <h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>",
        //Tools panel - HTTP authentication - instructions
        'httpAuthTabDescription':                               "\
                <!--    FIX CSS                 DONE!   -->\
        <p>HTTP authentication is a method designed to allow a web browser to provide credentials – in the form of a username and password – including them in a website address (HTTP or HTTPS URL).</p>\
        <p>Nowadays it is rarely used, but it can still be found on small, private websites. You can tell that a website is protected by HTTP authentication when the browser displays a pop-up window to enter username and password.</p>\
        <p>Unfortunately the Clipperz bookmarklet does not work on websites that use HTTP authentication. However you can still create a “direct login”.</p>\
        \
        <h3>How to create a “direct login” for a website that uses HTTP authentication</h3>\
        <ol>\
                <li><p>Store website URL, username and password in a new card.</p></li>\
                <li><p>Copy the configuration below and paste it to the large text area in the “Direct logins” section of the new card.</p></li>\
                <li><p>Press the <b>Add direct login</b> button, bind URL, username and password fields and then click <b>Save</b>.</p></li>\
        </ol>\
        \
        <h5><a href=\"http://support.microsoft.com/kb/834489\" target=\"_blank\">Warning: Internet Explorer does not support HTTP authentication.</a></h5>",
        
 // Direct logins block
        'mainPanelDirectLoginBlockLabel':               "Direct logins",
        'directLinkReferenceShowButtonLabel':   "show",
        
 // Direct logins - blank slate
        'mainPanelDirectLoginBlockDescription':         "\
                <!--    FIX CSS                 DONE!   -->\
        <p>Add “direct logins” to sign in to your web accounts without typing usernames and passwords!</p>\
        <p>“Direct logins” greatly enhance your password security since you can:</p>\
        <ul>\
                <li><p>conveniently adopt and enter complex passwords;</p></li>\
                <li><p>never re-use the same and easy-to-guess password.</p></li>\
        </ul>\
        <p>Simple and quick configuration with the <b>Clipperz bookmarklet</b>.</p>\
        <a href=\"http://www.clipperz.com/support/user_guide/direct_logins\" target=\"_blank\">Learn more about “direct logins”</a>",
        // Cards block  
        'mainPanelRecordsBlockLabel':                   "Cards",
        'mainPanelAddRecordButtonLabel':                "Add new card",
        'mainPanelRemoveRecordButtonLabel':             "Delete card",
 // Cards block - filter tabs
        'mainPanelRecordFilterBlockAllLabel':   "all",
        'mainPanelRecordFilterBlockTagsLabel':  "tags",
        'mainPanelRecordFilterBlockSearchLabel':"search",
        
 // Cards block - blank slate
        'recordDetailNoRecordAtAllTitle':               "Welcome to Clipperz!",
        'recordDetailNoRecordAtAllDescription':         "\
        <h5>Get started by adding cards to your account.</h5>\
        <p>Cards are simple and flexible forms where you can store your passwords and any other confidential data.</p>\
        <p>Cards could contain credentials for accessing a web site, the combination of your bicycle lock, details of your credit card, …</p>\
        \
        <h5>Don't forget the Clipperz bookmarklet!</h5>\
        <p>Before you start, install the “Add to Clipperz” bookmarklet: it will make creating cards easier and more fun.</p>\
        <p>Go to the “Tools” tab to discover how to install it and how it use it.</p>\
        <p></p>\
        <p>Then simply click the <b>\"Add new card\"</b> button and enjoy your Clipperz account.</p>\
        <p></p>\
        <a  href=\"http://www.clipperz.com/support/user_guide/managing_cards\" target=\"_blank\">Learn more about creating and managing cards</a>",
 // Cards block - new card wizard - bookmarklet configuration
        'newRecordWizardTitleBox':                              "\
        <h5>Please select a template</h5>\
        <p>Cards are simple and flexible forms where you can store passwords or any other confidential data.</p>\
        <p>Start choosing one of the templates below. You can always customize your cards later by adding or removing fields.</p>",
        
        'newRecordWizardBookmarkletConfigurationTitle':                 "Direct login",
        'newRecordWizardBookmarkletConfigurationDescription':"\
        <p>Paste below the configuration code generated by the Clipperz bookmarklet.</p>\
        <p>A new card complete with a direct login to your web account will be created.</p>",
        'newRecordWizardCreateButtonLabel':                                     "Create",
        'newRecordWizardCancelButtonLabel':                                     "Cancel",
        
        //Create new card - Donation splash
        'donateSplashPanelTitle':                                                       "Support Clipperz, make a donation today!",
        'donateSplashPanelDescription':                                         "\
                <!--    FIX CSS                 DONE!   -->\
        <p>A few good reasons to make a donation:</p>\
        <ul>\
                <li><p>support the development of new features</p></li>\
                <li><p>keep Clipperz free</p></li>\
                <li><p>show appreciation for our hard work</p></li>\
        </ul>\
        <p>For any further information, please visit our <a href=\"http://www.clipperz.com/donations\" target=\"_blank\">Donations page</a>.</p>\
        <p><b>Ready to donate?</b></p>",
        'donateCloseButtonLabel':                                                       "Not yet",
        'donateDonateButtonLabel':                                                      "Yes",
        
 // Card templates
 'recordTemplates': {
 //Web password
        'WebAccount': {
                        'title':        "Web password",
                        'description':"<p>A simple card to store login credentials for your online services.</p>",
                'fields': [
                        {label:"Web address", type:'URL'},
                        {label:"Username or email", type:'TXT'},
                        {label:"Password", type:'PWD'}
                ]
        },
        //Bank account
        'BankAccount': {
                        'title':        "Bank account",
                        'description':"<p>Safely store your bank account number and online banking credentials.</p>",
                'fields': [
                        {label:"Bank", type:'TXT'},
                        {label:"Account number", type:'TXT'},
                        {label:"Bank website", type:'URL'},
                        {label:"Online banking ID", type:'TXT'},
                        {label:"Online banking password", type:'PWD'}
                ]
        },
        // Credit card
        'CreditCard': {
                        'title':        "Credit card",
                        'description':"<p>Card number, expire date, CVV2 and PIN always at hand with Clipperz.</p>",
                'fields': [
                        {label:"Type (Visa, AmEx, …)", type:'TXT'},
                        {label:"Number", type:'TXT'},
                        {label:"Owner name", type:'TXT'},
                        {label:"Expiry date", type:'TXT'},
                        {label:"CVV2", type:'TXT'},
                        {label:"PIN", type:'PWD'},
                        {label:"Card website", type:'URL'},
                        {label:"Username", type:'TXT'},
                        {label:"Password", type:'PWD'}
                ]
        },
        //      Address book entry
        'AddressBookEntry': {
                        'title':        "Address book entry",
                        'description':"<p>Clipperz could also work as your new private address book. Use this template to easily add a new entry.</p>",
                'fields': [
                        {label:"Name", type:'TXT'},
                        {label:"Email", type:'TXT'},
                        {label:"Phone", type:'TXT'},
                        {label:"Mobile", type:'TXT'},
                        {label:"Address", type:'ADDR'},
                ]
        },
 //Custom card
        'Custom': {
                        'title':        "Custom card",
                        'description':"<p>No matter which kind of confidential data you need to protect, create a custom card to match your needs.</p>",
                'fields': [
                        {label:"Label 1", type:'TXT'},
                        {label:"Label 2", type:'TXT'},
                        {label:"Label 3", type:'TXT'}
                ]
        }
 },
 'recordFieldTypologies': {
        'TXT': {
                description: "simple text field",
                shortDescription: "text"
        },
        'PWD': {
                description: "simple text field, with default status set to hidden",
                shortDescription: "password"
        },
        'URL': {
                description: "simple text field in edit mode, that became an active url in view mode",
                shortDescription: "web address"
        },
        'DATE': {
                description: "a value set with a calendar helper",
                shortDescription: "date"
        },
        'ADDR': {
                description: "just like the URL, but the active link points to Google Maps (or similar service) passing the address value as argument",
                shortDescription: "street address"
        },
        'CHECK': {
                description: "check description",
                shortDescription: "check"
        },
        'RADIO': {
                description: "radio description",
                shortDescription: "radio"
        },
        'SELECT': {
                description: "select description",
                shortDescription: "select"
        }
 },
 // Cards block - new card - warnings
        'newRecordPanelGeneralExceptionTitle':                                  "Error",
        'newRecordPanelGeneralExceptionMessage':                                "The configuration text is not valid. Make sure to get your text from the bookmarklet pop-up and retry.",
        'newRecordPanelWrongBookmarkletVersionExceptionTitle':  "Error",
        'newRecordPanelWrongBookmarkletVersionExceptionMessage':"The configuration text has been generated by an old version of the bookmarklet. Please update your bookmarklet and retry.",
        'newRecordPanelExceptionPanelCloseButtonLabel':                         "Cancel",
 // Cards block - delete card
        'mainPanelDeletingRecordPanelConfirmationTitle':                "Deleting selected card",
        'mainPanelDeleteRecordPanelConfirmationText':                   "Do your really want to delete the selected card?",
        'mainPanelDeleteRecordPanelConfirmButtonLabel':                         "Yes",
        'mainPanelDeleteRecordPanelDenyButtonLabel':                    "No",
        'mainPanelDeletingRecordPanelInitialTitle':                             "Deleting selected card",
        'mainPanelDeletingRecordPanelInitialText':                              "---",
        'mainPanelDeletingRecordPanelCompletedText':                    "Done",
 // Cards block - delete card panel
        'deleteRecordPanelCollectRecordDataMessageTitle':                  "Delete card",
        'deleteRecordPanelCollectRecordDataMessageText':                   "Updating card list",
        'deleteRecordPanelEncryptUserDataMessageTitle':                            "Delete card",
        'deleteRecordPanelEncryptUserDataMessageText':                     "Local encryption of card headers",
        'deleteRecordPanelSendingDataToTheServerMessageTitle':     "Delete card",
        'deleteRecordPanelSendingDataToTheServerMessageText':      "Uploading encrypted card headers to Clipperz",
        'deleteRecordPanelUpdatingTheInterfaceMessageTitle':       "Delete card",
        'deleteRecordPanelUpdatingTheInterfaceMessageText':                "Updating the interface",
        
 // Cards block - no record selected
        'recordDetailNoRecordSelectedTitle':                                    "No card selected",
        'recordDetailNoRecordSelectedDescription':                              "<p>Please select a card from the list on the left.</p>",
        // Cards block - loading messages
        'recordDetailLoadingRecordMessage':                                             "Downloading encrypted card from Clipperz",
        'recordDetailDecryptingRecordMessage':                                  "Local decryption of card\'s data",
        'recordDetailLoadingRecordVersionMessage':                              "Downloading latest card version",
        'recordDetailDecryptingRecordVersionMessage':                   "Local decryption of latest version",
        'recordDetailLoadingErrorMessageTitle':                                         "Error while downloading the card",
        
 // Cards block - card details
        'recordDetailNotesLabel':                                                               "Notes",
        'recordDetailLabelFieldColumnLabel':                                    "Field label",
        'recordDetailDataFieldColumnLabel':                                             "Field data",
        'recordDetailTypeFieldColumnLabel':                                             "Type",
        'recordDetailSavingChangesMessagePanelInitialTitle':    "Saving card",
        'recordDetailSavingChangesMessagePanelInitialText':             "---",
        'recordDetailRemoveFieldButtonLabel':                                   "-",
        'recordDetailAddFieldButtonLabel':                                              "Add new field",
        'recordDetailPasswordFieldHelpLabel':                                   "click the stars to select the password and then Ctrl-C to copy",
        'recordDetailPasswordFieldScrambleLabel':                               "scramble",
        'recordDetailPasswordFieldUnscrambleLabel':                             "unscramble",
        
        'recordDetailDirectLoginBlockTitle':                                    "Direct logins",
        'recordDetailNewDirectLoginDescription':                                "<p>Direct login configuration</p>",
        'recordDetailDirectLoginBlockNoDirectLoginConfiguredDescription':"\
        <p>Does this card contain credentials to access an online service?</p>\
        <p>Use the bookmarklet to configure a “direct login” from Clipperz with just one click!</p>",
        'recordDetailDeleteDirectLoginButtonLabel':                             "-",
        'recordDetailAddNewDirectLoginButtonLabel':                             "Add new direct login",
        'recordDetailEditButtonLabel':                                                  "Edit",
        'recordDetailSaveButtonLabel':                                                  "Save",
        'recordDetailCancelButtonLabel':                                                "Cancel",
        'newRecordTitleLabel':                                                                  "_new card_",
        'newDirectLoginLabelSuffix':                                                    "",
 // Cards block - save card panel
        'recordSaveChangesPanelCollectRecordInfoMessageTitle':          "Save card",
        'recordSaveChangesPanelCollectRecordInfoMessageText':           "Updating card headers",
        'recordSaveChangesPanelEncryptUserDataMessageTitle':            "Save card",
        'recordSaveChangesPanelEncryptUserDataMessageText':                     "Local encryption of card headers",
        'recordSaveChangesPanelEncryptRecordDataMessageTitle':          "Save card",
        'recordSaveChangesPanelEncryptRecordDataMessageText':           "Local encryption of card's data",
        'recordSaveChangesPanelEncryptRecordVersionDataMessageTitle':"Save card",
        'recordSaveChangesPanelEncryptRecordVersionDataMessageText':"Local encryption of card's version data",
        'recordSaveChangesPanelSendingDataToTheServerMessageTitle':     "Save card",
        'recordSaveChangesPanelSendingDataToTheServerMessageText':      "Uploading encrypted card's header to Clipperz",
        'recordSaveChangesPanelUpdatingTheInterfaceMessageTitle':       "Save card",
        'recordSaveChangesPanelUpdatingTheInterfaceMessageText':        "Updating the interface",
        //Password Generator strings
        'passwordGeneratorPanelTitle':                                                          "Password generator",
        'passwordGeneratorPanelOkLabel':                                                        "Ok",
        'passwordGeneratorPanelCancelLabel':                                            "Cancel",
        'passwordGeneratorLowercaseLabel':                                                      "abc",
        'passwordGeneratorUppercaseLabel':                                                      "ABC",
        'passwordGeneratorNumberLabel':                                                                 "012",
        'passwordGeneratorSymbolLabel':                                                                 "@#$",
        'passwordGeneratorLengthLabel':                                                                 "length:",
        //Miscellaneous strings
        //'DWRUtilLoadingMessage':                                                                      "Loading data …",
        'comingSoon':                                                                                           "coming soon …",
        'panelCollectingEntryopyMessageText':                                           "Collecting entropy",
        'directLoginConfigurationCheckBoxFieldSelectedValue':           "Yes",
        'directLoginConfigurationCheckBoxFieldNotSelectedValue':        "No",
        
                
 // NEW - Import panel
        'importFormats':{
        'CSV': {
                        'label':        "CSV",
                        'description':"<p>A widely recognized file format that stores tabular data. Several password managers can export data to this format.</p>"
        },
        'Excel': {
                        'label':        "Excel",
                        'description':"<p>The popular spreadsheet from Microsoft. Storing passwords in Excel files is very common but not advisable.</p>"
        },
        'KeePass': {
                        'label':        "KeePass",
                        'description':"<p>The custom TXT file created by KeePass password manager.</p>"
        },
        'PasswordPlus': {
                        'label':        "Password Plus",
                        'description':"<p>The custom CSV format produced by Password Plus, a password manager mostly used on mobile devices.</p>"
        },
        'Roboform': {
                        'label':        "RoboForm",
                        'description':"<p>The special HTML file created by Roboform password manager when displaying Passcard and Safenotes for printing.</p>"
        },
        'ClipperzExport': {
                        'label':        "JSON",
                        'description':"<p>The file created by Clipperz itself in JSON format. It preserves all information contained in your cards, even direct login configurations.</p>"
        }
 },
        //JSON
        'Clipperz_ImportWizard_Title':                  "JSON import",
        'importOptions_clipperz_description':   "<p>Open the JSON file exported from Clipperz in a text editor. Then copy and paste its content to the text area below.</p>",
        //CSV
        'CSV_ImportWizard_Title':                               "CSV import",
        'importOptions_csv_description_':               "\
        <p>Open the CSV file in a text editor. Then copy and paste its content to the text area below.</p>\
        <p>Please select the special characters used within your file.</p>",
        //Excel
        'Excel_ImportWizard_Title':                             "Excel import",
        'importOptions_excel_description_':             "<p>Open the Excel file and select the cells you want to import. Then copy and paste them to the text area below.</p>",
        //KeePass
        'KeePass_ImportWizard_Title':                   "KeePass import",
        'importOptions_keePass_description_':   "<p>Open the TXT file created by Keepass in a text editor. Then copy and paste its content to the text area below.</p>",
        
        //PasswordPlus
        'PasswordPlus_ImportWizard_Title':              "Password Plus import",
        'importOptions_passwordPlus_description':"<p>Open the CSV file created by PasswordPlus in a text editor. Then copy and paste its content to the text area below.</p>",
        //RoboForm
        'RoboForm_ImportWizard_Title':                  "RoboForm import",
        'importOptions_roboForm_description':   "<p>Open the HTML file created by RoboForm in a text editor. Then copy and paste its content to the text area below.</p>",
        
        
        'importData_parsingDataTitle':                  "Import",
        'importData_parsingDataText':                   "Parsing data …",
        'importData_previewingDataTitle':               "Import",
        'importData_previewingDataText':                "Processing data …",
        'importData_processingDataTitle':               "Import",
        'importData_processingDataText':                "Creating new cards …",
        
 'ImportWizard': {
                'EDIT':                                                                 "edit",
                'PREVIEW':                                                      "preview",
                'IMPORT':                                                       "import",
        
                'KEEPASS_SETTINGS':                                     "settings",
        
                'CSV_EDIT':                                                     "paste",
                'CSV_COLUMNS':                                          "columns",
                'CSV_HEADER':                                           "labels",
                'CSV_TITLE':                                            "titles",
                'CSV_NOTES':                                            "notes",
                'CSV_FIELDS':                                           "types",
        
                'EXCEL_EDIT':                                           "edit"
 },
        'CSV_ImportWizard_Columns':             "<p>Select the columns you want to import.</p>",
        'CSV_ImportWizard_Header':              "<p>If the first row of the CSV file contains field labels, tick off the checkbox below.</p>",
        'CSV_ImportWizard_Header_Settings_firstRowHeaderLabel':"Use the first row as labels?",
        'CSV_ImportWizard_Title':               "<p>Select the column that contains titles of the cards you are importing. (mandatory)</p>",
        'CSV_ImportWizard_Notes':               "<p>Select the column that represents a \"notes\" field. (optional)</p>",
        'CSV_ImportWizard_Notes_Settings_noSelectionLabel':     "\"notes\" field not present",
        'CSV_ImportWizard_Fields':              "<p>Select the correct type for each column from the drop down lists.</p>",
        'CSV_ImportWizard_Fields_MissingLabelWarning':          "Missing label",
        'importData_importConfirmation_title':                          "Import",
        'importData_importConfirmation_text':                           "Do you want to import __numberOfRecords__ cards?",
        
        //Vulnerability warning
        'VulnerabilityWarning_Panel_title':             "Vulnerability warning",
        'VulnerabilityWarning_Panel_message':   "The action as been aborted due to a catched vulnerability",
        'VulnerabilityWarning_Panel_buttonLabel':"Close",
        
        //All the loginInfo panel infos
        'WELCOME_BACK':                                         "Welcome back!",
        
        'currentConnectionText':                "You are connected from ip&nbsp;__ip__, apparently from __country__, using __browser__ on __operatingSystem__.",
        'latestConnectionText':                         "Your latest connection was __elapsedTimeDescription__ (__time__) from ip&nbsp;__ip__, apparently from __country__, using __browser__ on __operatingSystem__.",
        'fullLoginHistoryLinkLabel':    "show login history",
        
 'elapsedTimeDescriptions': {
                'MORE_THAN_A_MONTH_AGO':        "more than a month ago",
                'MORE_THAN_A_WEEK_AGO':                 "more than a week ago",
                'MORE_THAN_*_WEEKS_AGO':        "more than __elapsed__ weeks ago",
                'YESTERDAY':                            "yesterday",
                '*_DAYS_AGO':                           "__elapsed__ days ago",
                'ABOUT_AN_HOUR_AGO':            "about an hour ago",
                '*_HOURS_AGO':                          "__elapsed__ hours ago",
                'JUST_A_FEW_MINUTES_AGO':       "just a few minutes ago",
                'ABOUT_*_MINUTES_AGO':          "about __elapsed__ minutes ago"
 },
        'unknown_ip':                                   "unknown",
        
 'countries': {
                '--':           "unknown",
                'AD':           "Andorra",
                'AE':           "United Arab Emirates",
                'AF':           "Afghanistan",
                'AG':           "Antigua and Barbuda",
                'AI':           "Anguilla",
                'AL':           "Albania",
                'AM':           "Armenia",
                'AN':           "Netherlands Antilles",
                'AO':           "Angola",
                'AP':           "Non-Spec Asia Pas Location",
                'AR':           "Argentina",
                'AS':           "American Samoa",
                'AT':           "Austria",
                'AU':           "Australia",
                'AW':           "Aruba",
                'AX':           "Aland Islands",
                'AZ':           "Azerbaijan",
                'BA':           "Bosnia and Herzegowina",
                'BB':           "Barbados",
                'BD':           "Bangladesh",
                'BE':           "Belgium",
                'BF':           "Burkina Faso",
                'BG':           "Bulgaria",
                'BH':           "Bahrain",
                'BI':           "Burundi",
                'BJ':           "Benin",
                'BM':           "Bermuda",
                'BN':           "Brunei Darussalam",
                'BO':           "Bolivia",
                'BR':           "Brazil",
                'BS':           "Bahamas",
                'BT':           "Bhutan",
                'BW':           "Botswana",
                'BY':           "Belarus",
                'BZ':           "Belize",
                'CA':           "Canada",
                'CD':           "Congo the Democratic Republic of the",
                'CF':           "Central African Republic",
                'CH':           "Switzerland",
                'CI':           "Cote D'ivoire",
                'CK':           "Cook Islands",
                'CL':           "Chile",
                'CM':           "Cameroon",
                'CN':           "China",
                'CO':           "Colombia",
                'CR':           "Costa Rica",
                'CS':           "Serbia and Montenegro",
                'CU':           "Cuba",
                'CY':           "Cyprus",
                'CZ':           "Czech Republic",
                'DE':           "Germany",
                'DJ':           "Djibouti",
                'DK':           "Denmark",
                'DO':           "Dominican Republic",
                'DZ':           "Algeria",
                'EC':           "Ecuador",
                'EE':           "Estonia",
                'EG':           "Egypt",
                'ER':           "Eritrea",
                'ES':           "Spain",
                'ET':           "Ethiopia",
                'EU':           "European Union",
                'FI':           "Finland",
                'FJ':           "Fiji",
                'FM':           "Micronesia Federated States of",
                'FO':           "Faroe Islands",
                'FR':           "France",
                'GA':           "Gabon",
                'GB':           "United Kingdom",
                'GD':           "Grenada",
                'GE':           "Georgia",
                'GF':           "French Guiana",
                'GG':           "Guernsey",
                'GH':           "Ghana",
                'GI':           "Gibraltar",
                'GL':           "Greenland",
                'GM':           "Gambia",
                'GP':           "Guadeloupe",
                'GR':           "Greece",
                'GT':           "Guatemala",
                'GU':           "Guam",
                'GW':           "Guinea-Bissau",
                'GY':           "Guyana",
                'HK':           "Hong Kong",
                'HN':           "Honduras",
                'HR':           "Croatia (Local Name: Hrvatska)",
                'HT':           "Haiti",
                'HU':           "Hungary",
                'ID':           "Indonesia",
                'IE':           "Ireland",
                'IL':           "Israel",
                'IM':           "Isle of Man",
                'IN':           "India",
                'IO':           "British Indian Ocean Territory",
                'IQ':           "Iraq",
                'IR':           "Iran (Islamic Republic of)",
                'IS':           "Iceland",
                'IT':           "Italy",
                'JE':           "Jersey",
                'JM':           "Jamaica",
                'JO':           "Jordan",
                'JP':           "Japan",
                'KE':           "Kenya",
                'KG':           "Kyrgyzstan",
                'KH':           "Cambodia",
                'KI':           "Kiribati",
                'KN':           "Saint Kitts and Nevis",
                'KR':           "Korea Republic of",
                'KW':           "Kuwait",
                'KY':           "Cayman Islands",
                'KZ':           "Kazakhstan",
                'LA':           "Lao People's Democratic Republic",
                'LB':           "Lebanon",
                'LC':           "Saint Lucia",
                'LI':           "Liechtenstein",
                'LK':           "Sri Lanka",
                'LR':           "Liberia",
                'LS':           "Lesotho",
                'LT':           "Lithuania",
                'LU':           "Luxembourg",
                'LV':           "Latvia",
                'LY':           "Libyan Arab Jamahiriya",
                'MA':           "Morocco",
                'MC':           "Monaco",
                'MD':           "Moldova Republic of",
                'MG':           "Madagascar",
                'MH':           "Marshall Islands",
                'MK':           "Macedonia the Former Yugoslav Republic of",
                'ML':           "Mali",
                'MM':           "Myanmar",
                'MN':           "Mongolia",
                'MO':           "Macau",
                'MP':           "Northern Mariana Islands",
                'MR':           "Mauritania",
                'MS':           "Montserrat",
                'MT':           "Malta",
                'MU':           "Mauritius",
                'MV':           "Maldives",
                'MW':           "Malawi",
                'MX':           "Mexico",
                'MY':           "Malaysia",
                'MZ':           "Mozambique",
                'NA':           "Namibia",
                'NC':           "New Caledonia",
                'NF':           "Norfolk Island",
                'NG':           "Nigeria",
                'NI':           "Nicaragua",
                'NL':           "Netherlands",
                'NO':           "Norway",
                'NP':           "Nepal",
                'NR':           "Nauru",
                'NU':           "Niue",
                'NZ':           "New Zealand",
                'OM':           "Oman",
                'PA':           "Panama",
                'PE':           "Peru",
                'PF':           "French Polynesia",
                'PG':           "Papua New Guinea",
                'PH':           "Philippines",
                'PK':           "Pakistan",
                'PL':           "Poland",
                'PR':           "Puerto Rico",
                'PS':           "Palestinian Territory Occupied",
                'PT':           "Portugal",
                'PW':           "Palau",
                'PY':           "Paraguay",
                'QA':           "Qatar",
                'RO':           "Romania",
                'RS':           "Serbia",
                'RU':           "Russian Federation",
                'RW':           "Rwanda",
                'SA':           "Saudi Arabia",
                'SB':           "Solomon Islands",
                'SC':           "Seychelles",
                'SD':           "Sudan",
                'SE':           "Sweden",
                'SG':           "Singapore",
                'SI':           "Slovenia",
                'SK':           "Slovakia (Slovak Republic)",
                'SL':           "Sierra Leone",
                'SM':           "San Marino",
                'SN':           "Senegal",
                'SR':           "Suriname",
                'SV':           "El Salvador",
                'SY':           "Syrian Arab Republic",
                'SZ':           "Swaziland",
                'TC':           "Turks and Caicos Islands",
                'TG':           "Togo",
                'TH':           "Thailand",
                'TJ':           "Tajikistan",
                'TM':           "Turkmenistan",
                'TN':           "Tunisia",
                'TO':           "Tonga",
                'TR':           "Turkey",
                'TT':           "Trinidad and Tobago",
                'TV':           "Tuvalu",
                'TW':           "Taiwan Province of China",
                'TZ':           "Tanzania United Republic of",
                'UA':           "Ukraine",
                'UG':           "Uganda",
                'US':           "United States",
                'UY':           "Uruguay",
                'UZ':           "Uzbekistan",
                'VA':           "Holy See (Vatican City State)",
                'VE':           "Venezuela",
                'VG':           "Virgin Islands (British)",
                'VI':           "Virgin Islands (U.S.)",
                'VN':           "Viet Nam",
                'VU':           "Vanuatu",
                'WF':           "Wallis and Futuna Islands",
                'WS':           "Samoa",
                'YE':           "Yemen",
                'ZA':           "South Africa",
                'ZM':           "Zambia",
                'ZW':           "Zimbabwe",
                'ZZ':           "Reserved"
 },
 'browsers': {
                'UNKNOWN':      "Unknown",
                'MSIE':                 "Internet Explorer",
                'FIREFOX':      "Firefox",
                'OPERA':        "Opera",
                'SAFARI':       "Safari",
                'OMNIWEB':      "OmniWeb",
                'CAMINO':       "Camino",
                'CHROME':       "Chrome"
 },
 'operatingSystems': {
                'UNKNOWN':      "Unknown",
                'WINDOWS':      "Windows",
                'MAC':          "Mac",
                'LINUX':        "Linux",
                'IPHONE':       "iPhone",
                'MOBILE':       "Mobile",
                'OPENBSD':      "OpenBSD",
                'FREEBSD':      "FreeBSD",
                'NETBSD':       "NetBSD"
 },
        
        
        //Calendar texts
 'calendarStrings': {
                'months': {
                        '0':"January",
                        '1':"February",
                        '2':"March",
                        '3':"April",
                        '4':"May",
                        '5':"June",
                        '6':"July",
                        '7':"August",
                        '8':"September",
                        '9':"October",
                        '10':"November",
                        '11':"December"
        },
                'shortMonths':{
                        '0':"Jan",
                        '1':"Feb",
                        '2':"Mar",
                        '3':"Apr",
                        '4':"May",
                        '5':"Jun",
                        '6':"Jul",
                        '7':"Aug",
                        '8':"Sep",
                        '9':"Oct",
                        '10':"Nov",
                        '11':"Dec"
        },
                'days':{
                        '0':"Sunday",
                        '1':"Monday",
                        '2':"Tuesday",
                        '3':"Wednesday",
                        '4':"Thursday",
                        '5':"Friday",
                        '6':"Saturday"
        },
                'shortDays':{
                        '0':"Sun",
                        '1':"Mon",
                        '2':"Tue",
                        '3':"Wed",
                        '4':"Thu",
                        '5':"Fri",
                        '6':"Sat"
        },
                'veryShortDays':{
                        '0':"Su",
                        '1':"Mo",
                        '2':"Tu",
                        '3':"We",
                        '4':"Th",
                        '5':"Fr",
                        '6':"Sa"
        },
                'amDesignation':"am",
                'pmDesignation':"pm"
 },
 // Date format
        'fullDate_format':"l, F d, Y H:i:s",
        
 __syntaxFix__: "syntax fix"
 }
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 7ac2324..7a44e47 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -1,97 +1,99 @@
 #!/usr/bin/env python
 # -*- coding: UTF-8 -*-
 def repositoryWithPath (path):
        try:
                from mercurial import ui, hg
                repo = hg.repository(ui.ui(), path)
                result = HgRepository(repo, path)
        except:
                try:
                        from git import Repo
                        repo = Repo(path)
                        result = GitRepository(repo, path)
                except ImportError, exception:
                        print "Failed to import git, please install http://gitorious.org/git-python"
                        raise exception
                except:
                        result = SnapshotRepository('', path)
        return result
 #===================================================================
 class Repository(object):
        def __init__ (self, repository, path):
                self.repository = repository
                self.path = path
        def revision (self):
                raise NotImplementedError()
        
        def areTherePendingChanges (self):
                raise NotImplementedError()
        def version (self):
                result = self.revision()
                if self.areTherePendingChanges():
                        result = '>>> ' + result + ' <<<'
                # print "VERSION: " + result
                return result
 #===================================================================
 class GitRepository(Repository):
                #http://gitorious.org/git-python
        def revision (self):
                try:
                        return self.repository.head.commit.hexsha
                except:
                        return self.repository.commits()[0].id
        def areTherePendingChanges (self):
                try:
                        return self.repository.is_dirty()
                except TypeError, te:
                        return self.repository.is_dirty
 #===================================================================
 class HgRepository(Repository):
                #http://mercurial.selenic.com/wiki/MercurialApi
        def revision (self):
                return 'hg:' + str(self.repository['tip'])
        
        def areTherePendingChanges (self):
                # TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
                return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
 #===================================================================
 class SnapshotRepository(Repository):
        def revision (self):
                return 'SNAPSHOT'
+ 
        def areTherePendingChanges (self):
                return False
author	Clipperz <info@clipperz.com>	2013-01-09 11:45:31 (UTC)
committer	Clipperz <info@clipperz.com>	2013-01-09 11:45:31 (UTC)
commit	9741a93a9f5c76827135b43c03b20c0a48f12604 (patch) (unidiff)
tree	1a8fff379a033d873c9e1c7faff755fb6bb7b118
parent	8ef30d00eb96004c39540019336c0ec99dae01cb (diff)
download	clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.zip clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.gz clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.bz2