17 files changed, 173 insertions, 26 deletions
diff --git a/frontend/beta/css/clipperz/clipperz.css b/frontend/beta/css/clipperz/clipperz.css
index 31458c1..476143d 100644
--- a/frontend/beta/css/clipperz/clipperz.css
+++ b/frontend/beta/css/clipperz/clipperz.css
@@ -492,223 +492,262 @@ div.registrationForm ul {
        border-top: 1px dotted #ff9400;
 }
 /* @end */
 /* @end */
 /* @group Registration splash */
 div#splashMessage table {
        width: auto;
        color: #333366;
        font-size: 10pt;
        padding: 10px;
 }
 div#splashMessage span {
                color: #666666;
 }
 div#splashMessage table span.label {
        color: #999999;
        padding-right: 10px;
 }
 div#splashMessage table span.value {
        color: #666666;
        font-weight: bold;
 }
 div#splashMessage input {
        margin-right: 5px;
 }
 /* @end */
 /* @group Browser compatibility box */
 div.browserCompatibilityBox {
        color: #666666;
        padding: 0px 0px;
        /*border: 4px solid #ff9400; */
        font-weight: bold;
        text-align: center;
        width: 400px;
 }
 div.browserCompatibilityBox p {
        margin: 0px 50px;
 }
 div.browserCompatibilityBox a {
        color: #666666;
 }
 /* @end */
 /* @group Language switch */
 li#loginPanel {
        padding: 0px 15px;
 }
 div.loginPanelSwitchLanguageBox {
        color: #666666;
        padding: 12px 0px 10px 0px;
        /*border: 4px solid #ff9400; */
        font-weight: bold;
        text-align: center;
        height: 75px;
        /*      background: url(./images/languageBox.png) no-repeat 19px -15px;*/
        background: url(data:image/png;charset=utf-8;base64,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) no-repeat 19px -15px;
        width: 400px;
        margin: 0px;
 }
 option.disabledOption {
                color: #999999;
 }
 /* @end */
 /* @end */
 /* @group Record page */
 div.mainPanelMinHeightDiv {
        width: 15px;
        min-width: 15px;
        height: 200px;
 }
 table#mainPanelTABLE {
                width: 100%;
 }
 /* @group Direct logins */
-div#directLoginsBlock {
+div#directLoginsBlock, div#accountStatus {
        width: 230px;
        padding: 0px;
        /*border: 4px solid #ff9400;*/
        /*      background: url(./images/directLoginBox.png) repeat-y -262px bottom;*/
        background: url(data:image/png;charset=utf-8;base64,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) repeat-y -262px bottom;
 }
-div#directLoginsBlock div.directLoginsBlockHeaderBox {
+div#accountStatus div.accountStatus, div#accountStatus div.accountLevel, div#accountStatus div.accountExpiration {
+        font-size: 10pt;
+        color: #666666;
+        padding: 5px 16px 0px 16px;
+}
+div#directLoginsBlock div.directLoginsBlockHeaderBox, div#accountStatus div.header {
        /*      background: url(./images/directLoginBox.png) no-repeat -11px -13px;*/
        background: url(data:image/png;charset=utf-8;base64,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) no-repeat -11px -13px;
 }
-div#directLoginsBlock h3 {
+div#accountStatus span.label {
+        width: 52px;
+        display: inline-block;
+        margin-right: 3px;
+}
+div#accountStatus span.label:after {
+        content: ":";
+}
+/*
+div#accountStatus div.payButton {
+        font-size: 10pt;
+        text-align: center;
+}
+div#accountStatus div.payButton a {
+        color: #666666;
+        font-weight: bold;
+        text-decoration: none;
+}
+div#accountStatus div.payButton a:hover {
+        color: #aaaaaa;
+}
+*/
+div#accountStatus div.payButton {
+        text-align: center;
+}
+div#directLoginsBlock h3, div#accountStatus div.header h5 {
        text-align: center;
        color: #666666;
        padding-top: 12px;
        padding-bottom: 5px;
        margin: 0px 10px 0px 10px;
                border-bottom: 1px dotted #ff9400;
        font-size: 12pt;
 }
-ul#directLogins {
+ul#directLogins, div#accountStatus div.payButton {
        /*      padding: 7px 20px 45px 20px;*/
-                padding: 7px 12px 45px 12px;
+                padding: 7px 12px 40px 12px;
-        min-height: 200px;
        /*      background: url(./images/directLoginBox.png) no-repeat -513px bottom; */
        background: url(data:image/png;charset=utf-8;base64,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) no-repeat -513px bottom; 
 }
+ul#directLogins {
+        min-height: 200px;
+}
 ul#directLogins li {
        border-top: 1px solid white;
        border-bottom: 1px solid white;
        padding: 1px 0px;
        width: 206px;
 }
 ul#directLogins li.hover {
        border-top: 1px solid #ffc880;
        border-bottom: 1px solid #ffc880;
        background-color: #fff9f2;
        cursor: pointer;
 }
 ul#directLogins li img {
        width: 16px;
        height: 16px;
 }
 ul#directLogins li div {
 }
 /* @group Direct logins description */
 div#directLoginsDescription {
        padding: 6px 20px 50px 20px;
        color: #999999;
        font-size: 10pt;
        /*      background: url(./images/directLoginBox.png) no-repeat -513px bottom; */
        background: url(data:image/png;charset=utf-8;base64,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) no-repeat -513px bottom; 
 }
 div#directLoginsDescription p {
        padding-bottom: 8px;
 }
 div#directLoginsDescription a {
        color: #333366;
 }
 div#directLoginsDescription ul {
        padding-left: 20px;
        list-style-position: outside;
        list-style-type: circle;
        color: #ff9400;
        padding-bottom: 10px;
 }
 div#directLoginsDescription ul li {
                padding-bottom: 3px;
 }
 div#directLoginsDescription ul li p {
        display: inline;
        color: #999999;
 }
 /* @end */
 /* @group Direct login [open] */
 ul#directLogins li a.directLoginItemTitle {
        color: #336;
        font-size: 10pt;
        line-height: 16px;
 }
 ul#directLogins li table {
        width: 100%;
 }
 ul#directLogins li a.directLoginItemTitle:hover {
        text-decoration: underline;
 }
 /* @end */
 /* @group Direct login [edit] */
 ul#directLogins li a.directLoginItemEditButton {
        visibility: visible;
        color: white;
        font-size: 8pt;
        /*background-color: #ff9400;*/
        padding: 0px 5px;
        line-height: 14px;
 }
 ul#directLogins li.hover a.directLoginItemEditButton {
        visibility: visible;
        color: #ff9400;
        /*border-top: 3px solid #fff9f2;*/
 }
 ul#directLogins li.hover a.directLoginItemEditButton:hover {
        color: #35306b;
diff --git a/frontend/beta/html/index_template.html b/frontend/beta/html/index_template.html
index 0b2875c..c3fd727 100644
--- a/frontend/beta/html/index_template.html
+++ b/frontend/beta/html/index_template.html
@@ -1,100 +1,100 @@
 <html>
 <head>
        <title>@page.title@</title>
        <META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <!--
 @copyright@
 -->
 @css@
        <link rel="shortcut icon" href="./clipperz.ico" />
        <meta name="description" content="Login to your web accounts with just one click. Never type a password again! Use multiple complex passwords and forget them. A password manager that enhances your online security." />
        <meta name="keywords" content="password manager,gestor de contraseñas,gerenciador de senhas,Kennwortmanager,passwords,security,privacy,cryptography" />
 <script>
        Clipperz_IEisBroken = false;
        Clipperz_normalizedNewLine = '\n';
        Clipperz_dumpUrl = "/../dump/";
 </script>
 <!--[if IE]><script>
 Clipperz_IEisBroken = true;
 Clipperz_normalizedNewLine = '\x0d\x0a';
 </script><![endif]-->
 @js_LINKED@
 </head>
 <body>
 <div id="mainDiv">
        <div id="header">
                <div id="miscLinks">
                        <a id="donateHeaderIconLink" href="http://www.clipperz.com/donations" target="_blank"><img id='donateHeaderIcon' src=""></a>
                        <ul>
                                <li><a href="http://www.clipperz.com/donations" id='donateHeaderLink' class='highlightedHeader' target="_blank">donate</a></li>
-                                <li><a href="http://www.clipperz.com/credits" id='creditsHeaderLink' target="_blank">credits</a></li>
+                                <!-- li><a href="http://www.clipperz.com/credits" id='creditsHeaderLink' target="_blank">credits</a></li -->
                                <li><a href="http://www.clipperz.com/contact" id='feedbackHeaderLink' target="_blank">feedback</a></li>
                                <li><a href="http://www.clipperz.com/support/user_guide" target="_blank" id='helpHeaderLink'>help</a></li>
                                <li><a href="http://www.clipperz.com/forum" target="_blank" id='forumHeaderLink'>forum</a></li>
                        </ul>
                </div>
                <div id="logoFrame">
                        <a href="http://www.clipperz.com" target="_blank"><img id="logo" src="" /></a>
                        <h5 class="clipperzPayoff">keep it to yourself</h5>
                </div>
                <div id="mainTabs">
                        <ul id="exitLinks">
                                <li id="logoutLI"><!--<a href="#">logout</a>--></li>
                                <li id="lockLI"><!--<a href="#">lock</a>--></li>
                        </ul>
                        <div id="menus">
                                <table cellpadding="0" cellspacing="0" border="0">
                                        <tbody>
                                                <tr id="menusTR">
 <!--
                                                        <td class="selected"><div><a href="#">records</a></div></td>
                                                        <td><div><a href="./Account.html">account</a></div></td>
                                                        <td><div><a href="#">data</a></div></td>
                                                        <td><div><a href="#">bookmarklet</a></div></td>
 -->
                                                </tr>
                                        </tbody>
                                </table>
                        </div>
                        </div>
        </div>
        <div id="main">
                <h3 class="loading">loading ...</h3>
 @js_EMBEDDED@
 <script>
        Clipperz.PM.Proxy.defaultProxy = new Clipperz.PM.Proxy.JSON({'url':'@request.path@', 'shouldPayTolls':@should.pay.toll@});
        /*offline_data_placeholder*/
 </script>
                <div id="javaScriptAlert">
                        <h1>Attention!</h1>
                        <p>If you can read this message, the chances are that your browser does not properly support JavaScript? or you have disabled this functionality yourself.</p>
                        <h3>Javascript is required to access Clipperz.</h3>
                        <h5>Please enable scripting or upgrade your browser.</h5>
                </div>
        </div>
        <div id="footer">
                Copyright &copy; 2008-2013 Clipperz Srl -
                <a href="http://www.clipperz.com/terms_of_service" target="black">Terms of service</a> -
                <a href="http://www.clipperz.com/privacy_policy" target="black">Privacy policy</a>
                &nbsp;-&nbsp;
                Application version: <a href="https://github.com/clipperz/password-manager/tree/@application.version@" target="github">@application.version@</a>
        </div>
        <div id="recordDetailEditModeHeaderMask"></div>
        <div id="recordDetailEditModeVerticalMask"></div>
 </div>
 <div id="applicationVersionType" class="@application.version.type@" />
 </body>
 </html>
diff --git a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js
index 14e42a5..9fda202 100644
--- a/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js
+++ b/frontend/beta/js/Clipperz/PM/Components/Compact/CompactHeader.js
@@ -1,81 +1,81 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; }
 if (typeof(Clipperz.PM.Components.Compact) == 'undefined') { Clipperz.PM.Components.Compact = {}; }
 Clipperz.PM.Components.Compact.CompactHeader = function(anElement, args) {
    Clipperz.PM.Components.Compact.CompactHeader.superclass.constructor.call(this, anElement, args);
        this.render();
        
        return this;
 };
 YAHOO.extendX(Clipperz.PM.Components.Compact.CompactHeader, Clipperz.PM.Components.BaseComponent, {
        
        'toString': function() {
                return "Clipperz.PM.Components.Compact.CompactHeader";
        },
        //-----------------------------------------------------
        
        'render': function() {
                this.element().update("");
                Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'div', children:[
                        {tag:'img', src:'./images/logo.gif'},
                        {tag:'div', id:'lockBlock', children:[
                                {tag:'input', type:'checkbox', id:'autolock'},
                                {tag:'span', html:'auto'},
                                {tag:'a', href:'#', htmlString:Clipperz.PM.Strings['lockMenuLabel'], id:'lock'}
                        ]}
                ]});
                
                Clipperz.YUI.DomHelper.append(this.element().dom, 
                        {tag:'div', id:'compactMiscLinks', children:[
                                {tag:'a', id:'donateHeaderIconLink', target:'_blank', href:Clipperz.PM.Strings['donateHeaderLinkUrl'], children:[
                                        {tag:'img', id:'donateHeaderLinkIcon', src:'./images/smiles_small.gif'}
                                ]},
                                {tag:'ul', children:[
                                        {tag:'li', children:[{tag:'a', id:'donateHeaderLink', html:'donate', target:'_blank'}]},
-                                        {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]},
+        //                              {tag:'li', children:[{tag:'a', id:'creditsHeaderLink', html:'credits', target:'_blank'}]},
                                        {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink', html:'feedback', target:'_blank'}]},
                                        {tag:'li', children:[{tag:'a', id:'helpHeaderLink', html:'help', target:'_blank'}]},
                                        {tag:'li', children:[{tag:'a', id:'forumHeaderLink', html:'forum', target:'_blank'}]}
                                ]}
                        ]}
                );
                YAHOO.ext.Element.get('lockBlock').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
                Clipperz.NotificationCenter.notify(this, 'switchLanguage');
        },
        //-----------------------------------------------------
        __syntaxFix__: '__syntaxFix__'
 });
diff --git a/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js b/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js
index c19a8a3..bab5fba 100644
--- a/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js
+++ b/frontend/beta/js/Clipperz/PM/Components/Panels/MainPanel.js
@@ -1,240 +1,270 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 if (typeof(Clipperz) == 'undefined') { Clipperz = {}; }
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 if (typeof(Clipperz.PM.Components) == 'undefined') { Clipperz.PM.Components = {}; }
 if (typeof(Clipperz.PM.Components.Panels) == 'undefined') { Clipperz.PM.Components.Panels = {}; }
 //#############################################################################
 Clipperz.PM.Components.Panels.MainPanel = function(anElement, args) {
        args = args || {};
    Clipperz.PM.Components.Panels.MainPanel.superclass.constructor.call(this, anElement, args);
        this._recordListDataModel = null;
        this._selectedRecord = null;
        this._recordDetailComponent = null;
        this._recordListGrid = null;
        this._directLinkItemTemplate = null;
        this._recordItemTemplate = null;
        
        this._addNewRecordButton = null;
        this._deleteRecordButton = null;
        this._creationWizard = null;
        Clipperz.NotificationCenter.register(null, 'selectAndEnterEditMode', this, 'selectRecordAndEnterEditModeHandler');
        Clipperz.NotificationCenter.register(null, 'recordAdded', this, 'recordAddedHandler');
        Clipperz.NotificationCenter.register(null, 'recordUpdated', this, 'recordUpdatedHandler');
        Clipperz.NotificationCenter.register(null, 'recordRemoved', this, 'recordRemovedHandler');
        Clipperz.NotificationCenter.register(null, 'directLoginAdded', this, 'directLoginAddedHandler');
        Clipperz.NotificationCenter.register(null, 'directLoginUpdated', this, 'directLoginUpdatedHandler');
        Clipperz.NotificationCenter.register(null, 'directLoginRemoved', this, 'directLoginRemovedHandler');
        Clipperz.NotificationCenter.register(null, 'accountLocked', this, 'accountLockedHandler');
        MochiKit.Signal.connect(MochiKit.DOM.currentWindow(), 'onresize', this, 'resizeModalMask');
        this.render();
        
        return this;
 }
 //=============================================================================
 YAHOO.extendX(Clipperz.PM.Components.Panels.MainPanel, Clipperz.PM.Components.Panels.BasePanel, {
        'toString': function() {
                return "Clipperz.PM.Components.Panels.MainPanel component";
        },
        
        //-------------------------------------------------------------------------
        'render': function() {
                this.element().update("");
                Clipperz.YUI.DomHelper.append(this.element().dom, {tag:'table', id:'mainPanelTABLE', border:'0', cellspacing:'0', cellpadding:'0', children:[
                        {tag:'tbody', children:[
                                {tag:'tr', children:[
                                        {tag:'td', width:'15', children:[
                                                {tag:'div', cls:'mainPanelMinHeightDiv'}
                                        ]},
                                        {tag:'td', valign:'top', id:'directLoginsTD', width:'200', children:[
+                                                {tag:'div', id:'accountStatus', children:[
+                                                        {tag:'div', cls:'header', children:[{tag:'h5', cls:'title', htmlString:"Account info"}]},
+        //                                              {tag:'div', cls:'accountStatus', html:"early adopter"},
+                                                        {tag:'div', cls:'accountLevel', children:[
+                                                                {tag:'span', cls:'label', html:"status"},
+                                                                {tag:'span', cls:'status', html:"early adopter"}
+                                                        ]},
+                                                        {tag:'div', cls:'accountLevel', children:[
+                                                                {tag:'span', cls:'label', html:"level"},
+        //                                                      {tag:'span', cls:'level', html:"★☆☆☆"}
+                                                                {tag:'span', cls:'level', html:"☆☆☆☆"}
+                                                        ]},
+                                                        {tag:'div', cls:'accountExpiration', children:[
+                                                                {tag:'span', cls:'label', html:"expires"},
+        //                                                      {tag:'span', cls:'expriation', html:"on 26 April 2014"}
+                                                                {tag:'span', cls:'expriation', html:"never"}
+                                                        ]},
+        //                                              {tag:'div', cls:'payButton', children:[
+        //                                                      {tag:'a', href:'#', cls:'info', html:"info"}
+        //                                              ]}
+                                                        {tag:'div', id:'payButton', cls:'payButton'}
+                                                ]},
                                                {tag:'div', id:'directLoginsBlock', children:[
                                                        {tag:'div', cls:'directLoginsBlockHeaderBox', children:[{tag:'h3', id:'directLoginTitle', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockLabel']}]},
                                                        {tag:'div', id:'directLoginsDescription', htmlString:Clipperz.PM.Strings['mainPanelDirectLoginBlockDescription']},
                                                        {tag:'ul', id:'directLogins'}
                                                ]}
                                        ]},
                                        {tag:'td', width:'15', children:[
                                                {tag:'div', cls:'mainPanelMinHeightDiv'}
                                        ]},
                                        {tag:'td', valign:'top', children:[
                                                {tag:'div', id:'mainContent', children:[
                                                        {tag:'div', id:'recordListBlockHeader'},
                                                        {tag:'div', id:'recordListAndDetailBlock', children:[
                                                                {tag:'table', id:'recordListAndDetailBlockTABLE', border:'0', cellspacing:'0', cellpadding:'0', children:[
                                                                        {tag:'tbody', children:[
                                                                                {tag:'tr', children:[
                                                                                        {tag:'td', valign:'top', width:'250', children:[
                                                                                                {tag:'div', id:'recordListBlock', children:[
                                                                                                        {tag:'div', id:'recordListFilterHeader'},
                                                                                                        {tag:'ul', id:'records'}
                                                                                                ]}
                                                                                        ]},
                                                                                        {tag:'td', id:'recordDetailSeparatorTD', rowspan:'2', valign:'top', bgcolor:'#ddddff', html:'&nbsp;'},
                                                                                        {tag:'td', valign:'top', children:[
                                                                                                {tag:'div', id:'recordDetailMainBlock', children:[
                                                                                                        {tag:'div', id:'recordTitleTopBlock'},
                                                                                                        {tag:'div', id:'recordDetailBlock', children:[
                                                                                                                {tag:'div', id:'recordDetail'}
                                                                                                        ]}
                                                                                                ]},
                                                                                                {tag:'div', id:'recordCreationWizardMainBlock', children:[
                                                                                                        {tag:'div', id:'recordCreationWizard', html:"WIZARD"}
                                                                                                ]}
                                                                                        ]}
                                                                                ]},
                                                                                {tag:'tr', children:[
                                                                                        {tag:'td', id:'cardBoxLowerLeftTD', html:'&nbsp;'},
                                                                                        {tag:'td', id:'cardBoxLowerRightTD', html:'&nbsp;'}
                                                                                ]}
                                                                        ]}
                                                                ]}
                                                        ]}
                                                ]}
                                        ]},
                                        {tag:'td', width:'15', html:"&nbsp;"}
                                ]}
                        ]}
                ]});
                this.renderRecordListBlockHeader();
        //      this.renderRecordListFilterHeader();
                YAHOO.ext.Element.get('directLogins').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
+                        //TODO
+                new YAHOO.ext.Button('payButton', {text:"Info", handler:this.payButtonHandler, scope:this});
+                
                this.recordDetailComponent();
                YAHOO.ext.Element.get('recordDetailMainBlock').setVisibilityMode(YAHOO.ext.Element.DISPLAY).show();
                YAHOO.ext.Element.get('recordCreationWizardMainBlock').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide();
        },
+        //-------------------------------------------------------------------------
+        'payButtonHandler': function(anEvent) {
+                window.open('https://www.clipperz.com/pricing/', '_blank');
+        },
        
        //-------------------------------------------------------------------------
        'addNewRecordButton': function() {
                return this._addNewRecordButton;
        },
        
        'setAddNewRecordButton': function(aValue) {
                this._addNewRecordButton = aValue;
        },
        
        'deleteRecordButton': function() {
                return this._deleteRecordButton;
        },
        
        'setDeleteRecordButton': function(aValue) {
                this._deleteRecordButton = aValue;
        },
        //-------------------------------------------------------------------------
        
        'addNewRecord': function(anEvent) {
                var deferredResult;
        //      var currentNumberOfRecords;
                
                deferredResult = new MochiKit.Async.Deferred();
                
        //      currentNumberOfRecords = MochiKit.Base.keys(this.user().records()).length;
 /*
        //      if ((this.user().preferences().shouldShowDonationPanel()) && (currentNumberOfRecords > 0) && ((currentNumberOfRecords%10) == 0)) {
        //      if (true) {
                if ((this.user().preferences().shouldShowDonationPanel()) && (currentNumberOfRecords >= 5)) {
                        deferredResult.addCallback(Clipperz.PM.showDonationSplashScreen, this.user(), 'recordListAddRecordButton');
                }
 */
                deferredResult.addCallback(MochiKit.Base.bind(function() {
                        var currentlySelectedRecord;
                        
                        currentlySelecedRecord = this.selectedRecord();
                        this.setSelectedRecord(null);
                
                        YAHOO.ext.Element.get('recordDetailMainBlock').hide();
                        YAHOO.ext.Element.get('recordCreationWizardMainBlock').show();
                        this.setCreationWizard(new Clipperz.PM.Components.RecordDetail.CreationWizard(YAHOO.ext.Element.get('recordCreationWizardMainBlock'), {previouslySelectedRecord:currentlySelecedRecord, mainComponent:this}));
                
                        this.enterModalView();
                }, this));
                deferredResult.callback();
        },
        //-------------------------------------------------------------------------
        'creationWizard': function() {
                return this._creationWizard;
        },
        
        'setCreationWizard': function(aValue) {
                this._creationWizard = aValue;
        },
        
        //-------------------------------------------------------------------------
        
        'exitWizard': function(aSelectedRecord, shouldEnterEditMode) {
 //MochiKit.Logging.logDebug(">>> MainPanel.exitWizard - " + aSelectedRecord)
                YAHOO.ext.Element.get('recordCreationWizardMainBlock').hide();
                YAHOO.ext.Element.get('recordDetailMainBlock').show();
                if (shouldEnterEditMode == true) {
                        this.selectRecordAndEnterEditMode(aSelectedRecord);
                } else {
                        this.setSelectedRecord(aSelectedRecord);
                        this.exitModalView();
                }
                
                this.creationWizard().remove();
                this.setCreationWizard(null);
 //MochiKit.Logging.logDebug("<<< MainPanel.exitWizard");
        },
        
        //-------------------------------------------------------------------------
        'selectRecordAndEnterEditMode': function(aRecord) {
                this.setSelectedRecord(aRecord);
                this.recordDetailComponent().setEditMode('EDIT');
        },
        'selectRecordAndEnterEditModeHandler': function(anEvent) {
                this.selectRecordAndEnterEditMode(anEvent.source());
        },
        //-------------------------------------------------------------------------
        'resizeModalMask': function() {
 //MochiKit.Logging.logDebug(">>> MainPanel.resizeModalMask");
                MochiKit.Style.setElementDimensions('recordDetailEditModeHeaderMask', {w:MochiKit.Style.getElementDimensions('mainDiv').w, h:119});
diff --git a/frontend/beta/js/Clipperz/PM/Main.js b/frontend/beta/js/Clipperz/PM/Main.js
index 3dded31..3329a8e 100644
--- a/frontend/beta/js/Clipperz/PM/Main.js
+++ b/frontend/beta/js/Clipperz/PM/Main.js
@@ -1,152 +1,152 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 if (typeof(Clipperz.PM) == 'undefined') { Clipperz.PM = {}; }
 Clipperz.PM.VERSION = "0.1";
 Clipperz.PM.NAME = "Clipperz.PM";
 //#############################################################################
 Clipperz.PM.Main = function() {
        this._loginPanel = null;
        this._user = null;
        this._isRunningCompact = false;
        
        Clipperz.NotificationCenter.register(null, 'userConnected', this, 'userConnectedCallback');
        Clipperz.NotificationCenter.register(null, 'switchLanguage', this, 'switchLanguageHandler');
        Clipperz.NotificationCenter.register(null, 'EXCEPTION', this, 'reportException');
        
        return this;
 }
 //=============================================================================
 MochiKit.Base.update(Clipperz.PM.Main.prototype, {
        'toString': function() {
                return "Clipperz.PM.Main";
        },
        'switchLanguageHandler': function() {
 //MochiKit.Logging.logDebug(">>> main.switchLanguageHandler");
                YAHOO.ext.Element.get('donateHeaderIconLink').dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl'];
                YAHOO.ext.Element.get('donateHeaderLink').update(Clipperz.PM.Strings['donateHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['donateHeaderLinkUrl'];
-                YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl'];
+        //      YAHOO.ext.Element.get('creditsHeaderLink').update(Clipperz.PM.Strings['creditsHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['creditsHeaderLinkUrl'];
                YAHOO.ext.Element.get('feedbackHeaderLink').update(Clipperz.PM.Strings['feedbackHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['feedbackHeaderLinkUrl'];
                YAHOO.ext.Element.get('helpHeaderLink').update(Clipperz.PM.Strings['helpHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['helpHeaderLinkUrl'];
                YAHOO.ext.Element.get('forumHeaderLink').update(Clipperz.PM.Strings['forumHeaderLinkLabel']).dom.href = Clipperz.PM.Strings['forumHeaderLinkUrl'];
                if (YAHOO.ext.Element.get('logout') != null) {
                        YAHOO.ext.Element.get('logout').update(Clipperz.PM.Strings['logoutMenuLabel']);
                        YAHOO.ext.Element.get('lock').update(Clipperz.PM.Strings['lockMenuLabel']);
                        YAHOO.ext.Element.get('recordsTabAnchor').update(Clipperz.PM.Strings['recordMenuLabel']);
                        YAHOO.ext.Element.get('accountTabAnchor').update(Clipperz.PM.Strings['accountMenuLabel']);
                        YAHOO.ext.Element.get('dataTabAnchor').update(Clipperz.PM.Strings['dataMenuLabel']);
        //              YAHOO.ext.Element.get('contactsTabAnchor').update(Clipperz.PM.Strings['contactsMenuLabel']);
                        YAHOO.ext.Element.get('toolsTabAnchor').update(Clipperz.PM.Strings['toolsMenuLabel']);
                }
 //MochiKit.Logging.logDebug("<<< main.switchLanguageHandler");
        },
        
        //-------------------------------------------------------------------------
        'fixToDrawTheMainTabsCorrectlyOnSafari': function() {
                this.switchLanguageHandler();
        },
        
        //-------------------------------------------------------------------------
        'run': function(shouldShowRegistrationForm) {
                        varmainElement;
                Clipperz.NotificationCenter.register(null, 'updatedProgressState', this, 'updateProgressDialogStatus');
                YAHOO.ext.Element.get('recordDetailEditModeHeaderMask').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide().unmask();
                YAHOO.ext.Element.get('recordDetailEditModeVerticalMask').setVisibilityMode(YAHOO.ext.Element.DISPLAY).hide().unmask();
                
 //MochiKit.Logging.logDebug(">>> Main.run");
                mainElement = YAHOO.ext.Element.get('main');
                if (Clipperz.PM.Proxy.defaultProxy.isReadOnly()) {
                        YAHOO.ext.Element.get('applicationVersionType').dom.className = "readOnly";
                }
                mainElement.update("");
                Clipperz.YUI.DomHelper.append(mainElement.dom, {tag:'ul', cls:'clipperzTabPanels', children:[
                        {tag:'li', id:'loginPanel'}
                ]})
                this.setLoginPanel(new Clipperz.PM.Components.Panels.LoginPanel(YAHOO.ext.Element.get('loginPanel')));
 //MochiKit.Logging.logDebug("--- Main.run - selecting active form to show ...");
                if (shouldShowRegistrationForm == true) {
                        this.loginPanel().showRegistrationForm(false);
                } else {
                        this.loginPanel().showLoginForm(false);
                }
                this.switchLanguageHandler();
 //MochiKit.Logging.logDebug("--- Main.run - selecting active form to show. done.");
 //MochiKit.Logging.logDebug("<<< Main.run");
        },
        //-------------------------------------------------------------------------
        'runCompact': function() {
                this.setIsRunningCompact(true);
                YAHOO.ext.Element.get(document.body).addClass("compact");
                new Clipperz.PM.Components.Compact.LoginForm(YAHOO.ext.Element.get('mainDiv'));
        },
        
        'showCompactInterface': function() {
 //MochiKit.Logging.logDebug(">>> main.showCompactInterface");
                new Clipperz.PM.Components.Compact.CompactInterface(YAHOO.ext.Element.get('compactBody'), {user:this.user()});
 //MochiKit.Logging.logDebug("<<< main.showCompactInterface");
        },
        
        //-------------------------------------------------------------------------
        'mainPage': function() {
                if (this._mainPage == null) {
                        this._mainPage = new Clipperz.PM.Components.MainPage();
                }
                
                return this._mainPage;
        },
        //-------------------------------------------------------------------------
        
        'loginPanel': function() {
                return this._loginPanel;
        },
        
        'setLoginPanel': function(aValue) {
                this._loginPanel = aValue;
        },
        
        //-------------------------------------------------------------------------
        'showMainPanels': function() {
                        varmainElement;
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js
index 0ca4b51..1e2cb50 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_de-DE.js
@@ -1,167 +1,167 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['de-DE'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescription':"<h2>Privatsphäre für Deine Daten</h2> <ul> <li> <h3>Clipperz heißt:</h3> <ul> <li> <p>sichere und einfache zu bedienene Passwortverwaltung</p> </li> <li> <p>eine effektive Lösung des einmaligen Anmeldens</p> </li> <li> <p>eine digitale Brieftasche für Deine vertraulichen Daten</p> </li> </ul> </li> <li> <h3>Clipperz bietet Dir:</h3> <ul> <li> <p>einfaches Speichern und Verwalten von Passwörtern und Webzugangsdaten</p> </li> <li> <p>schnelles unkompliziertes einloggen, ohne Eingabe des Benutzernamen und Passworts, bei Webdiensten</p> </li> <li> <p>Schutz aller Deiner persönlichen Daten: Zutrittscodes, PINs, Benutzernamen, Passwörter, Kreditkartennummern, &hellip;</p> </li> <li> <p>Deine Geheimnisse mit Familienmitgliedern und Freunden zu teilen (mehr dazu in Kürze)</p> </li> </ul> </li> <li> <h3>Clipperz ist:</h3> <ul> <li> <p>kostenlos und absolut anonym</p> </li> <li> <p>unkomplizierter Zugriff zu jeder Zeit von jedem Rechner</p> </li> <li> <p>ohne Download und Installation verwendbar</p> </li> <li> <p>ein Schutz gegen das Speichern von Passwörtern auf Deinem PC oder das Notieren auf Papier</p> </li> </ul> </li> <li> <h3>Clipperz Sicherheit:</h3> <ul> <li> <p>Deine sensiblen persönlichen Informationen werden lokal durch Deinen Browser verschlüsselt, bevor sie an Clipperz über das Internet gesendet werden</p> </li> <li> <p>Der Schlüssel für diese Daten ist der Sicherheitssatz, den nur Du kennst</p> </li> <li> <p>Clipperz speichert Deine sensiblen Daten nur in verschlüsselter Form und kann zu keinem Zeitpunkt diese entschlüssel und in ihrer ursprünglichen Klartextform zugänglich machen</p> </li> <li> <p>Clipperz basiert auf standart Verschlüsselungsverfahren. Nichts ausergewöhnliches – oder hand gestricktes</p> </li> <li> <p>Du kannst den Quellcode zu jeder Zeit anschauen, aber Du brauchst nichts von Kryptographie zu verstehen um ein glücklicher Anwender zu sein!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Weitere Informationen</a> </li> </ul> ",
        'loginFormTitle':"Login zu Deinem Clipperz Konto",
        'loginFormUsernameLabel':"Benutzernamen",
        'loginFormPassphraseLabel':"Sicherheitssatz",
        'loginFormDontHaveAnAccountLabel':"Du hast noch kein Clipperz Konto?",
        'loginFormCreateOneLabel':"Konto erstellen",
        'loginFormForgotYourCredentialsLabel':"Zugangsdaten vergessen?",
        'loginFormAarghThatsBadLabel':"Misst! Dass ist schlecht!",
        'loginFormAfraidOfMaliciousScriptsLabel':"verängstigt von bösartigen Scripts?",
        'loginFormVerifyTheCodeLabel':"begutachte den Quellcode",
        'loginFormButtonLabel':"Einloggen",
        'loginPanelSwithLanguageDescription':"<h5>Wechsel zu Deiner vervorzugten Sprache</h5> ",
        'browserCompatibilityDescription':"<p>Bessere und sicherere Clipperz-Erfahrung mit Firefox. Clipperz funktioniert auch mit Safari, Opera und MS Internet Explorer!</p> ",
        'loginMessagePanelInitialTitle':"Du wirst eingeloggt…",
        'loginMessagePanelInitialButtonLabel':"Abbruch",
        'loginMessagePanelConnectedTitle':"Verbunden",
        'loginMessagePanelConnectedText':"Fertig",
        'loginMessagePanelFailureTitle':"Fehler",
        'loginMessagePanelFailureText':"Login fehlgeschlagen",
        'loginMessagePanelFailureButtonLabel':"Schließen",
        'connectionLoginSendingCredentialsMessageTitle':"Prüfe Zugangsdaten",
        'connectionLoginSendingCredentialsMessageText':"Sende Zugangsdaten",
        'connectionLoginCredentialsVerificationMessageTitle':"Prüfe Zugangsdaten",
        'connectionLoginCredentialsVerificationMessageText':"Führe SRP Authentifizierung durch",
        'connectionLoginDoneMessageTitle':"Prüfe Zugangsdaten",
        'connectionLoginDoneMessageText':"Verbunden",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"Prüfe Zugangsdaten",
        'userLoginPanelUpgradingUserCredentialsMessageText':"Aktualisierung Deiner Zugangsdaten auf ein neues Authentifizierungsschema",
        'userLoginPanelConnectedMessageTitle':"Benutzer authentifiziert",
        'userLoginPanelConnectedMessageText':"Login erfolgreich",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Prüfe Zugangsdaten",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Probiere älteres Authentifizierungsschema",
        'userLoginPanelLoadingUserDataMessageTitle':"Benutzer authentifiziert",
        'userLoginPanelLoadingUserDataMessageText':"Lade verschlüsselte Kartendaten von Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':"Benutzer authentifiziert",
        'userLoginPanelDecryptingUserDataMessageText':"Lokale Entschlüsselung der Kartendaten",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"Benutzer authentifiziert",
        'userLoginPanelDecryptingUserStatisticsMessageText':"Lokale Entschlüsselung der Benutzerstatisik",
        'splashAlertTitle':"Willkommen bei Clipperz!",
        'splashAlertText':"<p>Sicherheitshinweis</p> <ul> <li> <p>Die Speicherung von Informationen bei Clipperz ist so sicher, wie der Sicherheitssatz den Du zum Schutz gewählt hast. Ist der Sicherheitssatz nicht bekannt, können keine Informationen abgefragt werden.</p> </li> <li> <p>Solltest Du Clipperz nutzen, um sensible und kritische persönliche Daten abzuspeichern, so empfehlen wir in jedem Fall die Nutzung eines langen Sicherheitssatzes als Passwort und die Nutzung von Sonderzeichen, Zahlen, Groß- und Kleinbuchstaben.</p> </li> <li> <p>Clipperz kann einen verlorenen Sicherheitssatz nicht wiederherstellen!</p> </li> </ul> <p>Weitere Informationen findest Du bei <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ",
        'splashAlertCloseButtonLabel':"Ok",
        'registrationFormTitle':"Erstelle Dein Konto",
        'registrationFormUsernameLabel':"Benutzernamen",
        'registrationFormPassphraseLabel':"Sicherheitssatz",
        'registrationFormRetypePassphraseLabel':"Wiederhole Sicherheitssatz",
        'registrationFormSafetyCheckLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.",
-        'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.",
+        'registrationFormTermsOfServiceCheckLabel':"Ich habe die <a href='https://www.clipperz.com/terms_service' target='_blank'>Nutzungsbedingungen</a> gelesen, verstanden und akzeptiere diese.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"Hast Du bereits einen Zugang?",
        'registrationFormSimplyLoginLabel':"Einloggen",
        'registrationFormButtonLabel':"Anmelden",
        'registrationFormWarningMessageNotMatchingPassphrases':"Deine Sicherheitssätze stimmen nicht überein. Bitte erneut eingeben.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Bitte lese die Bedingungen und akzeptiere die Auswahlboxen weiter unten.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Du musst die Nutzungsbedingungen akzeptieren.",
        'registrationMessagePanelInitialTitle':"Benutzer wird angelegt…",
        'registrationMessagePanelInitialButtonLabel':"Abbruch",
        'registrationMessagePanelRegistrationDoneTitle':"Anmeldung",
        'registrationMessagePanelRegistrationDoneText':"Fertig",
        'registrationMessagePanelFailureTitle':"Anmerldung fehlgeschlagen",
        'registrationMessagePanelFailureButtonLabel':"Schließen",
        'connectionRegistrationSendingRequestMessageText':"Zugangsdaten werden geprüft",
        'connectionRegistrationSendingCredentialsMessageText':"Sende Zugangsdaten",
        'registrationSplashPanelTitle':"Sicherheitshinweis",
        'registrationSplashPanelDescription':"<p>Dies sind Deine Clipperz Zugangsdaten, pass sehr gut auf sie auf. Clipperz wird diese kein zweites und weiteres mal anzeigen!</p> ",
        'registrationSplashPanelUsernameLabel':"Benutzernamen",
        'registrationSplashPanelPassphraseLabel':"Schlüsselsatz",
        'donateHeaderLinkLabel':"spende",
        'creditsHeaderLinkLabel':"credits",
        'feedbackHeaderLinkLabel':"feedback",
        'helpHeaderLinkLabel':"hilfe",
        'forumHeaderLinkLabel':"forum",
        'recordMenuLabel':"Karten",
        'accountMenuLabel':"Benutzer",
        'dataMenuLabel':"Daten",
        'contactsMenuLabel':"Kontakt",
        'bookmarkletMenuLabel':"Bookmarklet",
        'logoutMenuLabel':"Ausloggen",
        'lockMenuLabel':"Sperren",
        'lockTitle':"Dieses Konto ist gesperrt",
        'lockDescription':"<p>Bitte gebe Deinen Sicherheitssatz ein, um das Clipperz-Konto zu entsperren.</p> ",
        'unlockButtonLabel':"Entsperren",
        'changePasswordTabLabel':"Sicherheitssatz ändern",
        'changePasswordTabTitle':"Sicherheitssatz ändern",
        'changePasswordFormUsernameLabel':"Benutzername",
        'changePasswordFormOldPassphraseLabel':"Alter Sicherheitssatz",
        'changePasswordFormNewPassphraseLabel':"Neuer Sicherheitssatz",
        'changePasswordFormRetypePassphraseLabel':"Wiederholdung neuen Sicherheitssatz",
        'changePasswordFormSafetyCheckboxLabel':"Ich akzeptiere dass es Clipperz nicht möglich ist, einen verlorenen Sicherheitssatz wiederherzustellen.",
        'changePasswordFormSubmitLabel':"Sicherheitssatz ändern",
        'changePasswordFormWrongUsernameWarning':"Falscher Benutzername",
        'changePasswordFormWrongPassphraseWarning':"Falscher Sicherheitssatz",
        'changePasswordFormWrongRetypePassphraseWarning':"Deine Sicherheitssätze stimmen nicht überein. Bitte erneut eingeben.",
        'changePasswordFormSafetyCheckWarning':"Bitte ließ die folgenden Hinweise und akzeptiere diese.",
        'changePasswordFormProgressDialogTitle':"Ändere Zugangsdaten",
        'changePasswordFormProgressDialogConnectedMessageTitle':"Verbunden",
        'changePasswordFormProgressDialogConnectedMessageText':"Fertig",
        'changePasswordFormProgressDialogErrorMessageTitle':"Fehler",
        'changePasswordFormProgressDialogErrorMessageText':"Ändern der Zugangsdaten fehlgeschlagen!",
        'changeCredentialsPanelEncryptingDataMessageTitle':"Ändere Sicherheitssatz",
        'changeCredentialsPanelEncryptingDataMessageText':"Lokale Verschlüsselung der Kartendaten",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"Ändere Sicherheitssatz",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"Aktualisiere Zugangsdaten",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Ändere Sicherheitssatz",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Sende verschlüsselte Zugangsdaten zu Clipperz",
        'changeCredentialsPanelDoneMessageTitle':"Ändere Sicherheitssatz",
        'changeCredentialsPanelDoneMessageText':"Fertig",
        'manageOTPTabLabel':"Verwaltung des Sicheitssatzes für einmaliges Anmelden",
        'manageOTPTabTitle':"Verwaltung des Sicheitssatzes für einmaliges Anmelden",
        'manageOTPTabDescription':"<p>Der Sicherheitssatz für einmaliges Anmelden funktoniert wie Dein regulärer Sicherheitssatz, nur dass er nur einmal verwendet werden kann.</p> <p>Sollte der gleiche Sicherheitssatz zu einem späteren Zeitpunkt nocheinmal genutzt werden, wird dieser automatisch zurückgewießen und der Einlogvorgang scheitert.</p> <p>Sofort nach einem erfolgreichen Login wird der Sicherheitssatz für einmaliges Anmelden gelöscht und somit verhindert dass er ungewollt verwendet wird.</p> <p>Die Nutzung von Sicherheitssätzen für einmaliges Anmelden sind eine ideale Möglichkeit wenn Du verunsichert bist ob Trojaner, Spyware oder ähnliches auf Deinem Rechner vorhanden ist.</p> <p> <b>Es wird empfohlen Sicherheitssätze für einmaliges Anmelden beim Zugiff auf Clipperz zu verwenden, wenn man sich an öffentlichen Rechnern befindet, wie in Internet Cafes oder Bücherreien.</b> </p> <p> </p> <p> <b>Mehr dazu in Kürze ...</b> </p> ",
        'accountPreferencesLabel':"Einstellungen",
        'accountPreferencesTabTitle':"Einstellungen",
        'accountPreferencesLanguageTitle':"Sprachenauswahl",
        'accountPreferencesLanguageDescription':"<p>Wähle Deine bevorzugte Sprache, aus der unten stehenden Liste.</p> ",
        'accountPreferencesInterfaceTitle':"Personalisiere Dein persönliches Clipperz-Erscheinungsbild",
        'accountPreferencesInterfaceDescription':"<p>Passe dass Clipperz-Erscheinungsbild an Deine Wünsche an.</p> ",
        'saveUserPreferencesFormSubmitLabel':"Speichern",
        'cancelUserPreferencesFormSubmitLabel':"Abbruch",
        'accountPreferencesSavingPanelTitle_Step1':"Speichere Einstellungen",
        'accountPreferencesSavingPanelText_Step1':"Lokale Verschlüsselung der Einstellungen",
        'accountPreferencesSavingPanelTitle_Step2':"Speichere Einstellungen",
        'accountPreferencesSavingPanelText_Step2':"Sende verschlüsselte Einstellungen",
        'deleteAccountTabLabel':"Konto löschen",
        'deleteAccountTabTitle':"Konto löschen",
        'deleteAccountFormUsernameLabel':"Benutzername",
        'deleteAccountFormPassphraseLabel':"Sicherheitssatz",
        'deleteAccountFormSafetyCheckboxLabel':"Ich bin mir bewusst, dass alle meine Daten gelöscht werden und dieser Vorgang in keinem Falle rückgängig gemacht werden kann.",
        'deleteAccountFormSubmitLabel':"Konto löschens",
        'deleteAccountFormWrongUsernameWarning':"Falscher Benutzername",
        'deleteAccountFormWrongPassphraseWarning':"Falscher Sicherheitssatz",
        'deleteAccountFormSafetyCheckWarning':"Bitte lese die Bedingungen und akzeptiere die Auswahlboxen weiter unten.",
        'accountPanelDeletingAccountPanelConfirmationTitle':"ACHTUNG",
        'accountPanelDeleteAccountPanelConfirmationText':"Bist Du sicher, dass Du den Zugang löschen möchtest?",
        'accountPanelDeleteAccountPanelConfirmButtonLabel':"Ja",
        'accountPanelDeleteAccountPanelDenyButtonLabel':"Nein",
        'offlineCopyTabLabel':"Offline Kopie",
        'offlineCopyTabTitle':"Offline Kopie",
        'offlineCopyTabDescription':"<p>Mit nur einem Klick kannst Du alle Deine verschlüsselten Daten von dem Clipperz Server auf Deine Festplatte speichern und somit eine “nur lesbare” Offline Version anlegen. Diese Version ist auch dann verwendbar, wenn Du keine Verbindung ins Internet hast. (Zum Beispiel zum Speichern von Login-Informationen bei einem Hotspot)</p> <p>Die “nur lesbare” Version ist genauso sicher, wie die änderbare Version auf dem Server. Deine Daten werden niemals entschlüsselt gespeichert - beide Versionen verwenden die gleiche Art der Verschlüsselung und Entschlüsselung direkt im Browser.</p> <ol> <li> <p>Klicke auf den untenstehenden Link um die Offline Version herunterzuladen.</p> </li> <li> <p>Der Browser fragt Dich, was Du mit der Datei “Clipperz_YYYYMMDD.zip” machen möchtest. Speichere Sie auf Deine Festplatte.</p> </li> <li> <p>Unzip (dekomprimiere) die Datei. Du erhälst das Verzeichnis “Clipperz_YYYYMMDD”.</p> </li> <li> <p>Öffne das Verzeichnis “Clipperz_YYYYMMDD” und mache einen Doppelklick auf die Datei “index.html”.</p> </li> <li> <p>Gib Deinen Clipperz Benutzernamen und Sicherheitsschlüssel ein, um Zugriff auf Deine persönlichen Daten auch ohne Internetzugang zu erhalten.</p> </li> </ol> ",
        'offlineCopyDownloadLinkLabel':"Download",
        'sharingTabLabel':"Freigabe für gemeinsame Nutzung",
        'sharingTabTitle':"Freigabe für gemeinsame Nutzung",
        'sharingTabDescription':"<p>Häufig muss eine vertrauenswürdige Information mit mehreren Personen geteilt werden.</p> <p>Dies sollte so einfach sein, wie einem Kollegen die PIN für den Anrufbeantworter zu geben, wenn Du im Urlaub bist; jedoch so schwierig, wie berechtigten Erben Zugriff auf das Ersparte bei der Bank zu geben.</p> <p>Clipperz ermöglicht die einfache Freigabe für gemeinsam genutzte Informationen, an berechtigte Personen, durch einen einfachen Prozess.</p> <p> </p> <p> <b>Mehr dazu in Kürze ...</b> </p> ",
        'importTabLabel':"Import",
        'importTabTitle':"Import",
        'importTabDescription':"<p> <b>In Kürze ...</b> </p> ",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js
index f7a7583..42ecf53 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_el-GR.js
@@ -56,193 +56,193 @@ Clipperz.PM.Strings.Languages['el-gr'] = MochiKit.Base.merge(Clipperz.PM.Strings
                                        {tag:'ul', children:[
                                                {tag:'li', children:[{tag:'span', html:'Είναι δωρεάν και προσφέρει πρόσβαση ανώνυμα'}]},
                                                {tag:'li', children:[{tag:'span', html:'Μπορεί να χρησιμοποιηθεί οποαδήποτε ώρα και από οποιοδήποτε τερματικό'}]},
                                                {tag:'li', children:[{tag:'span', html:'Δεν απαιτεί την φόρτωση και εγκατάσταση οποιουδήποτε λογισμικού'}]},
                                                {tag:'li', children:[{tag:'span', html:'Αποφεύγετε την διατήριση απορρήτων στον υπολογιστή σας ή σε έντυπη μορφή'}]}
                                        ]}
                                ]},
                                {tag:'li', children:[
                                        {tag:'h3', html:'Η ασφάλεια που παρέχει το Clipperz:'},
                                        {tag:'ul', children:[
                                                {tag:'li', children:[{tag:'span', html:'Τα απόρρητα δεδομένα σας κωδικοποιούνται τοπικά από τον διακομιστή σας (browser) πρίν να φορτωθούν στο Clipperz'}]},
                                                {tag:'li', children:[{tag:'span', html:'Το κλειδί της κωδικοποίησης είναι μία φράση-κωδικός γνωστή μόνο σε εσάς'}]},
                                                {tag:'li', children:[{tag:'span', html:'Το Clipperz φυλάσσει τα προσωπικά σας δεδομένα σε κωδικοποιημένη μορφή, και δεν μπορεί να έχει πρόσβαση σε αυτά στην αρχική τους μορφή'}]},
                                                {tag:'li', children:[{tag:'span', html:'Το Clipperz χρησιμοποιεί επίσημες /πρότυπες μεθόδους κωδικοποίησης, και όχι αόριστα και εφάνταστα μοντέλα'}]},
                                                {tag:'li', children:[{tag:'span', html:'Έχετε πρόσβαση στον πηγαίο κώδικα οποτεδήποτε το θελήσετε, και δεν χρειάζετε να γνωρίζετε τίποτα από κρυπτογράφηση για να είστε ένας ευχαριστημένος χρήστης!'}]}
                                        ]}
                                ]},
                                {tag:'li', children:[
                                        {tag:'a', href:"http://www.clipperz.com", target:'_blank', html:'Μάθετε περισσότερα'}
                                ]}
                        ]}
                ],
        // Login page - form
                'loginFormTitle':                                               "Συνδεθείτε με τον Clipperz λογαριασμό σας",
                'loginFormUsernameLabel':                               "Όνομα χρήστη",
                'loginFormPassphraseLabel':                             "Κωδική φράση",
                'loginFormDontHaveAnAccountLabel':              "Δεν έχετε δημιουργήσει λογαριασμό?",
                'loginFormCreateOneLabel':                              "Δημιουργήστε έναν",
                'loginFormForgotYourCredentialsLabel':  "Ξεχάσατε τα διαπιστευτήριά σας?",
                'loginFormAarghThatsBadLabel':                  "Ααααργκ! Αυτό είναι κακό!",
                'loginFormAfraidOfMaliciousScriptsLabel':"φοβάστε κακόβουλα προγράμματα (scripts)?",
                'loginFormVerifyTheCodeLabel':                  "Επαληθεύστε τον κωδικό",
                'loginFormButtonLabel':                                         "Σύνδεση",
 // Login page - language selection
                'loginPanelSwithLanguageDescriptionConfig':[
                {tag:'h5', html:"Αλλάξτε στην γλώσσα προτήμησης σας"}
        ],
 // Login page - browser compatibility
                'browserCompatibilityDescriptionConfig':[
                {tag:'p', html:"Έχετε μία καλύτερη και πιό ασφαλή Clipperz εμπειρία χρησιμοποιόντας τον Firefox. Ωστόσο το Clipperz συνεργάζετε άψογα με Opera και MS Internet Explorer!"}
        ], 
 // Login message panel
                'loginMessagePanelInitialTitle':                "Γίνεται σύνδεση ...",
                'loginMessagePanelInitialButtonLabel':  "Ακύρωση",
                'loginMessagePanelConnectedTitle':              "Συνδεθήκατε",
                'loginMessagePanelConnectedText':               "Ολοκληρώθηκε",
                'loginMessagePanelFailureTitle':                "Λάθος",
                'loginMessagePanelFailureText':                         "Η σύνδεση χρήστη απέτυχε",
                'loginMessagePanelFailureButtonLabel':  "Κλείσιμο",
 // Login message panel - connection
                'connectionLoginSendingCredentialsMessageTitle':        "Γίνεται επαλήθευση διαπιστευτηρίων",
                'connectionLoginSendingCredentialsMessageText':                 "Αποστέλλονται διαπιστευτήρια",
                'connectionLoginCredentialsVerificationMessageTitle':"Γίνεται επαλήθευση διαπιστευτηρίων",
                'connectionLoginCredentialsVerificationMessageText':"Εκτέλεση πιστοποίησης SRP ",
                'connectionLoginDoneMessageTitle':                                      "Γίνεται επαλήθευση διαπιστευτηρίων",
                'connectionLoginDoneMessageText':                                       "Συνδεδεμένος",
        
        //Login message panel - user
                'userLoginPanelUpgradingUserCredentialsMessageTitle':                           "Γίνεται επαλήθευση διαπιστευτηρίων",
                'userLoginPanelUpgradingUserCredentialsMessageText':                            "Αναβάθμηση των διαπιστευτηρίων σας σε ένα νέο σζήμα πιστοποίησης",
                'userLoginPanelConnectedMessageTitle':                                                          "Χρήστης πιστοποιήθηκε ",
                'userLoginPanelConnectedMessageText':                                                           "Συνδεθήκατε με επιτυχία",
                'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':                      "Γίνεται επαλήθευση διαπιστευτηρίων",
                'userLoginPanelTryingAnOlderConnectionSchemaMessageText':                       "Trying an older authentication schema",
                'userLoginPanelLoadingUserDataMessageTitle':                                            "Χρήστης πιστοποιήθηκε ",
                'userLoginPanelLoadingUserDataMessageText':                                                     "Downloading encrypted card headers from Clipperz",
                'userLoginPanelDecryptingUserDataMessageTitle':                                                 "Χρήστης πιστοποιήθηκε ",
                'userLoginPanelDecryptingUserDataMessageText':                                          "Local decryption of card headers",
                'userLoginPanelDecryptingUserStatisticsMessageTitle':                           "Χρήστης πιστοποιήθηκε ",
                'userLoginPanelDecryptingUserStatisticsMessageText':                            "Local decryption of usage statistics",
        
        //-----------------------------------------------------
        //Registration page - splash alert
                'splashAlertTitle':"Καλώς ήλθατε στο Clipperz!",
        'splashAlertTextConfig': [
                        {tag:'p', html:'Μερικές συμβουλές ασφαλείας'},
                        {tag:'ul', children:[
                                {tag:'li', children:[{tag:'span', html:'Η αποθήκευση των δεδομένων σας στο Clipperz είναι τόσο ασφαλής, όσο η κωδική φράση που επιλέγετε για να τα προστατεύσετε. Κανένας δεν θα έχει πρόσβαση σε αυτά, εκτός αν γνωρίζει την κωδική φράση σας.'}]},
                                {tag:'li', children:[{tag:'span', html:'Αν πρόκειται να χρησιμοποιήσετε το Clipperz για ασφαλή προστασία ευαίσθητων ή σημαντικών πληροφοριών, βεβαιωθείτε ότι θα χρησιμοποιήσετε μία “γερή” κωδική φράση. Όσο μεγαλύτερη, τόσο καλύτερη!'}]},
                                {tag:'li', children:[{tag:'span', html:'Το Clipperz δεν θα έχει τη δυνατότητα να ανακτήσει μία χαμένη κωδική φράση!'}]}
                        ]},
                        {tag:'p', html:'Για περισσότερες πληροφορίες, παρακαλώ ανατρέξτε στο <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.'}
                ],
                'splashAlertCloseButtonLabel':"Εντάξει",
        
        // Registration page - form
                'registrationFormTitle':                                                        "Δημιουργήστε λογαριασμό",
                'registrationFormUsernameLabel':                                        "Όνομα χρήστη",
                'registrationFormPassphraseLabel':                                      "Κωδική φράση",
                'registrationFormRetypePassphraseLabel':                        "Εισάγετε ξανά την κωδική φράση",
                'registrationFormSafetyCheckLabel':                                     "Κατανοώ πως το Clipperz δεν θα μπορεί να ανακτήσει μία χαμένη κωδική φράση.",
-                'registrationFormTermsOfServiceCheckLabel':                     "Έχω διαβάσει και αποδέχομαι τους Όρους Χρήσης <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Όρους Χρήσης</a>.",
+                'registrationFormTermsOfServiceCheckLabel':                     "Έχω διαβάσει και αποδέχομαι τους Όρους Χρήσης <a href='https://www.clipperz.com/terms_service' target='_blank'>Όρους Χρήσης</a>.",
                'registrationFormDoYouAlreadyHaveAnAccountLabel':       "Έχετε ήδη έναν λογαριασμό?",
                'registrationFormSimplyLoginLabel':                                     "απλώς συνδεθείτε",
                'registrationFormButtonLabel':                                          "Εγγραφείτε",
 // Registration page - warning messages
                'registrationFormWarningMessageNotMatchingPassphrases':"Οι κωδικές φράσεις που εισάγατε δεν ταιριάζουν. Παρακαλώ ξαναπροσπαθήστε.",
                'registrationFormWarningMessageSafetyCheckNotSelected':"Παρακαλώ διαβάστε και επιλέξτε όλες τις παρακάτω επιλογές.",
                'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Πρέπει να αποδεχθείτε τους Όρους Χρήσης.",
        // Registration message panel
                'registrationMessagePanelInitialTitle':                                 "Δημιουργία λογαριασμού ...",
                'registrationMessagePanelInitialButtonLabel':           "Ακύρωση",
                'registrationMessagePanelRegistrationDoneTitle':        "Εγγραφή",
                'registrationMessagePanelRegistrationDoneText':                 "Ολοκληρώθηκε",
                'registrationMessagePanelFailureTitle':                                 "Η εγγραφή απέτυχε",
                'registrationMessagePanelFailureButtonLabel':           "Κλείσιμο",
 // Registration - connection
                'connectionRegistrationSendingRequestMessageText':      "Γίνεται επαλήθευση διαπιστευτηρίων",
                'connectionRegistrationSendingCredentialsMessageText':"Αποστέλλονται διαπιστευτήρια",
        //-----------------------------------------------------
 // Registration splash panel
                'registrationSplashPanelTitle':"Συμβουλές Ασφαλείας",
                'registrationSplashPanelDescriptionConfig': [                           
                        {tag:'p', html:'Αυτά είναι τα διαπιστευτήριά σας στο Clipperz, δείτε τα προσεκτικά. Το Clipperz δεν θα απεικονίσει το όνομα χρήστη και την κωδική σας φράση δεύτερη φορά!'}
                ],
                'registrationSplashPanelUsernameLabel':                 "όνομα χρήστη",
                'registrationSplashPanelPassphraseLabel':"κωδική φράση",
        
        //-----------------------------------------------------
        //Header links
                'donateHeaderLinkLabel':"donate",
                'creditsHeaderLinkLabel':"credits",
                'feedbackHeaderLinkLabel':"feedback", 
                'helpHeaderLinkLabel':  "Βοήθεια", 
                'forumHeaderLinkLabel':                 "forum",
        
        //-----------------------------------------------------
        //Menu labels
                'recordMenuLabel':      "cards",
                'accountMenuLabel':     "Λογαριασμός",
                'dataMenuLabel':        "Δεδομένα",
                'contactsMenuLabel':"Επαφές",
                'bookmarkletMenuLabel':"bookmarklet",
                'logoutMenuLabel':      "Αποσύνδεση",
                'lockMenuLabel':        "lock",
 //-----------------------------------------------------
        //Lock dialog
                'lockTitle':                    "The account is locked",
                'lockDescriptionConfig':[
                {tag:'p', html:'To unlock your account, please insert your passphrase'}
        ],
                'unlockButtonLabel':    "Unlock",
                
 //-----------------------------------------------------
        //Account panel - change passphrase
                'changePasswordTabLabel':"Αλλάξτε την κωδική φράση σας",
                'changePasswordTabTitle':"Αλλάξτε την κωδική φράση σας",
        //Account panel - change passphrase - form
                'changePasswordFormUsernameLabel':              "όνομα χρήστη",
                'changePasswordFormOldPassphraseLabel':         "παλαιά κωδική φράση",
                'changePasswordFormNewPassphraseLabel':         "νέα κωδική φράση",
                'changePasswordFormRetypePassphraseLabel':"Εισάγετε ξανά τη νέα κωδική φράση",
                'changePasswordFormSafetyCheckboxLabel':"Κατανοώ πως το Clipperz δεν θα μπορεί να ανακτήσει μία χαμένη κωδική φράση.",
                'changePasswordFormSubmitLabel':                "Αλλάξτε την κωδική φράση σας",
        //Account panel - change passphrase - warnings
                'changePasswordFormWrongUsernameWarning':                       "Λάθος όνομα χρήστη",
                'changePasswordFormWrongPassphraseWarning':             "Λάθος κωδική φράση",
                'changePasswordFormWrongRetypePassphraseWarning':"Οι κωδικές φράσεις που εισάγατε δεν ταιριάζουν. Παρακαλώ ξαναπροσπαθήστε.",
                'changePasswordFormSafetyCheckWarning':                         "Παρακαλώ διαβάστε και επιλέξτε όλες τις παρακάτω επιλογές.",
        //Account panel - change passphrase - progress dialog
                'changePasswordFormProgressDialogTitle':                                                        "Γίνεται αλλαγή διαπιστευτηρίων χρήστη",
                'changePasswordFormProgressDialogConnectedMessageTitle':                        "Συνδεδεμένος",
                'changePasswordFormProgressDialogConnectedMessageText':                                 "Ολοκληρώθηκε",
                'changePasswordFormProgressDialogErrorMessageTitle':                            "Σφάλμα",
                'changePasswordFormProgressDialogErrorMessageText':                                     "Απέτυχε η αλλαγή διαπιστευτηρίων!",
        
                'changeCredentialsPanelEncryptingDataMessageTitle':                                     "Γίνεται αλλαγή της κωδικής φράσης σας",
                'changeCredentialsPanelEncryptingDataMessageText':                                      "Local encryption of card headers",
                'changeCredentialsPanelCreatingNewCredentialsMessageTitle':                     "Γίνεται αλλαγή της κωδικής φράσης σας",
                'changeCredentialsPanelCreatingNewCredentialsMessageText':                      "Γίνεται ανανέωση των διαπιστευτηρίων σας",
                'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Γίνεται αλλαγή της κωδικής φράσης σας",
                'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Uploading your encrypted credentials to Clipperz",
                'changeCredentialsPanelDoneMessageTitle':                                                       "Γίνεται αλλαγή της κωδικής φράσης σας",
                'changeCredentialsPanelDoneMessageText':                                                        "Ολοκληρώθηκε",
                        
 //-----------------------------------------------------
        //Account panel - manage OTP
                'manageOTPTabLabel':    "Manage your one-time passphrases",
                'manageOTPTabTitle':            "Manage your one-time passphrases",
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 97543a4..ce8dd85 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -66,193 +66,193 @@ Clipperz.PM.Strings.Languages['en-us'] = {
                        </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>.",
+        'registrationFormTermsOfServiceCheckLabel':                     "I have read and agreed to the <a href='https://www.clipperz.com/terms_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>",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js
index 2090913..34bdbec 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_es-ES.js
@@ -1,174 +1,174 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['es-ES'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescription':"<h2>Guárdelo usted mismo!</h2> <ul> <li> <h3>Clipperz es:</h3> <ul> <li> <p>un simple y seguro administrador de contraseñas</p> </li> <li> <p>una efectiva y simple solución de logueo</p> </li> <li> <p>un maletín digital para sus datos confidenciales</p> </li> </ul> </li> <li> <h3>Con Clipperz usted puede:</h3> <ul> <li> <p>administrar y almacenar en línea sus contraseñas y credenciales digitales</p> </li> <li> <p>ingresar en sus servicios  web  sin ningún nombre de usuario o contraseña</p> </li> <li> <p>protejer todos sus datos sensibles: códigos de alarmas, PINs y números de tarjetas de crédito, &hellip;</p> </li> <li> <p>compartir secretos con sus familiares y socios</p> </li> </ul> </li> <li> <h3>Beneficios de Clipperz:</h3> <ul> <li> <p>es gratis y completamente anónimo</p> </li> <li> <p>con acceso en cualquier momento y desde cualquier ordenador</p> </li> <li> <p>no necesita instalar o descargar ningún programa</p> </li> <li> <p>no necesita guardar secretos en papel o en el ordenador</p> </li> </ul> </li> <li> <h3>Seguridad de Clipperz:</h3> <ul> <li> <p>sus secretos son localmente encriptados por su navegador antes de ser almacenados en  Clipperz</p> </li> <li> <p>la llave de encriptación es una frase clave conocida solo por usted</p> </li> <li> <p>Clipperz almacena sus datos de manera encriptada y nunca accede a ellos en forma de texto plano</p> </li> <li> <p>Clipperz esta basado en esquemas estándares de encriptación, no hemos inventado nada</p> </li> <li> <p>usted puede revisar el código todas las veces que lo desee, ¡ pero no necesita conocer algo de encriptación para ser un usuario feliz!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Aprender más</a> </li> </ul> ",
        'loginFormTitle':"ingrese con su usuario Clipperz",
        'loginFormUsernameLabel':"usuario",
        'loginFormPassphraseLabel':"frase clave",
        'loginFormDontHaveAnAccountLabel':"¿no tiene una cuenta?",
        'loginFormCreateOneLabel':"crear una",
        'loginFormForgotYourCredentialsLabel':"¿perdió sus credenciales?",
        'loginFormAarghThatsBadLabel':"¡Ahhh! ¡eso es malo!",
        'loginFormAfraidOfMaliciousScriptsLabel':"¿evitar scripts maliciosos?",
        'loginFormVerifyTheCodeLabel':"verificar el código",
        'loginFormButtonLabel':"Ingresar",
        'loginFormOneTimePasswordCheckboxLabel':"usar una frase clave desechable",
        'loginPanelSwithLanguageDescription':"<h5>Cambiar a su lenguaje preferido</h5> ",
        'browserCompatibilityDescription':"<p>Obtenga una mejor y más segura experiencia con Firefox. De todas maneras Clipperz funciona también con Opera y MS Explorer!</p> ",
        'OTPloginMessagePanelInitialTitle':"Ingresar usando una frase clave desechable",
        'OTPloginMessagePanelInitialText':"Enviando credenciales OTP ...",
        'OTPloginMessagePanelLoadingTitle':"Ingresar usando una frase clave desechable",
        'OTPloginMessagePanelLoadingText':"Descargando datos de autenticación encriptados desde el servidor ...",
        'OTPloginMessagePanelProcessingTitle':"Ingresar usando una frase clave desechable",
        'OTPloginMessagePanelProcessingText':"Desencriptación local de datos de autenticación ...",
        'loginMessagePanelInitialTitle':"Ingresando ...",
        'loginMessagePanelInitialButtonLabel':"Cancelar",
        'loginMessagePanelConnectedTitle':"Conectado",
        'loginMessagePanelConnectedText':"Hecho",
        'loginMessagePanelFailureTitle':"Error",
        'loginMessagePanelFailureText':"Ingreso fallido",
        'loginMessagePanelFailureButtonLabel':"Cerrar",
        'connectionLoginSendingCredentialsMessageTitle':"Verificando credenciales",
        'connectionLoginSendingCredentialsMessageText':"Enviando credenciales",
        'connectionLoginCredentialsVerificationMessageTitle':"Verificando credenciales",
        'connectionLoginCredentialsVerificationMessageText':"Realizando una autenticación SRP",
        'connectionLoginDoneMessageTitle':"Verificando credenciales",
        'connectionLoginDoneMessageText':"Conectado",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verificando credenciales",
        'userLoginPanelUpgradingUserCredentialsMessageText':"Actualizando sus credenciales al nuevo esquema de autenticación",
        'userLoginPanelConnectedMessageTitle':"Usuario autenticado",
        'userLoginPanelConnectedMessageText':"Exitosamente logueado",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verifying credentials",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Probando un esquema de autenticación antiguo",
        'userLoginPanelLoadingUserDataMessageTitle':"Usuario autenticado",
        'userLoginPanelLoadingUserDataMessageText':"Descargando encabezamientos encriptados desde Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':"Usuario autenticado",
        'userLoginPanelDecryptingUserDataMessageText':"Desencriptación local de datos",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"Usuario autenticado",
        'userLoginPanelDecryptingUserStatisticsMessageText':"Desencriptación local de estadísticas de uso",
        'splashAlertTitle':"¡Bienvenido a Clipperz!",
        'splashAlertText':"<p>Algunas advertencias sobre seguridad</p> <ul> <li> <p>Almacenar sus datos en Clipperz es tan seguro como la frase clave que usted elija para protegerlos. Nadie puede acceder a ellos a no ser que conozca la frase clave.</p> </li> <li> <p>Si usted va a usar Clipperz para guardar información sensible y crítica, esté seguro de elegir una frase clave fuerte. ¡Cuanto más larga mejor!</p> </li> <li> <p>Clipperz no le permitirá recuperar una frase clave perdida.</p> </li> </ul> <p>Si necesita más información, por favor visite  el sitio de <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ",
        'splashAlertCloseButtonLabel':"Aceptar",
        'registrationFormTitle':"Abrir su cuenta",
        'registrationFormUsernameLabel':"usuario",
        'registrationFormPassphraseLabel':"frase clave",
        'registrationFormRetypePassphraseLabel':"reingrese la frase clave",
        'registrationFormSafetyCheckLabel':"Yo entiendo que Clipperz no me permite recuperar frases clave perdidas",
-        'registrationFormTermsOfServiceCheckLabel':"He leído y estoy de acuerdo con los <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Términos de Servicio</a>.",
+        'registrationFormTermsOfServiceCheckLabel':"He leído y estoy de acuerdo con los <a href='https://www.clipperz.com/terms_service' target='_blank'>Términos de Servicio</a>.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"¿usted ya tiene una cuenta?",
        'registrationFormSimplyLoginLabel':"ingreso simple",
        'registrationFormButtonLabel':"Registrarse",
        'registrationFormWarningMessageNotMatchingPassphrases':"Su frase clave no coincide, por favor reescríbala.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Por favor, lea y chequee todas las casillas debajo.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Usted necesita estar de acuerdo con los Términos de Servicio.",
        'registrationMessagePanelInitialTitle':"Creando cuenta ...",
        'registrationMessagePanelInitialButtonLabel':"Cancelar",
        'registrationMessagePanelRegistrationDoneTitle':"Registración",
        'registrationMessagePanelRegistrationDoneText':"Hecho",
        'registrationMessagePanelFailureTitle':"Registración fallada",
        'registrationMessagePanelFailureButtonLabel':"Cerrar",
        'connectionRegistrationSendingRequestMessageText':"Verificando credenciales",
        'connectionRegistrationSendingCredentialsMessageText':"Enviando credenciales",
        'registrationSplashPanelTitle':"Aviso de seguridad",
        'registrationSplashPanelDescriptionConfig':"<p>Estas son sus credenciales de Clipperz, cuídelas. ¡Clipperz nunca más le mostrará su cuenta y frase clave por segunda vez!</p> ",
        'registrationSplashPanelUsernameLabel':"usuario",
        'registrationSplashPanelPassphraseLabel':"frase clave",
        'registrationSplashPanelShowPassphraseButtonLabel':" mostrar frase clave",
        'donateHeaderLinkLabel':"donaciones",
        'creditsHeaderLinkLabel':"créditos",
        'feedbackHeaderLinkLabel':"contacto",
        'helpHeaderLinkLabel':"ayuda",
        'forumHeaderLinkLabel':"foro",
        'recordMenuLabel':"tarjetas",
        'accountMenuLabel':"cuenta",
        'dataMenuLabel':"datos",
        'contactsMenuLabel':"contactos",
        'toolsMenuLabel':"herramientas",
        'logoutMenuLabel':"salir",
        'lockMenuLabel':"bloquear",
        'lockTitle':"La cuenta está bloqueada",
        'lockDescriptionConfig':"<p>Para desbloquear su cuenta, por favor ingrese su frase clave</p> ",
        'unlockButtonLabel':"desbloquear",
        'changePasswordTabLabel':"Cambiar su frase clave",
        'changePasswordTabTitle':"Cambiar su frase clave",
        'changePasswordFormUsernameLabel':"usuario",
        'changePasswordFormOldPassphraseLabel':"frase clave anterior",
        'changePasswordFormNewPassphraseLabel':"nueva frase clave",
        'changePasswordFormRetypePassphraseLabel':"reingrese su nueva frase clave",
        'changePasswordFormSafetyCheckboxLabel':"Yo entiendo que Clipperz no me permite recuperar una frase clave perdida.",
        'changePasswordFormSubmitLabel':"Cambiar",
        'changePasswordFormWrongUsernameWarning':"Usuario incorrecto",
        'changePasswordFormWrongPassphraseWarning':"Frase clave incorrecta",
        'changePasswordFormWrongRetypePassphraseWarning':"Sus frases claves no coinciden, por favor reescríbalas.",
        'changePasswordFormSafetyCheckWarning':"Por favor lea y seleccione la casilla de abajo.",
        'changePasswordFormProgressDialogTitle':"Cambiando credenciales de usuario",
        'changePasswordFormProgressDialogConnectedMessageTitle':"Conectado",
        'changePasswordFormProgressDialogConnectedMessageText':"Hecho",
        'changePasswordFormProgressDialogErrorMessageTitle':"Error",
        'changePasswordFormProgressDialogErrorMessageText':"¡Cambio de credenciales fallado!",
        'changeCredentialsPanelEncryptingDataMessageTitle':"Cambiando su frase clave",
        'changeCredentialsPanelEncryptingDataMessageText':"Encriptación local de encabezados de tarjetas",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"Cambiando su frase clave",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"Actualizando su credenciales",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Cambiando su frase clave",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Subiendo sus credenciales encriptadas a Clipperz",
        'changeCredentialsPanelDoneMessageTitle':"Cambiando su frase clave",
        'changeCredentialsPanelDoneMessageText':"Hecho",
        'manageOTPTabLabel':"Administrar su frases clave desechables",
        'manageOTPTabTitle':"Administrar su frases clave desechables",
        'manageOTPTabDescription':"<p>Una frase clave desechable uso funciona como una frase clave regular, pero puede ser usada solo una vez.</p> <p>Si las misma frase clave es usada nuevamente en un segundo intento de acceso, esta será rechazada y el proceso de acceso fallará.</p> <p>Inmediatamente después de un acceso exitoso, su on-time frase clave será borrada previniendo accesos fraudulentos.</p> <p>Frases claves desechables son una excelente elección para protegerse de keyloggers y spywares, que pueden recolectar datos desde máquinas comprometidas.</p> <p> <b>Le recomendamos muy fuertemente que use frases claves desechables uso cuando acceda a Clipperz desde terminales públicas, como Internet Cafés, Cybercafés y bibliotecas.</b> </p> ",
        'oneTimePasswordReadOnlyMessage':"<h6>¡Disculpe!</h6> <p>Usted no puede usar su frases clave desechables mientras usa la versión fuera de línea de Clipperz.</p> ",
        'oneTimePasswordLoadingMessage':"<h6>Cargando datos</h6> <p>Por favor espere ...</p> ",
        'oneTimePasswordNoPasswordAvailable':"<h6>No hay frase clave desechables disponible</h6> <p>Haga click en el botón “Nueva” para agregar una frase clave desechables a su cuenta.</p> ",
        'createNewOTPButtonLabel':"Nueva",
        'deleteOTPButtonLabel':"Borrar",
        'printOTPButtonLabel':"Imprimir",
        'disabledOneTimePassword_warning':"desabilitado",
        'oneTimePasswordSelectionLink_selectLabel':"Seleccionar:",
        'oneTimePasswordSelectionLink_all':"todo",
        'oneTimePasswordSelectionLink_none':"ninguna",
        'oneTimePasswordSelectionLink_used':"usada",
        'oneTimePasswordSelectionLink_unused':"sin uso",
        'saveOTP_encryptUserDataTitle':"Guardando frase clave desechable",
        'saveOTP_encryptUserDataText':"Procesando nuevas credenciales OTP ...",
        'saveOTP_encryptOTPDataTitle':"Guardando frase clave desechable",
        'saveOTP_encryptOTPDataText':"Encriptación local de datos de autenticación ...",
        'saveOTP_sendingDataTitle':"Guardando frase clave desechable",
        'saveOTP_sendingDataText':"Enviando datos de autenticación al servidor ...",
        'saveOTP_updatingInterfaceTitle':"Guardando frase clave desechable",
        'saveOTP_updatingInterfaceText':"Actualizando interface ...",
        'accountPreferencesLabel':"Preferencias",
        'accountPreferencesTabTitle':"Preferencias",
        'accountPreferencesLanguageTitle':"Seleccione el lenguaje",
        'accountPreferencesLanguageDescription':"<p>Elija su lenguaje preferido de la siguiente lista.<p> ",
        'showDonationReminderPanelTitle':"Recordatorios de donaciones",
        'showDonationReminderPanelDescription':"<p>Mostrar recordatorios de donaciones</p> ",
        'accountPreferencesInterfaceTitle':"Personalización de la interface",
        'accountPreferencesInterfaceDescription':"<p>Ajuste Clipperz a sus necesidades.</p> ",
        'saveUserPreferencesFormSubmitLabel':"Guardar",
        'cancelUserPreferencesFormSubmitLabel':"Cancelar",
        'accountPreferencesSavingPanelTitle_Step1':"Guardando preferencias",
        'accountPreferencesSavingPanelText_Step1':"Encriptación local de sus preferencias",
        'accountPreferencesSavingPanelTitle_Step2':"Guardando preferencias",
        'accountPreferencesSavingPanelText_Step2':"Enviando preferencias encriptadas a Clipperz",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js
index 08f0c21..71ea987 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_fr-FR.js
@@ -1,167 +1,167 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['fr-FR'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescription':"<h2>Gardez le pour vous!</h2> <ul> <li> <h3>Clipperz est:</h3> <ul> <li> <p>un gestionnaire de mots de passe sécurisé</p> </li> <li> <p>une solution fiable d’authentification unique</p> </li> <li> <p>une chambre forte numérique pour vos données confidentielles</p> </li> </ul> </li> <li> <h3>Avec Clipperz vous pouvez:</h3> <ul> <li> <p>enregistrer et gérer vos mots de passe et autres informations d'identification en ligne</p> </li> <li> <p>vous identifier sur vos sites web sans avoir besoin de saisir votre nom d’utilisateur ou votre mot de passe</p> </li> <li> <p>protéger toutes vos données sensibles: codes d’alarmes, PINs (téléphone portable), carte de crédits, &hellip;</p> </li> <li> <p>partager certaines données confidentielles avec vos proches et vos associés (bientôt disponible!)</p> </li> </ul> </li> <li> <h3>Les avantages de Clipperz:</h3> <ul> <li> <p>c'est gratuit et totalement anonyme</p> </li> <li> <p>accéder à vos données depuis n’importe quel ordinateur</p> </li> <li> <p>vous n'avez besoin d'aucun logiciel et rien n'est à installer sur votre poste</p> </li> <li> <p>cela vous évite de garder des mots de passe sur votre PC ou sur des bouts de papier</p> </li> </ul> </li> <li> <h3>La sécurité de Clipperz:</h3> <ul> <li> <p>vos mots de passe sont localement chiffrés par votre navigateur avant d’être téléchargé à Clipperz</p> </li> <li> <p>la clé de cryptage est une phrase secrète détenue uniquement par vous même</p> </li> <li> <p>héberge vos données sensibles dans des formulaires cryptés et ne peuvent être consultées directement en clair</p> </li> <li> <p>est développé sur des standard de cryptage réputé sans aucune fantaisie ni de bricolage fait maison</p> </li> <li> <p>vous pouvez consulter le code source autant que vous le souhaitez</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Plus d’informations</a> </li> </ul> ",
        'loginFormTitle':"identifiez-vous avec votre compte Clipperz",
        'loginFormUsernameLabel':"nom d’utilisateur",
        'loginFormPassphraseLabel':"phrase secrète",
        'loginFormDontHaveAnAccountLabel':"vous n’avez pas de compte?",
        'loginFormCreateOneLabel':"créez votre compte",
        'loginFormForgotYourCredentialsLabel':"vous avez oublié votre certificat?",
        'loginFormAarghThatsBadLabel':"c’est fort dommage pour vous!",
        'loginFormAfraidOfMaliciousScriptsLabel':"vous avez peur des script malicieux?",
        'loginFormVerifyTheCodeLabel':"vérifiez le code",
        'loginFormButtonLabel':"S’identifer",
        'loginPanelSwithLanguageDescription':"<p>Sélectionnez votre langue préféré</p> ",
        'browserCompatibilityDescription':"<p>Have a better and safer Clipperz experience with Firefox. However Clipperz works just fine also with Opera and MS Internet Explorer!</p> ",
        'loginMessagePanelInitialTitle':"En cours d’identification ...",
        'loginMessagePanelInitialButtonLabel':"Annuler",
        'loginMessagePanelConnectedTitle':"Connecté",
        'loginMessagePanelConnectedText':"Terminé",
        'loginMessagePanelFailureTitle':"Erreur",
        'loginMessagePanelFailureText':"Identification échoué",
        'loginMessagePanelFailureButtonLabel':"Fermer",
        'connectionLoginSendingCredentialsMessageTitle':"Vérification des identifiants",
        'connectionLoginSendingCredentialsMessageText':"Envoi des identifiants",
        'connectionLoginCredentialsVerificationMessageTitle':"Vérification des identifiants",
        'connectionLoginCredentialsVerificationMessageText':"Authentification SRP en cours",
        'connectionLoginDoneMessageTitle':"Vérification des identifiants",
        'connectionLoginDoneMessageText':"Connecté",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"Vérification des identifiants",
        'userLoginPanelUpgradingUserCredentialsMessageText':"Mise à jour de vos identifiants à un nouveau schéma d’authentification",
        'userLoginPanelConnectedMessageTitle':"Utilisateur identifié",
        'userLoginPanelConnectedMessageText':"Vous vous êtes identifié avec succès",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Vérification des identifiants",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Nous essayons un ancien schéma d’authentification",
        'userLoginPanelLoadingUserDataMessageTitle':"Utilisateur identifié",
        'userLoginPanelLoadingUserDataMessageText':"Téléchargement des cartes d’en-têtes chiffrés depuis Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':"Utilisateur identifié",
        'userLoginPanelDecryptingUserDataMessageText':"Décryptage local des en-têtes chiffrés",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"Utilisateur identifié",
        'userLoginPanelDecryptingUserStatisticsMessageText':"Décryptage local des statistiques",
        'splashAlertTitle':"Bienvenue sur Clipperz!",
        'splashAlertText':"<p>Conseils de sécurité</p> <ul> <li> <p>Le stockage de vos mots de passe sur Clipperz est aussi sécurisé que la phrase que vous avez sélectionnée pour les protéger. Personne ne peux y accéder tant que personne ne connait votre phrase secrète.</p> </li> <li> <p>Si vous allez utiliser Clipperz pour sauvegarder des informations sensibles et critiques assurez-vous d’utiliser une phrase secrète compliquée. Plus elle sera longue mieux ce sera!</p> </li> <li> <p>Clipperz ne sera pas capable de récupérer votre phrase secrète!</p> </li> </ul> <p>Pour toute autre information, veuillez vous référer au site <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a>.</p> ",
        'splashAlertCloseButtonLabel':"Ok",
        'registrationFormTitle':"créer votre compte",
        'registrationFormUsernameLabel':"nom d’utilisateur",
        'registrationFormPassphraseLabel':"phrase secrète",
        'registrationFormRetypePassphraseLabel':"re-saisissez votre phrase secrète",
        'registrationFormSafetyCheckLabel':"J’accepte que Clipperz ne pourra pas récupérer ma phrase secrète.",
-        'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Conditions d’Utilisation du Service</a>.",
+        'registrationFormTermsOfServiceCheckLabel':"J’ai lu et j’accepte les <a href='https://www.clipperz.com/terms_service' target='_blank'>Conditions d’Utilisation du Service</a>.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"avez-vous déjà un compte?",
        'registrationFormSimplyLoginLabel':"identifiez-vous",
        'registrationFormButtonLabel':"S’inscrire",
        'registrationFormWarningMessageNotMatchingPassphrases':"Vos phrases secrètes ne correspondent pas, veuillez les saisir à nouveau.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Veuillez lire et cocher les cases-à-cocher ci-dessous.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Vous devez accepter les “Conditions d’Utilisation du Service”.",
        'registrationMessagePanelInitialTitle':"Création du compte en cours ...",
        'registrationMessagePanelInitialButtonLabel':"Annuler",
        'registrationMessagePanelRegistrationDoneTitle':"Enregistrement",
        'registrationMessagePanelRegistrationDoneText':"Terminé",
        'registrationMessagePanelFailureTitle':"Enregistrement échoué",
        'registrationMessagePanelFailureButtonLabel':"Fermer",
        'connectionRegistrationSendingRequestMessageText':"Vérification en cours des identifiants",
        'connectionRegistrationSendingCredentialsMessageText':"Envoi des identifiants",
        'registrationSplashPanelTitle':"Conseils de sécurité",
        'registrationSplashPanelDescription':"<p>Ce sont vos identifiants Clipperz, gardez les biens. Clipperz ne va plus jamais vous montrer votre nom d’utilisateur et votre phrase secrète!</p> ",
        'registrationSplashPanelUsernameLabel':"nom d’utilisateur",
        'registrationSplashPanelPassphraseLabel':"phrase secrète",
        'registrationSplashPanelShowPassphraseButtonLabel':"afficher la phrase secrète",
        'donateHeaderLinkLabel':"faites un don",
        'creditsHeaderLinkLabel':"crédits",
        'feedbackHeaderLinkLabel':"votre avis",
        'helpHeaderLinkLabel':"aide",
        'forumHeaderLinkLabel':"forum",
        'recordMenuLabel':"cartes",
        'accountMenuLabel':"compte",
        'dataMenuLabel':"données",
        'contactsMenuLabel':"contacts",
        'toolsMenuLabel':"outils",
        'logoutMenuLabel':"déconnexion",
        'lockMenuLabel':"verrouiller",
        'lockTitle':"Le compte est verrouillé",
        'lockDescription':"<p>Pour déverrouiller votre compte, veuillez saisir votre phrase secrète</p> ",
        'unlockButtonLabel':"Déverrouiller",
        'changePasswordTabLabel':"Changer votre phrase secrète",
        'changePasswordTabTitle':"Changer votre phrase secrète",
        'changePasswordFormUsernameLabel':"nom d’utilisateur",
        'changePasswordFormOldPassphraseLabel':"ancienne phrase secrète",
        'changePasswordFormNewPassphraseLabel':"nouvelle phrase secrète",
        'changePasswordFormRetypePassphraseLabel':"re-saisissez phrase secrète",
        'changePasswordFormSafetyCheckboxLabel':"Je sais que Clipperz ne pourra pas récupérer ma phrase secrète.",
        'changePasswordFormSubmitLabel':"Changer ma phrase secrète",
        'changePasswordFormWrongUsernameWarning':"Nom d’utilisateur incorrect",
        'changePasswordFormWrongPassphraseWarning':"Phrase secrète incorrect",
        'changePasswordFormWrongRetypePassphraseWarning':"Votre phrase secrète ne correspond pas, veuillez la saisir à nouveau",
        'changePasswordFormSafetyCheckWarning':"Veuillez lire et cocher la case-à-cocher ci-dessous",
        'changePasswordFormProgressDialogTitle':"Changement des identifiants utilisateurs",
        'changePasswordFormProgressDialogConnectedMessageTitle':"Connecté",
        'changePasswordFormProgressDialogConnectedMessageText':"Terminé",
        'changePasswordFormProgressDialogErrorMessageTitle':"Erreur",
        'changePasswordFormProgressDialogErrorMessageText':"Changement de identifiants échoué!",
        'changeCredentialsPanelEncryptingDataMessageTitle':"Changement de votre phrase secrète",
        'changeCredentialsPanelEncryptingDataMessageText':"Cryptage local des identifiants",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"Modifier votre phrase secrète",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"Mettre à jour vos identifiants",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Modifier votre phrase secrète",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Téléchargement de vos identifiants sur Clipperz.com",
        'changeCredentialsPanelDoneMessageTitle':"Modifier votre phrase secrète",
        'changeCredentialsPanelDoneMessageText':"Terminé",
        'manageOTPTabLabel':"Mettre à jour votre phrase secrète à usage unique",
        'manageOTPTabTitle':"Mettre à jour votre phrase secrète à usage unique",
        'manageOTPTabDescription':"<p>Une phrase secrète à usage unique fonctionne comme votre phrase secrète habituelle, mais elle ne peut être utilisé qu'une seule fois.</p> <p>Si la phrase secrète est utilisé de nouveau et que vous tenté de vous identifier à nouveau, vous serez rejeté et le processus d'identification échouera.</p> <p>Juste après une identification correcte, votre phrase secrète à usage unique sera effacée pour interdire tout accès frauduleux.</p> <p>Les phrases secrètes à usage unique sont un excellent choix si vous craignez qu'un logiciel espion ne vole vos données après avoir infecté votre machine.</p> <p> <b>Il est fortement recommandé d'utiliser des phrases secrètes à usage unique lorsque vous accédez à Clipperz depuis un terminal public, comme un cybercafé ou une borne Internet.</b> </p> ",
        'accountPreferencesLabel':"Préférences",
        'accountPreferencesTabTitle':"Préférences",
        'accountPreferencesLanguageTitle':"Choix de la langue",
        'accountPreferencesLanguageDescription':"<p>Choisissez la langue d'affichage de Clipperz dans la liste suivante.</p> ",
        'accountPreferencesInterfaceTitle':"Personnalisation de l'interface",
        'accountPreferencesInterfaceDescription':"<p>Ajustez l'interface de Clipperz à vos besoins.</p> ",
        'saveUserPreferencesFormSubmitLabel':"Enregistrer",
        'cancelUserPreferencesFormSubmitLabel':"Annuler",
        'accountPreferencesSavingPanelTitle_Step1':"Enregistrement des préférences",
        'accountPreferencesSavingPanelText_Step1':"Chiffrement local de vos préférences",
        'accountPreferencesSavingPanelTitle_Step2':"Enregistrement des préférences",
        'accountPreferencesSavingPanelText_Step2':"Transmission des préférences chiffrées au serveur",
        'deleteAccountTabLabel':"Supprimer votre compte",
        'deleteAccountTabTitle':"Supprimer votre compte",
        'deleteAccountFormUsernameLabel':"nom d’utilisateur",
        'deleteAccountFormPassphraseLabel':"phrase secrète",
        'deleteAccountFormSafetyCheckboxLabel':"Je sais que toute mes données seront supprimés et que cette action sera irréversible.",
        'deleteAccountFormSubmitLabel':"Supprimer mon compte",
        'deleteAccountFormWrongUsernameWarning':"Nom d’utilisateur incorrect",
        'deleteAccountFormWrongPassphraseWarning':"Phrase secrète incorrect",
        'deleteAccountFormSafetyCheckWarning':"Veuillez lire et cocher la case-à-cocher ci-dessous.",
        'accountPanelDeletingAccountPanelConfirmationTitle':"ATTENTION",
        'accountPanelDeleteAccountPanelConfirmationText':"Êtes-vous sûr de vouloir supprimer ce compte?",
        'accountPanelDeleteAccountPanelConfirmButtonLabel':"Oui",
        'accountPanelDeleteAccountPanelDenyButtonLabel':"Non",
        'offlineCopyTabLabel':"Copie locale",
        'offlineCopyTabTitle':"Copie locale",
        'offlineCopyTabDescription':"<p>D'un seul click, vous pouvez télécharger toutes vos données chiffrées des serveurs Clipperz sur votre disque dur, créant ainsi une version déconnecté de Clipperz utilisable lorsque vous n'êtes pas connectés à Internet.</p> <p>Cette version en lecture seule est aussi sécurisée que la version en lecture-écriture, et n'expose pas vos données à un risque plus élevé. Elles partagent en effet le même code et la même architecture de sécurité.</p> <ol> <li> <p>Cliquez sur le liens ci-dessous pour lancer le téléchargement.</p> </li> <li> <p>Votre navigateur vous demandera que faire du fichier “Clipperz_YYYYMMDD.html”. Sauvez le sur votre disque dur.</p> </li> <li> <p>Puis double-cliquez sur le fichier téléchargé pour lancer la version déconnectée dans votre navigateur.</p> </li> <li> <p>Utilisez vos nom d’utilisateur et phrase secrète habituels.</p> </li> </ol> ",
        'offlineCopyDownloadLinkLabel':"Télécharger",
        'sharingTabLabel':"Partager",
        'sharingTabTitle':"Partager",
        'sharingTabDescription':"<p>De temps en temps il est nécessaire de partager des parties de vos informations confidentiels avec une ou plusieurs personnes.</p> <p>Cela pourrait être aussi simple que l’octroi à un collègue de votre code d’accès à votre messagerie vocale quand vous êtes hors du bureau, ou aussi compliqués que la permission d’ayant droit aux héritiers pour avoir accès à votre boîte de coffre-fort à la banque locale.</p> <p>Clipperz vous permez donc de partager vos mots de passe grâce à un processe sûr et direct.</p> <p> </p> <p> <b>Prochainement disponible ...</b> </p> ",
        'importTabLabel':"Importer",
        'importTabTitle':"Importer",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js
index 0499376..9dd0511 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_it-IT.js
@@ -1,176 +1,176 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['it-IT'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescription':"<h2>Tienilo per te!</h2> <ul> <li> <h3>Clipperz è:</h3> <ul> <li> <p>un archivio semplice e sicuro per le tue password</p> </li> <li> <p>un canale di accesso unificato a tutti i tuoi servizi online</p> </li> <li> <p>una cassaforte digitale per tutti i tuoi dati riservati</p> </li> </ul> </li> <li> <h3>Con Clipperz puoi:</h3> <ul> <li> <p>memorizzare e gestire le password e le credenziali di accesso dei tuoi servizi online</p> </li> <li> <p>accedere ai tuoi servizi online con un solo click senza bisogno di inserire username o password</p> </li> <li> <p>proteggere tutte le tue informazioni confidenziali: codice dell&#x27;allarme di casa, dati delle carte di credito, …</p> </li> <li> <p>condividere dati riservati con i tuoi familiari o colleghi (disponibile a breve)</p> </li> </ul> </li> <li> <h3>I vantaggi di Clipperz:</h3> <ul> <li> <p>gratuito e completamente anonimo</p> </li> <li> <p>accessibile da qualsiasi computer</p> </li> <li> <p>nessun software da scaricare e niente da installare</p> </li> <li> <p>mai più informazioni riservate sul tuo PC o sulla carta!</p> </li> </ul> </li> <li> <h3>La sicurezza di Clipperz:</h3> <ul> <li> <p>i dati sono criptati dal tuo browser prima di essere inviati a Clipperz</p> </li> <li> <p>la chiave per decriptare i dati è conosciuta soltanto da te</p> </li> <li> <p>Clipperz riceve e memorizza solo i tuoi dati criptati e non ha nessuna possibilità di accedere alla versione in chiaro</p> </li> <li> <p>Clipperz utilizza solo sistemi crittografici standard, senza nessuna velleità di inventare e proporre nuovi algoritmi non validati dalla comunità scientifica</p> </li> <li> <p>tutto il codice di Clipperz è disponibile e può essere analizzato in qualsiasi momento, ma non serve essere un esperto di crittografia per apprezzare la sicurezza e la comodità di Clipperz!</p> </li> </ul> </li> <li><a href=\"http://www.clipperz.com\" target=\"_blank\">Maggiori informazioni su Clipperz (in inglese)</a> </li> </ul> ",
        'loginFormTitle':"accedi a Clipperz",
        'loginFormUsernameLabel':"Utente",
        'loginFormPassphraseLabel':"frase segreta",
        'loginFormDontHaveAnAccountLabel':"non ti sei ancora registrato?",
        'loginFormCreateOneLabel':"registrati adesso",
        'loginFormForgotYourCredentialsLabel':"hai perso i dati di accesso?",
        'loginFormAarghThatsBadLabel':"aargh! questo non è bello!",
        'loginFormAfraidOfMaliciousScriptsLabel':"non ti fidi?",
        'loginFormVerifyTheCodeLabel':"controlla il codice",
        'loginFormButtonLabel':"Accedi",
        'loginFormOneTimePasswordCheckboxLabel':"usa un codice “usa e getta”",
        'loginFormOneTimePasswordCheckboxDescription':"",
        'loginPanelSwithLanguageDescription':"<h5>Seleziona la tua lingua preferita</h5> ",
        'browserCompatibilityDescription':"<p>Clipperz consiglia Firefox per una maggiore sicurezza. Clipperz supporta anche Opera ed Internet Explorer.</p> ",
        'OTPloginMessagePanelInitialTitle':"Accesso con codice “usa e getta”",
        'OTPloginMessagePanelInitialText':"Invio delle credenziali OTP ...",
        'OTPloginMessagePanelLoadingTitle':"Accesso con codice “usa e getta”",
        'OTPloginMessagePanelLoadingText':"Caricamento dei dati di autenticazione criptati ...",
        'OTPloginMessagePanelProcessingTitle':"Accesso con codice “usa e getta”",
        'OTPloginMessagePanelProcessingText':"Decodifica locale dei dati di autenticazione ...",
        'loginMessagePanelInitialTitle':"Connessione in corso ...",
        'loginMessagePanelInitialText':"---",
        'loginMessagePanelInitialButtonLabel':"Annulla",
        'loginMessagePanelConnectedTitle':"Connesso",
        'loginMessagePanelConnectedText':"Fatto",
        'loginMessagePanelFailureTitle':"Errore",
        'loginMessagePanelFailureText':"Connessione fallita",
        'loginMessagePanelFailureButtonLabel':"Chiudi",
        'connectionLoginSendingCredentialsMessageTitle':"Verifica delle credenziali",
        'connectionLoginSendingCredentialsMessageText':"Invio delle credenziali",
        'connectionLoginCredentialsVerificationMessageTitle':"Verifica delle credenziali",
        'connectionLoginCredentialsVerificationMessageText':"Esecuzione dell&#x27;autenticazione SRP ...",
        'connectionLoginDoneMessageTitle':"Verifica delle credenziali",
        'connectionLoginDoneMessageText':"Connesso",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verifica delle credenziali",
        'userLoginPanelUpgradingUserCredentialsMessageText':"Aggiornamento delle credenziali ad un nuovo schema di autenticazione",
        'userLoginPanelConnectedMessageTitle':"Utente autenticato",
        'userLoginPanelConnectedMessageText':"Autenticazione eseguita con successo",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verifica delle credenziali",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Tentativo con vecchio schema di autenticazione",
        'userLoginPanelLoadingUserDataMessageTitle':"Utente autenticato",
        'userLoginPanelLoadingUserDataMessageText':"Scarica le intestazioni criptate delle schede da Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':"Utente autenticato",
        'userLoginPanelDecryptingUserDataMessageText':"Decodifica locale dell&#x27;intestazione delle schede",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"Utente autenticato",
        'userLoginPanelDecryptingUserStatisticsMessageText':"Decodifica locale delle statistiche d&#x27;uso",
        'splashAlertTitle':"Benvenuto a Clipperz!",
        'splashAlertText':"<p>Alcuni consigli per la sicurezza</p> <ul> <li> <p>La sicurezza dei tuoi dati dipende da quanto è sicura la frase segreta che usi per proteggerli. Nessuno può accedervi a meno che non conosca la frase segreta.</p> </li> <li> <p>Se hai intenzione di usare Clipperz per conservare informazioni sensibili e riservate, scegli attentamente una frase segreta complessa. Più è lunga, maggiore è la sicurezza!</p> </li> <li> <p>E non dimenticare che Clipperz non è in grado di recuperare la tua frase segreta in caso di smarrimento!</p> </li> </ul> <p>Per maggiori informazioni sulla sicurezza, consulta il sito <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> (in lingua inglese).</p> ",
        'splashAlertCloseButtonLabel':"Ok",
        'registrationFormTitle':"crea il tuo utente",
        'registrationFormUsernameLabel':"Utente",
        'registrationFormPassphraseLabel':"frase segreta",
        'registrationFormRetypePassphraseLabel':"ripeti frase segreta",
        'registrationFormSafetyCheckLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.",
-        'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"http://www.clipperz.com/terms_of_service\" target=\"_blank\">Termini del Servizio</a> .",
+        'registrationFormTermsOfServiceCheckLabel':"Dichiaro di aver letto e di accettare i <a href=\"https://www.clipperz.com/terms_service\" target=\"_blank\">Termini del Servizio</a> .",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"sei già un utente registrato?",
        'registrationFormSimplyLoginLabel':"accedi subito",
        'registrationFormButtonLabel':"Registrati",
        'registrationFormWarningMessageNotMatchingPassphrases':"Le frasi segrete non corrispondono, ripeti l&#x27;inserimento.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Leggi e spunta le condizioni sotto riportate.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Per procedere devi accettare i Termini del Servizio.",
        'registrationMessagePanelInitialTitle':"Registrazione in corso ...",
        'registrationMessagePanelInitialText':"---",
        'registrationMessagePanelInitialButtonLabel':"Annulla",
        'registrationMessagePanelRegistrationDoneTitle':"Registrazione",
        'registrationMessagePanelRegistrationDoneText':"Fatto",
        'registrationMessagePanelFailureTitle':"Registrazione fallita",
        'registrationMessagePanelFailureButtonLabel':"Chiudi",
        'connectionRegistrationSendingRequestMessageText':"Verifica delle credenziali",
        'connectionRegistrationSendingCredentialsMessageText':"Invio delle credenziali",
        'registrationSplashPanelTitle':"Avviso di sicurezza",
        'registrationSplashPanelDescription':"<p>Queste sono le tue credenziali di accesso a Clipperz, conservale con cura. Il tuo utente ed la tua frase segreta non ti verranno mostrati una seconda volta!</p> ",
        'registrationSplashPanelUsernameLabel':"Utente",
        'registrationSplashPanelPassphraseLabel':"frase segreta",
        'registrationSplashPanelShowPassphraseButtonLabel':"mostra la frase segreta",
        'donateHeaderLinkLabel':"donazioni",
        'creditsHeaderLinkLabel':"credits",
        'feedbackHeaderLinkLabel':"scrivici",
        'helpHeaderLinkLabel':"aiuto",
        'forumHeaderLinkLabel':"forum",
        'recordMenuLabel':"Schede",
        'accountMenuLabel':"profilo",
        'dataMenuLabel':"dati",
        'contactsMenuLabel':"Contatti",
        'toolsMenuLabel':"strumenti",
        'logoutMenuLabel':"esci",
        'lockMenuLabel':"blocca",
        'lockTitle':"Utente bloccato",
        'lockDescription':"<p>Per sbloccare il tuo utente inserisci la frase segreta</p> ",
        'unlockButtonLabel':"Sblocca",
        'changePasswordTabLabel':"Cambia la tua frase segreta",
        'changePasswordTabTitle':"Cambia la tua frase segreta",
        'changePasswordFormUsernameLabel':"Utente",
        'changePasswordFormOldPassphraseLabel':"attuale frase segreta",
        'changePasswordFormNewPassphraseLabel':"nuova frase segreta",
        'changePasswordFormRetypePassphraseLabel':"ripeti nuova frase segreta",
        'changePasswordFormSafetyCheckboxLabel':"Sono consapevole che Clipperz non è in grado di recuperare una frase segreta dimenticata.",
        'changePasswordFormSubmitLabel':"Cambia frase segreta",
        'changePasswordFormWrongUsernameWarning':"Utente errato",
        'changePasswordFormWrongPassphraseWarning':"Frase segreta errata",
        'changePasswordFormWrongRetypePassphraseWarning':"Le frasi segrete non corrispondono, ripeti l&#x27;inserimento.",
        'changePasswordFormSafetyCheckWarning':"Leggi e spunta le condizioni sotto riportate.",
        'changePasswordFormProgressDialogTitle':"Aggiornamento credenziali",
        'changePasswordFormProgressDialogEmptyText':"---",
        'changePasswordFormProgressDialogConnectedMessageTitle':"Connesso",
        'changePasswordFormProgressDialogConnectedMessageText':"Fatto",
        'changePasswordFormProgressDialogErrorMessageTitle':"Errore",
        'changePasswordFormProgressDialogErrorMessageText':"Aggiornamento credenziali fallito!",
        'changeCredentialsPanelEncryptingDataMessageTitle':"Cambio della frase segreta",
        'changeCredentialsPanelEncryptingDataMessageText':"Cripta localmente l&#x27;intestazione delle schede",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"Cambio della frase segreta",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"Aggiornamento delle credenziali",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Cambio della frase segreta",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Carica le intestazioni criptate delle schede su Clipperz",
        'changeCredentialsPanelDoneMessageTitle':"Cambio della frase segreta",
        'changeCredentialsPanelDoneMessageText':"Fatto",
        'manageOTPTabLabel':"Codici di accesso “usa e getta”",
        'manageOTPTabTitle':"Codici di accesso “usa e getta”",
        'manageOTPTabDescription':"<p>I codici di accesso e “usa e getta” funzionano come la tua normale frase segreta, ma possono essere utilizzate una sola volta.</p> <p>Se lo stesso codice “usa e getta” viene utilizzato per tentare ulteriori accessi il processo di autenticazione fallirà.</p> <p>Infatti, dopo il primo utilizzo, il codice “usa e getta” verrà immediatamente disattivato e cancellato prevenendo così eventuali accessi non autorizzati.</p> <p>L&#x27;utilizzo di codici “usa e getta” è una scelta consigliata per chi teme che il computer dal quale sta accedendo a Clipperz non sia sicuro a causa di software quali keyloggers e spyware che potrebbero registrare le proprie credenziali di accesso.</p> <p><b>E&#x27; caldamente consigliato l&#x27;utilizzo di codici “usa e getta” quando ci si collega a Clipperz da terminali pubblici quali Internet Cafe e biblioteche.</b> </p> ",
        'oneTimePasswordReadOnlyMessage':"<h6>Attenzione!</h6> <p>Non è possibilie accedere ai propri codici “usa e getta” quando si utilizza la versione offline di Clipperz.</p> ",
        'oneTimePasswordLoadingMessage':"<h6>Caricamento dati</h6> <p>Si prega di attendere ...</p> ",
        'oneTimePasswordNoPasswordAvailable':"<h6>Nessun codice “usa e getta” disponibile</h6> <p>Per creare codici “usa e getta” clicca sul pulsante “Nuovo” che trovi qui sopra.</p> ",
        'deleteOTPButtonLabel':"Elimina",
        'printOTPButtonLabel':"Stampa",
        'disabledOneTimePassword_warning':"disabilitato",
        'oneTimePasswordSelectionLink_selectLabel':"Seleziona:",
        'oneTimePasswordSelectionLink_none':"nessuno",
        'oneTimePasswordSelectionLink_used':"utilizzati",
        'oneTimePasswordSelectionLink_unused':"disponibili",
        'saveOTP_encryptUserDataTitle':"Registrazione del nuovo codice “usa e getta”",
        'saveOTP_encryptUserDataText':"Elaborazione delle credenziali OTP ...",
        'saveOTP_encryptOTPDataTitle':"Registrazione del nuovo codice “usa e getta”",
        'saveOTP_encryptOTPDataText':"Codifica locale dei dati di autenticazione ...",
        'saveOTP_sendingDataTitle':"Registrazione del nuovo codice “usa e getta”",
        'saveOTP_sendingDataText':"Invio dei dati di autenticazione criptati ...",
        'saveOTP_updatingInterfaceTitle':"Registrazione del nuovo codice “usa e getta”",
        'saveOTP_updatingInterfaceText':"Aggiornamento dell&#x27;interfaccia",
        'accountPreferencesLabel':"Preferenze",
        'accountPreferencesTabTitle':"Preferenze",
        'accountPreferencesLanguageTitle':"Selezione della lingua",
        'accountPreferencesLanguageDescription':"<p>Scegli la lingua preferita dall&#x27;elenco sottostante.</p> ",
        'showDonationReminderPanelTitle':"Promemoria donazioni",
        'showDonationReminderPanelDescription':"<p>Mostra i promemopria per le donazioni</p> ",
        'saveUserPreferencesFormSubmitLabel':"Salva",
        'cancelUserPreferencesFormSubmitLabel':"Annulla",
        'accountPreferencesSavingPanelTitle_Step1':"Salvataggio preferenze",
        'accountPreferencesSavingPanelText_Step1':"Cripta localmente le preferenze",
        'accountPreferencesSavingPanelTitle_Step2':"Salvataggio preferenze",
        'accountPreferencesSavingPanelText_Step2':"Carica preferenze criptate su Clipperz",
        'accountLoginHistoryLabel':"Registro degli accessi",
        'loginHistoryTabTitle':"Registro degli accessi",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js
index 8478c0d..e3c2fc7 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_pt-BR.js
@@ -1,174 +1,174 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['pt-BR'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescriptionConfig':"<h2>Guarde com você!</h2> <ul> <li> <h3>Clipperz é:</h3> <ul> <li> <p>um simples e seguro gerenciador de senhas</p> </li> <li> <p>uma efetiva solução com uma única assinatura</p> </li> <li> <p>um cofre digital para suas informações confidenciais</p> </li> </ul> </li> <li> <h3>Com Clipperz você pode:</h3> <ul> <li> <p>guardar e gerenciar suas senhas e credenciais online</p> </li> <li> <p>logar em seus serviços web sem precisar entrar com nenhum nome de usuário ou senha</p> </li> <li> <p>proteger todos os seus dados sensíveis: códigos de alarme, PINs, números de cartão de crédito, &hellip;</p> </li> <li> <p>compartilhar segredos com membros da família e associados (em breve)</p> </li> </ul> </li> <li> <h3>Clipperz proporciona:</h3> <ul> <li> <p>anonimato completo e gratuito</p> </li> <li> <p>acesso a qualquer hora em qualquer computador</p> </li> <li> <p>sem software ou download e nada que instalar</p> </li> <li> <p>evite guardar seus segredos em seu PC ou papel</p> </li> </ul> </li> <li> <h3>Segurança Clipperz:</h3> <ul> <li> <p>seus segredos são codificados localmente por seu navegador antes de ser enviado para Clipperz</p> </li> <li> <p>a chave de codificação é uma senha que só você conhece</p> </li> <li> <p>Clipperz armazena apenas seus dados confidenciais codificados, nunca acessando os dados originais</p> </li> <li> <p>Clipperz é construído a partir de esquemas de codificação padrão, ou seja, nada é exclusivo ou caseiro</p> </li> <li> <p>você pode revisar o código a qualquer momento, mas você não precisa conhecer nada sobre criptograia para ser um usuário feliz!</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">Saiba mais</a> </li> </ul> ",
        'loginFormTitle':"entre sua conta Clipperz",
        'loginFormUsernameLabel':"nome do usuário",
        'loginFormPassphraseLabel':"frase chave",
        'loginFormDontHaveAnAccountLabel':"não tem uma conta?",
        'loginFormCreateOneLabel':"criar uma",
        'loginFormForgotYourCredentialsLabel':"esqueceu suas credenciais?",
        'loginFormAarghThatsBadLabel':"xiiiii! isso é não é bom!",
        'loginFormAfraidOfMaliciousScriptsLabel':"medo de scripts maliciosos?",
        'loginFormVerifyTheCodeLabel':"verifique o código",
        'loginFormButtonLabel':"Entrar",
        'loginFormOneTimePasswordCheckboxLabel':"use uma frase chave descartável",
        'loginPanelSwithLanguageDescription':"<h5>Mudar para sua linguagem preferida</h5> ",
        'browserCompatibilityDescription':"<p>Tenha uma experiência melhor e mais segura com Clipperz, utilizando o Firefox. No entanto, Clipperz funciona bem também em Opera e MS Internet Explorer!</p> ",
        'OTPloginMessagePanelInitialTitle':"Acessando usando a frase chave descartável",
        'OTPloginMessagePanelInitialText':"Enviando credenciais descartáveis ...",
        'OTPloginMessagePanelLoadingTitle':"Acessando usando a frase chave descartável",
        'OTPloginMessagePanelLoadingText':"Buscando informação de autenticação codificada no servidor ...",
        'OTPloginMessagePanelProcessingTitle':"Acessando usando a frase chave descartável",
        'OTPloginMessagePanelProcessingText':"Decodificação local da informação de autenticação ...",
        'loginMessagePanelInitialTitle':"Entrando ...",
        'loginMessagePanelInitialButtonLabel':"Cancelar",
        'loginMessagePanelConnectedTitle':"Conectado",
        'loginMessagePanelConnectedText':"Concluído",
        'loginMessagePanelFailureTitle':"Erro",
        'loginMessagePanelFailureText':"Ocorreu uma falha",
        'loginMessagePanelFailureButtonLabel':"Fechar",
        'connectionLoginSendingCredentialsMessageTitle':"Verificando credenciais",
        'connectionLoginSendingCredentialsMessageText':"Enviando credenciais",
        'connectionLoginCredentialsVerificationMessageTitle':"Verificando credenciais",
        'connectionLoginCredentialsVerificationMessageText':"Realizando autenticação SRP",
        'connectionLoginDoneMessageTitle':"Verificando credenciais",
        'connectionLoginDoneMessageText':"Conectado",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"Verificando credenciais",
        'userLoginPanelUpgradingUserCredentialsMessageText':"Upgrade de suas credenciais para um novo esquema de autenticação",
        'userLoginPanelConnectedMessageTitle':"Usuário autenticado",
        'userLoginPanelConnectedMessageText':"Logado com sucesso em",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Verificando credenciais",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Tentando esquema antigo de autenticação",
        'userLoginPanelLoadingUserDataMessageTitle':"Usuário autenticado",
        'userLoginPanelLoadingUserDataMessageText':"Baixando cabeçalhos de cartão codificados de Clipperz",
        'userLoginPanelDecryptingUserDataMessageTitle':"Usuário autenticado",
        'userLoginPanelDecryptingUserDataMessageText':"Descrição local de cabeçalhos dos cartões",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"Usuário autenticado",
        'userLoginPanelDecryptingUserStatisticsMessageText':"Descrição local de estatísticas de uso",
        'splashAlertTitle':"Bem-vindo ao Clipperz!",
        'splashAlertText':"<p>Alguns avisos de segurança</p> <ul> <li> <p>Guardar suas informações no Clipperz é tão seguro quanto a frase chave que você escolher para protege-los. Ninguém pode acessá-los sem essa frase chave.</p> </li> <li> <p>Se você vai utlizar Clipperz para armazenar suas informações confidenciais e críticas, escolha uma frase chave difícil de ser descoberta. Quanto mais longa, melhor!</p> </li> <li> <p>Clipperz não será capaz de recuperar frase chave perdidas!</p> </li> </ul> <p>Para mais informações, por favor vá até <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> website.</p> ",
        'splashAlertCloseButtonLabel':"Ok",
        'registrationFormTitle':"crie sua conta",
        'registrationFormUsernameLabel':"nome do usuário",
        'registrationFormPassphraseLabel':"frase chave",
        'registrationFormRetypePassphraseLabel':"entre novamente sua frase chave",
        'registrationFormSafetyCheckLabel':"Eu compreendo que Clipperz não será capaz de recuperar senhas perdidas.",
-        'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Termos do Serviço</a>.",
+        'registrationFormTermsOfServiceCheckLabel':"Eu li e concordo com os <a href='https://www.clipperz.com/terms_service' target='_blank'>Termos do Serviço</a>.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"você já tem uma conta?",
        'registrationFormSimplyLoginLabel':"login simples",
        'registrationFormButtonLabel':"Registrar",
        'registrationFormWarningMessageNotMatchingPassphrases':"Suas frases chaves não conferem, por favor tente novamente.",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Por favor leia e confira todos os campos abaixo.",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Você precisa concordar com os Termos do Serviço.",
        'registrationMessagePanelInitialTitle':"Criando conta ...",
        'registrationMessagePanelInitialText':"---",
        'registrationMessagePanelInitialButtonLabel':"Cancelar",
        'registrationMessagePanelRegistrationDoneTitle':"Registro",
        'registrationMessagePanelRegistrationDoneText':"Concluído",
        'registrationMessagePanelFailureTitle':"Registrou falhou",
        'registrationMessagePanelFailureButtonLabel':"Fechar",
        'connectionRegistrationSendingRequestMessageText':"Verificando credenciais",
        'connectionRegistrationSendingCredentialsMessageText':"Enviando credenciais",
        'registrationSplashPanelTitle':"Informe de segurança",
        'registrationSplashPanelDescription':"<p>Essas são suas credenciais Clipperz, cuide delas com cuidado. Clipperz nunca vai mostrar seu nome de usuário e frase chave uma outra vez!</p> ",
        'registrationSplashPanelUsernameLabel':"nome de usuário",
        'registrationSplashPanelPassphraseLabel':"frase chave",
        'registrationSplashPanelShowPassphraseButtonLabel':"mostrar frase chave",
        'donateHeaderLinkLabel':"doar",
        'creditsHeaderLinkLabel':"créditos",
        'feedbackHeaderLinkLabel':"feedback",
        'helpHeaderLinkLabel':"ajuda",
        'forumHeaderLinkLabel':"fórum",
        'recordMenuLabel':"cartões",
        'accountMenuLabel':"conta",
        'dataMenuLabel':"dados",
        'contactsMenuLabel':"contatos",
        'toolsMenuLabel':"ferramentas",
        'logoutMenuLabel':"sair",
        'lockMenuLabel':"bloquear",
        'lockTitle':"A conta está bloqueada",
        'lockDescription':"<p>Para desbloquear sua conta, por favor, entre com a frase chave</p> ",
        'unlockButtonLabel':"desbloquear",
        'changePasswordTabLabel':"Alterar sua frase chave",
        'changePasswordTabTitle':"Alterar sua frase chave",
        'changePasswordFormUsernameLabel':"nome de usuário",
        'changePasswordFormOldPassphraseLabel':"frase chave antiga",
        'changePasswordFormNewPassphraseLabel':"frase chave nova",
        'changePasswordFormRetypePassphraseLabel':"re-inserir frase chave nova",
        'changePasswordFormSafetyCheckboxLabel':"Eu compreendo que Clipperz não poderá recuperar a frase chave perdida.",
        'changePasswordFormSubmitLabel':"Alterar frase chave",
        'changePasswordFormWrongUsernameWarning':"Nome de usuário errado",
        'changePasswordFormWrongPassphraseWarning':"Frase chave errada",
        'changePasswordFormWrongRetypePassphraseWarning':"Suas frases chaves não conferem, por favor tente novamente.",
        'changePasswordFormSafetyCheckWarning':"Por favor leia e confira todos os campos abaixo.",
        'changePasswordFormProgressDialogTitle':"Alterando credenciais do usuário",
        'changePasswordFormProgressDialogConnectedMessageTitle':"Conectado",
        'changePasswordFormProgressDialogConnectedMessageText':"Concluído",
        'changePasswordFormProgressDialogErrorMessageTitle':"Erro",
        'changePasswordFormProgressDialogErrorMessageText':"Mudança de credenciais falhou!",
        'changeCredentialsPanelEncryptingDataMessageTitle':"Alterando sua frase chave",
        'changeCredentialsPanelEncryptingDataMessageText':"Codificação local de cabeçalho de cartões",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"Alterando sua frase chave",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"Atualizando suas credenciais",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Alterando sua frase chave",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Enviando suas credenciais codificadas para Clipperz",
        'changeCredentialsPanelDoneMessageTitle':"Alterando sua frase chave",
        'changeCredentialsPanelDoneMessageText':"Concluído",
        'manageOTPTabLabel':"Gerenciar suas frases chaves descartáveis",
        'manageOTPTabTitle':"Gerenciar suas frases chaves descartáveis",
        'manageOTPTabDescription':"<p>Uma frase chave descartável funciona como uma frase chave normal, mas só pode ser utilizada uma única vez.</p> <p>Se a mesma frase chave for utilizada novamente num próximo login, ela será rejeitada e o login não irá ocorrer.</p> <p>Imediatamente após um login com sucesso, sua frase chave descartável será apagada para evitar logins fraudulentos.</p> <p>Frases chaves descartáveis são uma excelente opção se você está preocupado com keyloggers ou spywares que podem estar coletando seus dados em determinadas máquinas.</p> <p> <b>É recomendável que você utilize frases chaves descartáveis sempre que utilizar terminais públicos como Internet cafés e bibliotecas.</b> </p> ",
        'oneTimePasswordReadOnlyMessage':"<h6>Desculpe!</h6> <p>Você não pode gerenciar sua frase chave descartável quando usando a versão offline do Clipperz.</p> ",
        'oneTimePasswordLoadingMessage':"<h6>Carregando informação</h6> <p>Por favor, aguarde ...</p> ",
        'oneTimePasswordNoPasswordAvailable':"<h6>Nenhuma frase chave descartável disponível</h6> <p>Clique o botão “Novo” acima para adicionar uma frase chave descartável em sua conta.</p> ",
        'createNewOTPButtonLabel':"Novo",
        'deleteOTPButtonLabel':"Apagar",
        'printOTPButtonLabel':"Imprimir",
        'disabledOneTimePassword_warning':"desativada",
        'oneTimePasswordSelectionLink_selectLabel':"Selecionar:",
        'oneTimePasswordSelectionLink_all':"tudo",
        'oneTimePasswordSelectionLink_none':"nenhum",
        'oneTimePasswordSelectionLink_used':"usado",
        'oneTimePasswordSelectionLink_unused':"não usado",
        'saveOTP_encryptUserDataTitle':"Salvando a frase chave descartável",
        'saveOTP_encryptUserDataText':"Processando novas credenciais descartáveis ...",
        'saveOTP_encryptOTPDataTitle':"Salvando a frase chave descartável",
        'saveOTP_encryptOTPDataText':"Codificação local da informação de autenticação ...",
        'saveOTP_sendingDataTitle':"Salvando a frase chave descartável",
        'saveOTP_sendingDataText':"Enviando informação de autenticação para o servidor ...",
        'saveOTP_updatingInterfaceTitle':"Salvando a frase chave descartável",
        'saveOTP_updatingInterfaceText':"Atualizando interface ...",
        'accountPreferencesLabel':"Preferências",
        'accountPreferencesTabTitle':"Preferências",
        'accountPreferencesLanguageTitle':"Seleção de idioma",
        'accountPreferencesLanguageDescription':"<p>Escolha seu idioma preferido da lista abaixo.</p> ",
        'showDonationReminderPanelTitle':"Lembretes de doação",
        'showDonationReminderPanelDescription':"<p>Mostrar lembretes de doação</p> ",
        'saveUserPreferencesFormSubmitLabel':"Salvar",
        'cancelUserPreferencesFormSubmitLabel':"Cancelar",
        'accountPreferencesSavingPanelTitle_Step1':"Salvando preferências",
        'accountPreferencesSavingPanelText_Step1':"Codificação local de suas preferências",
        'accountPreferencesSavingPanelTitle_Step2':"Salvando preferências",
        'accountPreferencesSavingPanelText_Step2':"Enviando informação codificada para o servidor",
        'accountLoginHistoryLabel':"Histórico de conexão",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js
index 612e745..0d71345 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_ru-RU.js
@@ -1,181 +1,181 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['ru-RU'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescription':"<h2>Держи всегда при себе!</h2> <ul> <li> <h3>Clipperz - это:</h3> <ul> <li> <p>безопасный и простой менеджер паролей</p> </li> <li> <p>эффективное решение для единой регистрации</p> </li> <li> <p>цифровое хранилище ваших конфиденциальных данных</p> </li> </ul> </li> <li>\
                        <h3>C помощью Clipperz вы можете:</h3> <ul>\
                                <li> <p>хранить и управлять вашими паролями</p> </li> <li> <p>входить в любые веб-сервисы без ввода логина и пароля</p> </li> <li> <p>защитить все важные данные: коды охранной сигнализации, PINы, номера кредитных карт, и пр.</p> </li> <li> <p>открыть доступ к паролям вашим членам семьи, друзьям, коллегам</p> </li> </ul> </li> <li>\
                        <h3>Преимущества Clipperz:</h3> <ul>\
                                <li> <p>бесплатный и абсолютно анонимный</p> </li> <li> <p>доступен в любое время и с любого компьютера</p> </li> <li> <p>не нужно ничего устанавливать</p> </li> <li> <p>не надо хранить секреты на компьютере или бумаге</p> </li> </ul> </li> <li>\
                        <h3>Безопасность Clipperz:</h3> <ul>\
                                <li> <p>все данные перед отправкой в Clipperz шифруются в браузере</p> </li> <li> <p>пароль знаете только вы</p> </li> <li> <p>Clipperz управляет важными данными в зашифрованном виде и никогда не получит доступ к ним в открытом виде</p> </li> <li> <p>Clipperz основан на стандартных криптографических протоколах: без каких-либо самоделок</p> </li> <li> <p>вы можете просмотреть исходный код, но вам ничего не надо знать о криптографии, чтобы просто использовать его!</p> </li> </ul> </li> <li>\
                        <a href=\"http://www.clipperz.com\" target=\"_blank\">Подробнее</a> </li> </ul> ",
        'loginFormTitle':"войти в аккаунт Clipperz",
        'loginFormUsernameLabel':"логин",
        'loginFormPassphraseLabel':"пароль",
        'loginFormDontHaveAnAccountLabel':"у вас еще нет аккаунта?",
        'loginFormCreateOneLabel':"создать сейчас",
        'loginFormForgotYourCredentialsLabel':"забыли пароль?",
        'loginFormAarghThatsBadLabel':"это плохо!",
        'loginFormAfraidOfMaliciousScriptsLabel':"опасаетесь вредоносных скриптов?",
        'loginFormVerifyTheCodeLabel':"проверить",
        'loginFormButtonLabel':"Войти",
        'loginFormOneTimePasswordCheckboxLabel':"использовать одноразовый пароль",
        'loginPanelSwithLanguageDescription':"<h5>Переключить язык</h5> ",
        'browserCompatibilityDescription':"<p>Clipperz адаптирован для Firefox. Но также совместим с Opera и MS Internet Explorer!</p> ",
        'OTPloginMessagePanelInitialTitle':"Вход",
        'OTPloginMessagePanelInitialText':"Передача данных учетной записи ...",
        'OTPloginMessagePanelLoadingTitle':"Вход",
        'OTPloginMessagePanelLoadingText':"Запрос аутентификационных данных с сервера ...",
        'OTPloginMessagePanelProcessingTitle':"Вход",
        'OTPloginMessagePanelProcessingText':"Расшифровка аутентификационных данных",
        'loginMessagePanelInitialTitle':"Вход ...",
        'loginMessagePanelInitialButtonLabel':"Отмена",
        'loginMessagePanelConnectedTitle':"Соединен",
        'loginMessagePanelConnectedText':"Выполнен",
        'loginMessagePanelFailureTitle':"Ошибка",
        'loginMessagePanelFailureText':"Ошибка при попытке входа",
        'loginMessagePanelFailureButtonLabel':"Закрыть",
        'connectionLoginSendingCredentialsMessageTitle':"Проверка учетной записи",
        'connectionLoginSendingCredentialsMessageText':"Передача данных ...",
        'connectionLoginCredentialsVerificationMessageTitle':"Проверка учетной записи",
        'connectionLoginCredentialsVerificationMessageText':"Выполняем SRP-аутентификацию ...",
        'connectionLoginDoneMessageTitle':"Проверка учетной записи",
        'connectionLoginDoneMessageText':"Соединено",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"Проверка учетной записи",
        'userLoginPanelUpgradingUserCredentialsMessageText':"Обновляем полномочия к новой схеме аутентификации",
        'userLoginPanelConnectedMessageTitle':"Пользователь аутентифицирован",
        'userLoginPanelConnectedMessageText':"Успешный вход",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"Проверка учетной записи",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"Пробуем войти по старой схеме",
        'userLoginPanelLoadingUserDataMessageTitle':"Пользователь аутентифицирован",
        'userLoginPanelLoadingUserDataMessageText':"Загрузка зашифрованных заголовков карточек",
        'userLoginPanelDecryptingUserDataMessageTitle':"Пользователь аутентифицирован",
        'userLoginPanelDecryptingUserDataMessageText':"Расшифровка заголовков карточек",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"Пользователь аутентифицирован",
        'userLoginPanelDecryptingUserStatisticsMessageText':"Расшифровка статистики",
        'splashAlertTitle':"Добро пожаловать в Clipperz!",
        'splashAlertText':"<p>Несколько советов по безопасности:</p> <ul> <li> <p>Хранение данных в Clipperz зависит от того, насколько безопасен выбранный вами пароль</p> </li> <li> <p>Если собираетесь использовать Clipperz для защиты важных или критических данных, то убедитесь, что выбрали сложный пароль</p> </li> <li> <p>Clipperz не сможет восстановить забытый пароль</p> </li> </ul> <p>За дополнительной информацией обратитесь на <a href=\"http://www.clipperz.com\" target=\"_blank\">сайт</a> Clipperz.</p> ",
        'splashAlertCloseButtonLabel':"OK",
        'registrationFormTitle':"создать аккаунт",
        'registrationFormUsernameLabel':"имя пользователя",
        'registrationFormPassphraseLabel':"пароль",
        'registrationFormRetypePassphraseLabel':"повторите пароль",
        'registrationFormSafetyCheckLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль",
-        'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='http://www.clipperz.com/terms_of_service' target='_blank'>Условиями предоставления услуг</a>.",
+        'registrationFormTermsOfServiceCheckLabel':"Я прочитал и согласен с <a href='https://www.clipperz.com/terms_service' target='_blank'>Условиями предоставления услуг</a>.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"у вас уже есть аккаунт?",
        'registrationFormSimplyLoginLabel':"просто авторизируйтесь",
        'registrationFormButtonLabel':"Зарегистрировать",
        'registrationFormWarningMessageNotMatchingPassphrases':"Пароли не совпадают, пожайлуста, повторите ввод",
        'registrationFormWarningMessageSafetyCheckNotSelected':"Прочитайте и проверьте все поля ниже",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"Вы должны принять Условия предоставления услуг",
        'registrationMessagePanelInitialTitle':"Создание аккаунта",
        'registrationMessagePanelInitialButtonLabel':"Отмена",
        'registrationMessagePanelRegistrationDoneTitle':"Регистрация",
        'registrationMessagePanelRegistrationDoneText':"Выполнено",
        'registrationMessagePanelFailureTitle':"Ошибка регистрации",
        'registrationMessagePanelFailureButtonLabel':"Закрыть",
        'connectionRegistrationSendingRequestMessageText':"Проверка учетной записи",
        'connectionRegistrationSendingCredentialsMessageText':"Передача данных",
        'registrationSplashPanelTitle':"Совет",
        'registrationSplashPanelDescription':"<p>Это ваши данные учетной записи, позаботесь об их безопасности. Clipperz никогда больше не покажет ваш логин и пароль!</p> ",
        'registrationSplashPanelUsernameLabel':"имя пользователя",
        'registrationSplashPanelPassphraseLabel':"пароль",
        'registrationSplashPanelShowPassphraseButtonLabel':"показать пароль",
        'donateHeaderLinkLabel':"помочь проекту",
        'creditsHeaderLinkLabel':"авторы",
        'feedbackHeaderLinkLabel':"обратная связь",
        'helpHeaderLinkLabel':"помощь",
        'forumHeaderLinkLabel':"форум",
        'recordMenuLabel':"карточки",
        'accountMenuLabel':"аккаунт",
        'dataMenuLabel':"данные",
        'contactsMenuLabel':"контакты",
        'toolsMenuLabel':"инструменты",
        'logoutMenuLabel':"выход",
        'lockMenuLabel':"заблокировать",
        'lockTitle':"Аккаунт заблокирован",
        'lockDescription':"<p>Введите пароль для разблокировки</p> ",
        'unlockButtonLabel':"разблокировать",
        'changePasswordTabLabel':"Изменить пароль",
        'changePasswordTabTitle':"Изменить пароль",
        'changePasswordFormUsernameLabel':"логин",
        'changePasswordFormOldPassphraseLabel':"старый пароль",
        'changePasswordFormNewPassphraseLabel':"новый пароль",
        'changePasswordFormRetypePassphraseLabel':"повторите пароль",
        'changePasswordFormSafetyCheckboxLabel':"Я понимаю, что Clipperz не сможет восстановить забытый пароль.",
        'changePasswordFormSubmitLabel':"Изменить",
        'changePasswordFormWrongUsernameWarning':"Неправильный логин",
        'changePasswordFormWrongPassphraseWarning':"Неверный пароль",
        'changePasswordFormWrongRetypePassphraseWarning':"Пароли не совпадают, пожайлуста, повторите ввод.",
        'changePasswordFormSafetyCheckWarning':"Прочитайте и проверьте все поля ниже.",
        'changePasswordFormProgressDialogTitle':"Изменение учетной записи",
        'changePasswordFormProgressDialogConnectedMessageTitle':"Соединено",
        'changePasswordFormProgressDialogConnectedMessageText':"Выполнено",
        'changePasswordFormProgressDialogErrorMessageTitle':"Ошибка",
        'changePasswordFormProgressDialogErrorMessageText':"Ошибка изменения учетной записи!",
        'changeCredentialsPanelEncryptingDataMessageTitle':"Изменение пароля",
        'changeCredentialsPanelEncryptingDataMessageText':"Шифрование заголовков карточек",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"Изменение пароля",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"Обновление учетной записи",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"Изменение пароля",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"Загрузка данных учетной записи в Clipperz",
        'changeCredentialsPanelDoneMessageTitle':"Изменение пароля",
        'changeCredentialsPanelDoneMessageText':"Выполнено",
        'manageOTPTabLabel':"Управление одноразовыми паролями",
        'manageOTPTabTitle':"Управление одноразовыми паролями",
        'manageOTPTabDescription':"<p>Одноразовый пароль работает так же, как ваш обычный пароль, но может быть использован только один раз.</p> <p>Если один и тот же пароль будет использоваться снова, он будет отклонен при попытке войти.</p> <p>Сразу после входа одноразовый пароль будет удален, чтобы предотвратить любую несанкционированную попытку доступа.</p> <p>Одноразовые пароли - удачный выбор для тех, кто обеспокоен кейлоггерами или spyware, которые могут украсть пароль.</p> <p> <b>Строго рекомендуется использовать одноразовые пароли для доступа к Clipperz с чужих компьютеров, интернет-кафе и компьютеров общего пользования.</b> </p> ",
        'oneTimePasswordReadOnlyMessage':"<h6>Извините!</h6> <p>Вы не можете управлять одноразовыми паролями в автономной версии Clipperz.</p> ",
        'oneTimePasswordLoadingMessage':"<h6>Загрузка данных</h6> <p>Подождите, пожайлуста ...</p> ",
        'oneTimePasswordNoPasswordAvailable':"<h6>Нет доступных одноразовых паролей.</h6> <p>Нажмите кнопку “Создать”, чтобы создать одноразовый пароль.</p> ",
        'createNewOTPButtonLabel':"создать",
        'deleteOTPButtonLabel':"удалить",
        'printOTPButtonLabel':"печать",
        'disabledOneTimePassword_warning':"запрещено",
        'oneTimePasswordSelectionLink_selectLabel':"Выбрать:",
        'oneTimePasswordSelectionLink_all':"все",
        'oneTimePasswordSelectionLink_none':"ни одного",
        'oneTimePasswordSelectionLink_used':"использованные",
        'oneTimePasswordSelectionLink_unused':"неиспользованные",
        'saveOTP_encryptUserDataTitle':"Сохранение одноразовых паролей",
        'saveOTP_encryptUserDataText':"Обработка новых данных учетной записи ...",
        'saveOTP_encryptOTPDataTitle':"одноразовыми паролями",
        'saveOTP_encryptOTPDataText':"Шифрование аутентификационных данных ...",
        'saveOTP_sendingDataTitle':"одноразовыми паролями",
        'saveOTP_sendingDataText':"Передача аутентификационных данных на сервер ...",
        'saveOTP_updatingInterfaceTitle':"одноразовыми паролями",
        'saveOTP_updatingInterfaceText':"Обновление интерфейса ...",
        'accountPreferencesLabel':"Настройки",
        'accountPreferencesTabTitle':"Настройки",
        'accountPreferencesLanguageTitle':"Выбор языка",
        'accountPreferencesLanguageDescription':"<p>Выберите ваш язык из списка.</p> ",
        'showDonationReminderPanelTitle':"Напоминания о пожертвованиях",
        'showDonationReminderPanelDescription':"<p>Показывать напоминания о пожертвованиях</p> ",
        'saveUserPreferencesFormSubmitLabel':"Сохранить",
        'cancelUserPreferencesFormSubmitLabel':"Отмена",
        'accountPreferencesSavingPanelTitle_Step1':"Сохранение настроек",
        'accountPreferencesSavingPanelText_Step1':"Шифрование настроек",
        'accountPreferencesSavingPanelTitle_Step2':"Сохранение настроек",
        'accountPreferencesSavingPanelText_Step2':"Передача зашифрованных настроек в Clipperz",
        'accountLoginHistoryLabel':"История входов",
        'loginHistoryTabTitle':"История входов",
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js
index e880954..e1e2508 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_zh-CN.js
@@ -1,174 +1,174 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.PM.Strings.Languages['zh-CN'.toLowerCase()] = MochiKit.Base.merge(Clipperz.PM.Strings.Languages['en-us'], {
        'clipperzServiceDescription':"<h2>只有你知道</h2> <ul> <li> <h3>Clipperz 是:</h3> <ul> <li> <p>一个简单而又安全的密码管理员</p> </li> <li> <p>一个有效的单一登录解决方案</p> </li> <li> <p>一个您保密的资料数据库</p> </li> </ul> </li> <li> <h3> 使用 Clipperz 你能:</h3> <ul> <li> <p>储存和管理你的密码和网上证书</p> </li> <li> <p>无需输入密码自动帮助你登录网站服务</p> </li> <li> <p>保护你的敏感数据:通讯录,口令,信用卡号码, ...</p> </li> <li> <p>与家人和伙伴分享秘密(将要上线)</p> </li> </ul> </li> <li> <h3>Clipperz 的特点:</h3> <ul> <li> <p>免费，彻底匿名</p> </li> <li> <p>在任何时间 任何电脑都可以轻松获取你的密码</p> </li> <li> <p>无需下载和安装任何软件</p> </li> <li> <p>再也无需在电脑或者纸上记录密码了</p> </li> </ul> </li> <li> <h3>Clipperz 的安全性:</h3> <ul> <li> <p>密码将在本地浏览器加密，然后上传至 Clipperz</p> </li> <li> <p>加密密钥是一个只有你知道的密码短语</p> </li> <li> <p>Clipperz 服务会加密你的敏感数据，并不会出现数据的原始形式</p> </li> <li> <p>Clipperz 基于加密标准，没有任何的花哨</p> </li> <li> <p>只要你愿意，你随时都可以查看源代码，但是做为一个使用者来说完全没有去必要去了解那些繁琐的加密原理</p> </li> </ul> </li> <li> <a href=\"http://www.clipperz.com\" target=\"_blank\">更多</a> </li> </ul> ",
        'loginFormTitle':"用你的 Clipperz 帐户登录",
        'loginFormUsernameLabel':"用户名",
        'loginFormPassphraseLabel':"密码短语",
        'loginFormDontHaveAnAccountLabel':"还未建立帐户？",
        'loginFormCreateOneLabel':"创建一个新帐户",
        'loginFormForgotYourCredentialsLabel':"忘记你的证书？",
        'loginFormAarghThatsBadLabel':"呃？这下糟糕了",
        'loginFormAfraidOfMaliciousScriptsLabel':"害怕有恶意脚本？",
        'loginFormVerifyTheCodeLabel':"验证代码",
        'loginFormButtonLabel':"登录",
        'loginFormOneTimePasswordCheckboxLabel':"使用一次性密码短语",
        'loginPanelSwithLanguageDescription':"<h5>选择你的第一语言</h5> ",
        'browserCompatibilityDescription':"<p>使用 Firefox 将得到更快更安全的 Clipperz 服务。不过 Clipperz 同样可以很好的工作在 Opera 和 微软的 IE 中。</p> ",
        'OTPloginMessagePanelInitialTitle':"用一次性密码短语登录",
        'OTPloginMessagePanelInitialText':"发送 OTP 证书 ...",
        'OTPloginMessagePanelLoadingTitle':"用一次性密码短语登录",
        'OTPloginMessagePanelLoadingText':"从服务器读取加密认证数据 ...",
        'OTPloginMessagePanelProcessingTitle':"用一次性密码短语登录",
        'OTPloginMessagePanelProcessingText':"本地解密认证数据",
        'loginMessagePanelInitialTitle':"登录中...",
        'loginMessagePanelInitialButtonLabel':"取消",
        'loginMessagePanelConnectedTitle':"连接成功",
        'loginMessagePanelConnectedText':"完成",
        'loginMessagePanelFailureTitle':"错误",
        'loginMessagePanelFailureText':"登录失败",
        'loginMessagePanelFailureButtonLabel':"取消",
        'connectionLoginSendingCredentialsMessageTitle':"验证证书",
        'connectionLoginSendingCredentialsMessageText':"传送证书",
        'connectionLoginCredentialsVerificationMessageTitle':"验证证书",
        'connectionLoginCredentialsVerificationMessageText':"进行 SRP 认证",
        'connectionLoginDoneMessageTitle':"验证证书",
        'connectionLoginDoneMessageText':"已连接",
        'userLoginPanelUpgradingUserCredentialsMessageTitle':"验证证书",
        'userLoginPanelUpgradingUserCredentialsMessageText':"升级证书到新的认证模式",
        'userLoginPanelConnectedMessageTitle':"用户识别",
        'userLoginPanelConnectedMessageText':"成功登录",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageTitle':"验证证书",
        'userLoginPanelTryingAnOlderConnectionSchemaMessageText':"旧认证模式失效",
        'userLoginPanelLoadingUserDataMessageTitle':"用户识别",
        'userLoginPanelLoadingUserDataMessageText':"正在从 Clipperz 下载加密卡报头",
        'userLoginPanelDecryptingUserDataMessageTitle':"用户识别",
        'userLoginPanelDecryptingUserDataMessageText':"加密卡报头本地解密",
        'userLoginPanelDecryptingUserStatisticsMessageTitle':"用户识别",
        'userLoginPanelDecryptingUserStatisticsMessageText':"本地解密使用统计",
        'splashAlertTitle':"Clipperz 欢迎您",
        'splashAlertText':"<p>安全忠告</p> <ul> <li> <p>在 Clipperz ，用你选择的密码短语保存数据是安全的。没有人能够得到这些数据，除非他们有你的密码。</p> </li> <li> <p> 如果你决定使用 Clipperz 保护敏感数据和关键资料，请务必选用一个复杂的密码短语。越长越好</p> </li> <li> <p>注意:Clipperz将无法找回忘记的密码码短语!</p> </li> </ul> <p>获得更多的说明，请前往 <a href=\"http://www.clipperz.com\" target=\"_blank\">Clipperz</a> 网站.</p> ",
        'splashAlertCloseButtonLabel':"确定",
        'registrationFormTitle':"创建你的帐户",
        'registrationFormUsernameLabel':"用户名",
        'registrationFormPassphraseLabel':"密码短语",
        'registrationFormRetypePassphraseLabel':"确认密码短语",
        'registrationFormSafetyCheckLabel':"我明白 Clipperz 无法找回忘记的密码短语.",
-        'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='http://www.clipperz.com/terms_of_service' target='_blank'>服务条款</a> 款.",
+        'registrationFormTermsOfServiceCheckLabel':"我同意接受 <a href='https://www.clipperz.com/terms_service' target='_blank'>服务条款</a> 款.",
        'registrationFormDoYouAlreadyHaveAnAccountLabel':"如果已有一个 Clipperz 帐户",
        'registrationFormSimplyLoginLabel':"在此登录",
        'registrationFormButtonLabel':"注册",
        'registrationFormWarningMessageNotMatchingPassphrases':"两次密码短语不同，请重新输入",
        'registrationFormWarningMessageSafetyCheckNotSelected':"请阅读并检查下面的选项框",
        'registrationFormWarningMessageTermsOfServiceCheckNotSelected':"您需要同意服务条款",
        'registrationMessagePanelInitialTitle':"创建账户...",
        'registrationMessagePanelInitialButtonLabel':"取消",
        'registrationMessagePanelRegistrationDoneTitle':"注册",
        'registrationMessagePanelRegistrationDoneText':"完成",
        'registrationMessagePanelFailureTitle':"注册失败",
        'registrationMessagePanelFailureButtonLabel':"关闭",
        'connectionRegistrationSendingRequestMessageText':"验证证书",
        'connectionRegistrationSendingCredentialsMessageText':"传送证书",
        'registrationSplashPanelTitle':"安全忠告",
        'registrationSplashPanelDescription':"<p>这是你的 Clipperz 证书，请保存好。Clipperz 永远不会第二次显示你的用户名和密码短语</p> ",
        'registrationSplashPanelUsernameLabel':"用户名",
        'registrationSplashPanelPassphraseLabel':"密码短语",
        'registrationSplashPanelShowPassphraseButtonLabel':"显示密码短语",
        'donateHeaderLinkLabel':"捐赠",
        'creditsHeaderLinkLabel':"致谢",
        'feedbackHeaderLinkLabel':"反馈",
        'helpHeaderLinkLabel':"帮助",
        'forumHeaderLinkLabel':"论坛",
        'recordMenuLabel':"密码卡片",
        'accountMenuLabel':"账户",
        'dataMenuLabel':"资料",
        'contactsMenuLabel':"联系",
        'toolsMenuLabel':"工具",
        'logoutMenuLabel':"暂时离开",
        'lockMenuLabel':"安全锁",
        'lockTitle':"账户被锁定",
        'lockDescription':"<p>请输入你的密码短语解开账户</p> ",
        'unlockButtonLabel':"解锁",
        'changePasswordTabLabel':"修改密码短语",
        'changePasswordTabTitle':"修改密码短语",
        'changePasswordFormUsernameLabel':"用户名",
        'changePasswordFormOldPassphraseLabel':"旧密码短语",
        'changePasswordFormNewPassphraseLabel':"新密码短语",
        'changePasswordFormRetypePassphraseLabel':"确认密码短语",
        'changePasswordFormSafetyCheckboxLabel':"我知道 Clipperz 不能找回丢失的密码短语",
        'changePasswordFormSubmitLabel':"修改密码短语",
        'changePasswordFormWrongUsernameWarning':"用户名错误",
        'changePasswordFormWrongPassphraseWarning':"旧密码短语错误",
        'changePasswordFormWrongRetypePassphraseWarning':"两次密码短语不同，请重新输入",
        'changePasswordFormSafetyCheckWarning':"请阅读并检查下面的选项框",
        'changePasswordFormProgressDialogTitle':"正在修改密码短语",
        'changePasswordFormProgressDialogConnectedMessageTitle':"连接",
        'changePasswordFormProgressDialogConnectedMessageText':"完成",
        'changePasswordFormProgressDialogErrorMessageTitle':"错误",
        'changePasswordFormProgressDialogErrorMessageText':"证书修改失败",
        'changeCredentialsPanelEncryptingDataMessageTitle':"正在修改你的密码短语",
        'changeCredentialsPanelEncryptingDataMessageText':"加密卡报头本地解密",
        'changeCredentialsPanelCreatingNewCredentialsMessageTitle':"正在修改你的密码短语",
        'changeCredentialsPanelCreatingNewCredentialsMessageText':"更新你的证书",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageTitle':"正在修改你的密码短语",
        'changeCredentialsPanelSendingNewCredentialsToTheServerMessageText':"正在上传本地证书到 Clipperz",
        'changeCredentialsPanelDoneMessageTitle':"正在修改你的密码短语",
        'changeCredentialsPanelDoneMessageText':"完成",
        'manageOTPTabLabel':"管理你的一次性密码短语",
        'manageOTPTabTitle':"管理你的一次性密码短语",
        'manageOTPTabDescription':"<p>一次性密码短语工作起来和一般的密码短语一样，但是只可以使用一次</p> <p>如果同样的密码短语在一段时间以内再次登录，会被拒绝。登录进程将会失败。</p> <p>为了防止任何欺诈登录，在成功登陆之后，你的一次性密码将会立即被删除，</p> <p>如果一次性密码被键盘记录程序或者间谍软件得到，可能会从被感染的机器上收集数据，这样的话，一次性密码绝对是个很好的选择。</p> <p> <b>强烈建议在公共场合登录 Clipperz 时，使用一次性密码。比如公关计算机，网吧，图书馆等</b> </p> ",
        'oneTimePasswordReadOnlyMessage':"<h6>对不起！</h6> <p>你不能从离线版本管理你的一次性密码短语</p> ",
        'oneTimePasswordLoadingMessage':"<h6>加载数据</h6> <p>请等待 ...</p> ",
        'oneTimePasswordNoPasswordAvailable':"<h6>一次性密码短语没有激活</h6> <p>点击“新建”按钮添加一次性密码短语到你的帐户</p> ",
        'createNewOTPButtonLabel':"新建",
        'deleteOTPButtonLabel':"删除",
        'printOTPButtonLabel':"打印",
        'disabledOneTimePassword_warning':"禁用",
        'oneTimePasswordSelectionLink_selectLabel':"选择:",
        'oneTimePasswordSelectionLink_all':"所有",
        'oneTimePasswordSelectionLink_none':"没有",
        'oneTimePasswordSelectionLink_used':"被使用",
        'oneTimePasswordSelectionLink_unused':"未使用",
        'saveOTP_encryptUserDataTitle':"保存一次性密码短语",
        'saveOTP_encryptUserDataText':"处理新的 OTP 证书 ...",
        'saveOTP_encryptOTPDataTitle':"保存一次性密码短语",
        'saveOTP_encryptOTPDataText':"本地解密认证数据 ...",
        'saveOTP_sendingDataTitle':"保存一次性密码短语",
        'saveOTP_sendingDataText':"发送信任数据到服务器 ...",
        'saveOTP_updatingInterfaceTitle':"保存一次性密码短语",
        'saveOTP_updatingInterfaceText':"更新界面...",
        'accountPreferencesLabel':"使用偏好",
        'accountPreferencesTabTitle':"使用偏好",
        'accountPreferencesLanguageTitle':"界面语言选择",
        'accountPreferencesLanguageDescription':"<p>在下拉菜单中选择你的首选语言</p> ",
        'showDonationReminderPanelTitle':"捐赠提示",
        'showDonationReminderPanelDescription':"<p>显示捐赠提示</p> ",
        'saveUserPreferencesFormSubmitLabel':"保存",
        'cancelUserPreferencesFormSubmitLabel':"取消",
        'accountPreferencesSavingPanelTitle_Step1':"保存使用偏好",
        'accountPreferencesSavingPanelText_Step1':"本地加密你的使用偏好",
        'accountPreferencesSavingPanelTitle_Step2':"保存使用偏好",
        'accountPreferencesSavingPanelText_Step2':"正在向 Clipperz 传送加密后的使用偏好",
        'accountLoginHistoryLabel':"登录历史",
        'loginHistoryTabTitle':"登录历史",
diff --git a/frontend/gamma/css/web.css b/frontend/gamma/css/web.css
index 011831a..7d1745b 100644
--- a/frontend/gamma/css/web.css
+++ b/frontend/gamma/css/web.css
@@ -797,277 +797,327 @@ div.activeFeatures div.keepTogether div {
  display: inline-block;
  padding-right: 15px;
 }
 div.activeFeatures div.keepTogether canvas {
  width: 46px;
  height: 46px;
  vertical-align: bottom;
 }
 div.activeFeatures div.createAccountLink {
  display: inline-block;
  width: 282;
  height: 65px;
  background-image: url(./images/old/home/register.png);
  margin-right: 20px;
 }
 div.activeFeatures div.createAccountLink a.createAccountLink {
  position: relative;
  top: -92px;
  left: 5px;
 }
 div.activeFeatures div.createAccountLink a.createAccountLink span.payoff {
  margin-top: 23px;
  margin-left: 40px;
  font-size: 17pt;
  color: #64626c;
 }
 div.activeFeatures div.createAccountLink a.createAccountLink span.link {
  padding-left: 40px;
  padding-right: 50px;
  padding-bottom: 10px;
  font-size: 12pt;
 }
 div.activeFeatures div.createAccountLink:hover {
  background-image: url(./images/old/home/register_selected.png);
 }
 div.activeFeatures div.createAccountLink:hover a.createAccountLink span.payoff {
  color: #54535a;
 }
 div.activeFeatures div.createAccountLink:hover a.createAccountLink span.link {
  color: white;
 }
 div.activeFeatures div.createAccountLink canvas {
  width: 282px;
  height: 93px;
 }
 /*
 Color list:
 - login box:
                light#ff9955
                dark#ff6622
 - login button:
                regular#dd5500
                hover#773311
 - login translations:
        box: #cc6622;
        not-selected:
                        color:  #ddaa99
                        background:#994422
        selected: #772211;
 */
 html {
  height: 100%;
 }
 body {
  font-family: Helvetica-Neue, Helvetica, Arial, Geneva, sans-serif;
  margin: 0px;
 }
 div.modalDialogMask.userInfoBoxMask {
  -moz-opacity: 0.0;
  opacity: .0;
  filter: alpha(opacity=0);
  z-index: 19000;
 }
 .reset-margin {
  margin: 0px;
  padding: 0px;
  border: 0px;
 }
 .clear {
  clear: both;
 }
 .hidden_none {
  display: none;
  visibility: hidden;
 }
 .keepTogether {
  display: inline-block;
  white-space: nowrap;
 }
 #mainDiv {
  margin: 0 auto;
 }
 div.userInfoBox {
  position: absolute;
  width: 160px;
-  height: 120px;
+  height: 200px;
  top: 100px;
  left: 15px;
  color: white;
  background-color: #ff9955;
  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ff9a56), to(#ff6723));
  background: -moz-linear-gradient(0% 100% 90deg, #ff6723, #ff9a56);
  background: linear-gradient(0deg, #ff6723, #ff9a56);
  border-radius: 10px;
  -moz-border-radius: 10px;
  -webkit-border-radius: 10px;
  -webkit-box-shadow: 2px 2px 9px #333333;
  -moz-box-shadow: 2px 2px 9px #333333;
  box-shadow: 2px 2px 9px #333333;
 }
 div.userInfoBox.locked {
  z-index: 19001;
 }
 div.userInfoBox.locked div.header a.lockButton {
  background: url(./images/old/lock/locked.png) no-repeat -5px -2px;
 }
 div.userInfoBox.locked div.header a.lockButton:hover {
  background: url(./images/old/lock/locked_hover.png) no-repeat -5px -2px;
 }
 div.userInfoBox.locked div.body a {
  display: none;
 }
 div.userInfoBox div.header {
  height: 30px;
 }
 div.userInfoBox div.header h1 {
  font-size: 8pt;
  font-weight: normal;
  margin: 0px;
  padding-top: 12px;
  padding-left: 12px;
 }
 div.userInfoBox div.header a.lockButton {
  position: absolute;
  top: 8px;
  right: 12px;
  display: block;
  width: 15px;
  height: 20px;
  text-decoration: none;
  background: url(./images/old/lock/unlocked.png) no-repeat -5px -2px;
 }
 div.userInfoBox div.header a.lockButton:hover {
  background: url(./images/old/lock/unlocked_hover.png) no-repeat -5px -2px;
 }
 div.userInfoBox div.body {
  padding: 0px 12px;
 }
 div.userInfoBox div.body h3 {
  font-size: 11pt;
  font-weight: bold;
  margin: 0px;
 }
 div.userInfoBox div.body ul {
  font-size: 8pt;
  padding: 0px;
  margin: 4px 0px;
  list-style-position: inside;
 }
 div.userInfoBox div.body ul li span.number {
  font-weight: bold;
  padding-right: 3px;
 }
+div.userInfoBox div.body div.accountInfo {
+  margin-top: 6px;
+  border-top: 1px solid white;
+  border-color: #f4aa84;
+}
+div.userInfoBox div.body div.accountInfo h5 {
+  margin: 0px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+  font-size: 8pt;
+  font-weight: normal;
+}
+div.userInfoBox div.body div.accountInfo span.label {
+  font-size: 9pt;
+  font-weight: normal;
+  padding-right: 4px;
+  display: inline-block;
+  width: 45px;
+}
+div.userInfoBox div.body div.accountInfo span.label:after {
+  content: ":";
+}
+div.userInfoBox div.body div.accountInfo span.status {
+  font-size: 10pt;
+}
+div.userInfoBox div.body div.accountInfo span.expriation {
+  font-size: 9pt;
+}
+div.userInfoBox div.body div.accountInfo div.payButton {
+  float: right;
+  padding-top: 6px;
+  text-align: right;
+}
+div.userInfoBox div.body div.accountInfo div.payButton a {
+  border: 0px;
+  margin-top: 0px;
+  padding: 0px;
+  color: white;
+  display: inline-block;
+  padding: 2px 5px 2px 5px;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  font-size: 9pt;
+  font-weight: normal;
+  background-color: #d15a22;
+}
+div.userInfoBox div.body div.accountInfo div.payButton a:hover {
+  background-color: #8c3b15;
+}
 div.userInfoBox div.body a {
  display: block;
-  margin-top: 8px;
+  margin-top: 4px;
  border-top: 1px solid white;
  padding-top: 6px;
  font-size: 10pt;
  font-weight: bold;
  color: #d15a22;
  border-color: #fe9a5f;
  text-decoration: none;
 }
 div.userInfoBox div.body a:hover {
  color: #8c3b15;
 }
 div.sidePanels {
  float: left;
-  margin-top: 106px;
+  margin-top: 186px;
  margin-left: 20px;
  width: 160px;
 }
 div.sidePanels div.tabSidePanel {
  margin-right: -10px;
 }
 div.sidePanels div.tabSidePanel ul {
  margin: 0px;
  padding-left: 0px;
  list-style-type: none;
  color: #f78b46;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs {
  margin: 0px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li a {
  display: block;
  line-height: 30px;
  height: 43px;
  padding-left: 40px;
  color: #ff6621;
  margin: 0px;
  font-weight: normal;
  font-size: 13pt;
  text-decoration: none;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li div.selectionHighlighter {
  display: none;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li div.selectionHighlighter a.add {
  font-size: 14pt;
  font-weight: bold;
  position: relative;
  top: -34px;
  right: 16px;
  background: none;
  color: #c0531b;
  padding-left: 15px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li div.selectionHighlighter a.add:hover {
  color: white;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li div.selectionHighlighter a.add span {
  font-size: 8pt;
  vertical-align: middle;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li div.selectionHighlighter a.add h3 {
  display: inline;
  padding-left: 5px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li.selected div.selectionHighlighter {
  display: block;
  position: absolute;
  left: 154px;
  margin-top: -43px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li.cards a {
  background: url(./images/old/main/tabs/cardsBackground.png) -19px -63px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li.cards a:hover {
  background: url(./images/old/main/tabs/cardsBackground.png) -19px -110px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li.cards.selected a {
  margin-left: -10px;
  padding-left: 50px;
  color: white;
  background: url(./images/old/main/tabs/cardsBackground.png) -9px -14px;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li.directLogins.selected a {
  margin-left: -10px;
  padding-left: 50px;
  color: white;
 }
 div.sidePanels div.tabSidePanel ul.mainTabs li.directLogins.selected a:hover {
  color: white;
 }
 div.sidePanels div.tabSidePanel ul.otherTabs {
  margin: 10px 0px;
 }
 div.sidePanels div.tabSidePanel ul.otherTabs li {
  margin-top: -4px;
 }
 div.sidePanels div.tabSidePanel ul.otherTabs li div.selectionHighlighter {
  display: none;
 }
 div.sidePanels div.tabSidePanel ul.otherTabs li a {
  display: block;
  line-height: 36px;
  height: 43px;
  padding-left: 40px;
  color: #ff6621;
  text-decoration: none;
 }
 div.sidePanels div.tabSidePanel ul.otherTabs li a:hover {
  background: url(./images/old/main/tabs/itemsBackground.png) -10px -49px;
 }
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
index 5e49fb5..3c57f67 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/PageHeader.js
@@ -1,159 +1,159 @@
 /*
 Copyright 2008-2013 Clipperz Srl
 This file is part of Clipperz, the online password manager.
 For further information about its features and functionalities please
 refer to http://www.clipperz.com.
 * Clipperz 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 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. If not, see http://www.gnu.org/licenses/.
 */
 Clipperz.Base.module('Clipperz.PM.UI.Web.Components');
 Clipperz.PM.UI.Web.Components.PageHeader = function(args) {
        args = args || {};
        Clipperz.PM.UI.Web.Components.PageHeader.superclass.constructor.apply(this, arguments);
        this._newsIsOpen = args.newsIsOpen || false;
        this._animationDuration = args.animationDuration || 0.5;
        
        this._offset = 82;
        return this;
 }
 //=============================================================================
 Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.PageHeader, Clipperz.PM.UI.Common.Components.BaseComponent, {
        //-------------------------------------------------------------------------
        'toString': function () {
                return "Clipperz.PM.UI.Web.Components.PageHeader component";
        },
        //-------------------------------------------------------------------------
        'iframeURL': function () {
        //      return './rss_view.html';
-                return 'http://www.clipperz.com/files/clipperz.com/appTips/index.html';
+                return 'https://www.clipperz.com/tips/index.html';
        },
        //-------------------------------------------------------------------------
        'renderSelf': function(/*aContainer, aPosition*/) {
                this.append(this.element(), [
                        {tag:'div', id:'miscLinks', children:[
                                {tag:'ul', children:[
                                                {tag:'li', children:[{tag:'a', id:'donateHeaderLink',   stringID:'pageHeader.donation',         href:'http://www.clipperz.com/donations',               target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.donation')}]},
                                                {tag:'li', children:[{tag:'a', id:'forumHeaderLink',    stringID:'pageHeader.forum',    href:'http://www.clipperz.com/forum',                   target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.forum')}]},
-                                                {tag:'li', children:[{tag:'a', id:'creditsHeaderLink',  stringID:'pageHeader.credits',  href:'http://www.clipperz.com/credits',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.credits')}]},
+        //                                      {tag:'li', children:[{tag:'a', id:'creditsHeaderLink',  stringID:'pageHeader.credits',  href:'http://www.clipperz.com/credits',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.credits')}]},
                                                {tag:'li', children:[{tag:'a', id:'feedbackHeaderLink',         stringID:'pageHeader.feedback',         href:'http://www.clipperz.com/contact',                         target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.feedback')}]},
                                                {tag:'li', children:[{tag:'a', id:'helpHeaderLink',             stringID:'pageHeader.help',             href:'http://www.clipperz.com/support/user_guide',target:'_blank', html:Clipperz.PM.Strings.getValue('pageHeader.help')}]}
                                ]}
                        ]},
                        {tag:'div', id:'logoFrame', children:[
                                {tag:'a', href:'http://www.clipperz.com', target:'_blank', children:[
        //                              {tag:'h1', cls:'logo', html:"clipperz"},
                                        {tag:'canvas', id:this.getId('logo'), cls:'logo'},
                                        {tag:'h5', cls:'clipperzPayoff', html:"keep it to yourself!"}
                                ]}
                        ]},
                        {tag:'div', id:'news', cls:'hidden', children:[
        //                      {tag:'div', cls:'close', children:[
        //                              {tag:'a', href:'#', id:this.getId('closeTips'), html:'x'}
        //                      ]},
                                {tag:'div', id:'newsframe', children:[
                                        {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()}
                                ]},
                                {tag:'div', id:this.getId('newsGrip'), cls:'grip', children:[
                                        {tag:'div', cls:'gripHandler', children:[]}
                                ]}
                        ]},
                        {tag:'div', id:'featureTabs', children:[
                                {tag:'table', children:[{tag:'tr', children:[
                                                {tag:'td', children:[{tag:'div', id:'feature_store',            children:[{tag:'canvas', cls:'featureIcon', id:this.getId('storeIcon')},        {tag:'span', html:"Store and manage your password and online credentials"}]}]},
                                                {tag:'td', children:[{tag:'div', id:'feature_protect',          children:[{tag:'canvas', cls:'featureIcon', id:this.getId('protectIcon')},      {tag:'span', html:"Protect all your sensitive data"}]}]},
                                                {tag:'td', children:[{tag:'div', id:'feature_directLogin',      children:[{tag:'canvas', cls:'featureIcon', id:this.getId('directLoginIcon')},{tag:'span', html:"Login to your web services without entering any username or password"}]}]},
                                                {tag:'td', children:[{tag:'div', id:'feature_share',            children:[{tag:'canvas', cls:'featureIcon', id:this.getId('shareIcon')},        {tag:'span', html:"Share secret with family members and associates"}]}]}
                                ]}]}
                        ]}
                ]);
                Clipperz.PM.UI.Canvas.features.store(this.getElement('storeIcon'), "#ffffff");
                Clipperz.PM.UI.Canvas.features.protect(this.getElement('protectIcon'), "#ffffff");
                Clipperz.PM.UI.Canvas.features.directLogin(this.getElement('directLoginIcon'), "#ffffff");
                Clipperz.PM.UI.Canvas.features.share(this.getElement('shareIcon'), "#ffffff", "#ffffff", "#ff0000");
                MochiKit.Signal.connect(this.getElement('newsGrip'), 'onclick', this, 'toggleTips');
                MochiKit.Signal.connect(this.getElement('iframe'), 'onload', this, 'handleIframeDidLoad');
                this.setLogoDefaultColors();
        },
        //-------------------------------------------------------------------------
        'switchToLoggedMode': function() {
        //      MochiKit.Style.addElementClass(this.element(), 'logged');
                MochiKit.Style.hideElement('featureTabs');
        },
        //-------------------------------------------------------------------------
        'animationDuration': function () {
                return this._animationDuration;
        },
        'offset': function () {
                return this._offset;
        },
        //-------------------------------------------------------------------------
        'isNewsOpen': function () {
                        return this._newsIsOpen;
        },
        
        'toggleNewsIsOpen': function () {
                this._newsIsOpen = !this._newsIsOpen;
        },
        'toggleTips': function(anEvent) {
                anEvent.preventDefault();
                if (this.isNewsOpen() == true) {
                        MochiKit.Visual.Move(Clipperz.DOM.get('news'), {
                                x: 0,
                                y: -this.offset(),
                                mode: 'relative',
                                duration: this.animationDuration(),
                                beforeStart: function () {
                                        MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'hiding');
                                },
                                afterFinish: function () {
                                        Clipperz.DOM.get('newsframe').innerHTML = "";
                                        MochiKit.DOM.setElementClass(Clipperz.DOM.get('news'), 'hidden');
                                }
                        })
                        this.toggleNewsIsOpen();
                } else {
                        MochiKit.DOM.addElementClass('newsframe', 'loading');
                        MochiKit.Visual.Move(Clipperz.DOM.get('news'), {
                                x: 0,
                                y: this.offset(),
                                mode: 'relative',
                                duration: this.animationDuration(),
                                beforeStart: MochiKit.Base.bind(function () {
                                        this.append(Clipperz.DOM.get('newsframe'), {tag:'iframe', id:this.getId('iframe'), src:this.iframeURL()});
diff --git a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
index fbf58e0..91085cf 100644
--- a/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
+++ b/frontend/gamma/js/Clipperz/PM/UI/Web/Components/UserInfoBox.js
@@ -73,217 +73,245 @@ Clipperz.Base.extend(Clipperz.PM.UI.Web.Components.UserInfoBox, Clipperz.PM.UI.C
        'toggleLock': function(anEvent) {
                var deferredResult;
                var shouldLock;
                anEvent.preventDefault();
                this.lockTooltip().hide();
                shouldLock = (this.isLocked() == false);
                if (shouldLock) {
                        var maskElement;
                        this.setIsLocked(true);
                        maskElement = this.getId('modalDialogMask');
                        deferredResult = Clipperz.Async.callbacks("UserInfoBox.toggleLock [lock]", [
                                MochiKit.Base.partial(MochiKit.DOM.addElementClass, this.element(), 'locked'),
                                MochiKit.Base.partial(Clipperz.Visual.deferredAnimation, MochiKit.Visual.appear, maskElement, {from:0.0, to:0.75, duration:0.5}),
                                MochiKit.Base.method(Clipperz.PM.RunTime.mainController, 'setPassphraseDelegate', MochiKit.Base.method(this, 'askForPassphrase')),
                                MochiKit.Base.partial(MochiKit.Signal.signal, this, 'lock')
                        ], {trace:false});
                } else {
                        deferredResult = Clipperz.Async.callbacks("UserInfoBox.toggleLock [unlock]", [
                                MochiKit.Base.partial(MochiKit.Signal.signal, this, 'unlock')
                        ], {trace:false});
                }
                
                return deferredResult;
        },
        //-------------------------------------------------------------------------
        'unlock': function () {
                var deferredResult;
                var maskElement;
                
                this.setIsLocked(false);
                maskElement = this.getId('modalDialogMask');
                
                deferredResult = Clipperz.Async.callbacks("UserInfoBox.unlock", [
                        MochiKit.Base.partial(Clipperz.Visual.deferredAnimation, MochiKit.Visual.fade, maskElement, {from:0.75, to:0.0, duration:0.5}),
        //              Clipperz.Visual.deferredAnimation(MochiKit.Visual.fade, maskElement, {from:0.75, to:0.0, duration:0.5}),
                        MochiKit.Base.partial(MochiKit.DOM.removeElementClass, this.element(), 'locked')
                ], {trace:false});
        },
        //-------------------------------------------------------------------------
        'askForPassphrase': function () {
                        varunlockPasswordComponent;
 /*
                        vardeferredResult;
                
                deferredResult = new Clipperz.Async.Deferred("UserInfoBox.askForPassphrase", {trace:false});
                deferredResult.addCallback(MochiKit.Async.succeed, 'test');
                
                deferredResult.callback();
                
                return deferredResult;
 */
                unlockPasswordComponent = new Clipperz.PM.UI.Web.Components.UnlockPasswordComponent({
                                'title':"Unlock account",
                                'text':         "Insert the passprase to unlock the account",
                                'type':         'INFO',
                        'buttons': [
                                        {text:"Cancel",result:'CANCEL'},
                                        {text:"Unlock",         result:'OK',isDefault:true}
                        ],
                                'openFromElement':              this.getElement('lock'),
                                'onOkCloseToElement':   null,
                                'onCancelCloseToElement':this.getId('lock')
                });
                return unlockPasswordComponent.getPassphrase();
        },
        //=========================================================================
        'renderSelf': function(/*aContainer, aPosition*/) {
                this.append(this.element(), [
        //              {tag:'canvas', id:this.getId('canvas'), cls:'canvas', width:'188', height:'154'},
                        {tag:'div', cls:'header', children:[
                                {tag:'h1', html:"Welcome"},
                                {tag:'a', cls:'lockButton', href:'#', id:this.getId('lock'), html:'&nbsp;'}
                        ]},
                        {tag:'div', cls:'body', children:[
                                {tag:'h3', id:this.getId('username'), html:""},
                                {tag:'ul', children:[
                                        {tag:'li', id:this.getId('cards'), children:[
                                                {tag:'span', id:this.getId('cardsNumber'), cls:'number', html:"-"},
                                                {tag:'span', id:this.getId('cardsLabel'), html:"cards"}
                                        ]},
                                        {tag:'li', id:this.getId('directLogins'), children:[
                                                {tag:'span', id:this.getId('directLoginsNumber'), cls:'number', html:"-"},
                                                {tag:'span', id:this.getId('directLoginsLabel'), html:"direct logins"}
                                        ]}
                                ]},
+                                {tag:'div', cls:'accountInfo', children:[
+                                        {tag:'div', cls:'payButton', children:[
+                                                {tag:'a', href:'#', id:this.getId('payButton'), cls:'info', html:"info"}
+                                        ]},
+                                        {tag:'h5', html:"Account info"},
+                                        {tag:'div', cls:'accountStatus', children:[
+                                                {tag:'span', cls:'label', html:"status"},
+                                                {tag:'span', cls:'status', html:"early adopter"}
+                                        ]},
+                                        {tag:'div', cls:'accountLevel', children:[
+                                                {tag:'span', cls:'label', html:"level"},
+        //                                      {tag:'span', cls:'level', html:"★☆☆☆"}
+                                                {tag:'span', cls:'level', html:"☆☆☆☆"}
+                                        ]},
+                                        {tag:'div', cls:'accountExpiration', children:[
+                                                {tag:'span', cls:'label', html:"expires"},
+        //                                      {tag:'span', cls:'expriation', html:"on 26 April 2014"}
+                                                {tag:'span', cls:'expriation', html:"never"}
+                                        ]}
+                                ]},
                                {tag:'a', href:'#', id:this.getId('logout'), html:"logout >"}
                        ]},
                        {tag:'div', cls:'footer'}
                ]);
-                MochiKit.Signal.connect(this.getElement('logout'), 'onclick', this, 'handleLogout');
+                        MochiKit.Signal.connect(this.getElement('logout'),      'onclick', this, 'handleLogout');
-                MochiKit.Signal.connect(this.getElement('lock'), 'onclick', this, 'toggleLock');
+                        MochiKit.Signal.connect(this.getElement('lock'),        'onclick', this, 'toggleLock');
+                        MochiKit.Signal.connect(this.getElement('payButton'),'onclick', this, 'handlePayButton');
                this._lockTooltip = new Clipperz.PM.UI.Common.Components.Tooltip({
                                element:this.getElement('lock'),
                                text:   "Click here to lock/unlock your account.",
                                position:'RIGHT'
                });
                Clipperz.DOM.Helper.append(MochiKit.DOM.currentDocument().body,
                        {tag:'div', id:this.getId('modalDialogWrapper'), cls:'modalDialogWrapper', children:[
                                {tag:'div', id:this.getId('modalDialogMask'), cls:'modalDialogMask userInfoBoxMask'}
                        ]}
                );
                MochiKit.Style.hideElement(this.getId('modalDialogMask'));
                
        //      this.drawUserInfoBackground(this.getElement('canvas'));
        },
        //-------------------------------------------------------------------------
+        'handlePayButton': function (anEvent) {
+                anEvent.preventDefault();
+                window.open('https://www.clipperz.com/pricing/', '_blank');
+        },
+        //-------------------------------------------------------------------------
 /*
        'drawUserInfoBackground': function (canvas) {
                var kMyDrawingFunctionWidth = 188.0;
                var kMyDrawingFunctionHeight = 154.0;
                var context = canvas.getContext("2d");
                var color;
                var resolution;
                var alignStroke;
                var path;
                var pointX;
                var pointY;
                var controlPoint1X;
                var controlPoint1Y;
                var controlPoint2X;
                var controlPoint2Y;
                var gradient;
                if (window.devicePixelRatio)
                        resolution = window.devicePixelRatio;
                else
                        resolution = 1.0;
                resolution *= 0.5 * (canvas.width / kMyDrawingFunctionWidth + canvas.height / kMyDrawingFunctionHeight);
        
                context.save();
                context.scale(canvas.width / kMyDrawingFunctionWidth, canvas.height / kMyDrawingFunctionHeight);
                context.clearRect(0.0, 0.0, kMyDrawingFunctionWidth, kMyDrawingFunctionHeight);
        
                // Setup for Shadow Effect
                color = "rgba(0.0%, 0.0%, 0.0%, 0.667)";
                context.save();
                context.shadowColor = color;
                context.shadowBlur = 3.0;
                context.shadowOffsetX = 5.729 * Math.cos(7.592) * resolution;
                context.shadowOffsetY = 5.729 * Math.sin(7.592) * resolution;
        
                // Layer 1
        
                alignStroke = 0.0;
                context.beginPath();
                pointX = 169.5;
                pointY = 141.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
                pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
                context.moveTo(pointX, pointY);
                pointX = 177.5;
                pointY = 133.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
                pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
                controlPoint1X = 173.889;
                controlPoint1Y = 141.5;
                controlPoint1X = (Math.round(resolution * controlPoint1X + alignStroke) - alignStroke) / resolution;
                controlPoint1Y = (Math.round(resolution * controlPoint1Y + alignStroke) - alignStroke) / resolution;
                controlPoint2X = 177.5;
                controlPoint2Y = 137.889;
                controlPoint2X = (Math.round(resolution * controlPoint2X + alignStroke) - alignStroke) / resolution;
                controlPoint2Y = (Math.round(resolution * controlPoint2Y + alignStroke) - alignStroke) / resolution;
                context.bezierCurveTo(controlPoint1X, controlPoint1Y, controlPoint2X, controlPoint2Y, pointX, pointY);
                pointX = 177.5;
                pointY = 19.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
                pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
                context.lineTo(pointX, pointY);
                pointX = 169.5;
                pointY = 11.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
                pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
                controlPoint1X = 177.5;
                controlPoint1Y = 15.111;
                controlPoint1X = (Math.round(resolution * controlPoint1X + alignStroke) - alignStroke) / resolution;
                controlPoint1Y = (Math.round(resolution * controlPoint1Y + alignStroke) - alignStroke) / resolution;
                controlPoint2X = 173.889;
                controlPoint2Y = 11.5;
                controlPoint2X = (Math.round(resolution * controlPoint2X + alignStroke) - alignStroke) / resolution;
                controlPoint2Y = (Math.round(resolution * controlPoint2Y + alignStroke) - alignStroke) / resolution;
                context.bezierCurveTo(controlPoint1X, controlPoint1Y, controlPoint2X, controlPoint2Y, pointX, pointY);
                pointX = 18.5;
                pointY = 11.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
                pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
                context.lineTo(pointX, pointY);
                pointX = 10.5;
                pointY = 19.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;
                pointY = (Math.round(resolution * pointY + alignStroke) - alignStroke) / resolution;
                controlPoint1X = 14.111;
                controlPoint1Y = 11.5;
                controlPoint1X = (Math.round(resolution * controlPoint1X + alignStroke) - alignStroke) / resolution;
                controlPoint1Y = (Math.round(resolution * controlPoint1Y + alignStroke) - alignStroke) / resolution;
                controlPoint2X = 10.5;
                controlPoint2Y = 15.111;
                controlPoint2X = (Math.round(resolution * controlPoint2X + alignStroke) - alignStroke) / resolution;
                controlPoint2Y = (Math.round(resolution * controlPoint2Y + alignStroke) - alignStroke) / resolution;
                context.bezierCurveTo(controlPoint1X, controlPoint1Y, controlPoint2X, controlPoint2Y, pointX, pointY);
                pointX = 10.5;
                pointY = 133.5;
                pointX = (Math.round(resolution * pointX + alignStroke) - alignStroke) / resolution;