Changeset e3f6ae


Ignore:
Timestamp:
Apr 14, 2008, 12:35:20 PM (14 years ago)
Author:
rene <rene@…>
Branches:
master
Children:
d3938a
Parents:
e86500
Message:

rearranged and renamed options, locale only english, not completely implemented

Location:
chrome
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_prefDialog.js

    re86500 re3f6ae  
    4949                "VIdent_identity.smart_reply",
    5050                "VIdent_identity.smart_reply_for_newsgroups",
    51                 "VIdent_identity.smart_reply_ask",
    52                 "VIdent_identity.smart_reply_ask_always",
    5351                "VIdent_identity.show_smtp",
    5452                "VIdent_identity.menu_entry",
     
    6058                "VIdent_identity.smart_reply_defaultFullName",
    6159                "VIdent_identity.smart_reply_ignoreFullName",
    62                 "VIdent_identity.smart_reply_autocreate",
    63                 "VIdent_identity.smart_timestamp",
     60                "VIdent_identity.autoTimestamp",
    6461                "VIdent_identity.notification_timeout",
    6562                "VIdent_identity.debug_notification",
     
    6764                "VIdent_identity.warn_virtual",
    6865                "VIdent_identity.hide_signature",
     66                "VIdent_identity.storage",
    6967                "VIdent_identity.storage_storedefault",
    7068                "VIdent_identity.storage_dont_update_multiple",
    7169                "VIdent_identity.storage_show_switch",
    7270                "VIdent_identity.storage_warn_update",
    73                 "VIdent_identity.storage_use_for_smart_reply",
    74                 "VIdent_identity.storage_prefer_smart_reply",
    75                 "VIdent_identity.storage_ignore_smart_reply",
    7671                "VIdent_identity.storage_warn_vI_replace",
    7772                "VIdent_identity.storage_notification",
    7873                "VIdent_identity.storage_getOneOnly",
     74                "VIdent_identity.storage_returnReciept",
     75                "VIdent_identity.storage_characterEncoding",
     76                "VIdent_identity.storage_messageFormat",
     77                "VIdent_identity.storage_sMime_messageEncryption",
     78                "VIdent_identity.storage_sMime_messageSignature",
     79                "VIdent_identity.storage_openPGP_messageEncryption",
     80                "VIdent_identity.storage_openPGP_messageSignature",
     81                "VIdent_identity.storage_openPGP_PGPMIME",
     82                "VIdent_identity.idSelection_storage_use_for_smart_reply",
     83                "VIdent_identity.idSelection_storage_prefer_smart_reply",
     84                "VIdent_identity.idSelection_storage_ignore_smart_reply",
     85                "VIdent_identity.idSelection_ask",
     86                "VIdent_identity.idSelection_ask_always",
     87                "VIdent_identity.idSelection_autocreate",
    7988                "VIdent_identity.autoReplyToSelf"],
    8089   
     
    126135        },
    127136       
     137        idSelectionConstraint : function() {
     138            storage = document.getElementById("VIdent_identity.storage").checked;
     139            smartDraft = document.getElementById("VIdent_identity.smart_draft").checked;
     140            smartReply = document.getElementById("VIdent_identity.smart_reply").checked;
     141            vI_prefDialog.base.idSelectionConstraint1(storage && smartReply);
     142            vI_prefDialog.base.idSelectionConstraint2(storage || smartReply || smartDraft);
     143            if (storage || smartReply || smartDraft) vI_prefDialog.base.idSelectionResultConstraint()
     144        },
     145
     146        idSelectionConstraint1 : function(checked) {
     147            var elementIDs = [
     148                "VIdent_identity.idSelection_storage_use_for_smart_reply",
     149                "VIdent_identity.idSelection_storage_prefer_smart_reply",
     150                "VIdent_identity.idSelection_storage_ignore_smart_reply",
     151                "idSelection1"];
     152            for( var i = 0; i < elementIDs.length; i++ ) {
     153                if (checked)
     154                    document.getElementById(elementIDs[i])
     155                        .removeAttribute("disabled");
     156                else
     157                    document.getElementById(elementIDs[i])
     158                        .setAttribute("disabled", "true");
     159            }
     160        },
     161
     162        idSelectionConstraint2 : function(checked) {
     163            var elementIDs = [
     164                "VIdent_identity.idSelection_ask",
     165                "VIdent_identity.idSelection_ask_always",
     166                "VIdent_identity.idSelection_autocreate",
     167                "VIdent_identity.idSelection_autocreate.desc",
     168                "idSelection", "idSelection2"];
     169            for( var i = 0; i < elementIDs.length; i++ ) {
     170                if (checked)
     171                    document.getElementById(elementIDs[i])
     172                        .removeAttribute("disabled");
     173                else
     174                    document.getElementById(elementIDs[i])
     175                        .setAttribute("disabled", "true");
     176            }
     177        },
     178
    128179        smartReplyConstraint : function(element) {
    129180            var elementIDs = [
    130181                "VIdent_identity.smart_reply_for_newsgroups",
    131                 "VIdent_identity.smart_reply_ask",
    132                 "VIdent_identity.smart_reply_ask_always",
    133182                "VIdent_identity.smart_reply_headers",
    134183                "VIdent_identity.smart_reply_filter",
    135184                "VIdent_identity.smart_reply_defaultFullName",
    136185                "VIdent_identity.smart_reply_ignoreFullName",
    137                 "VIdent_identity.smart_reply_autocreate",
    138186                "VIdent_identity.smart_reply_headers_reset",
    139                 "VIdent_identity.storage_use_for_smart_reply",
    140                 "VIdent_identity.storage_prefer_smart_reply",
    141                 "VIdent_identity.storage_ignore_smart_reply",
    142                 "storageTab2",
    143                 "smartReplyTab", "smartReplyTab1", "smartReplyTab2", "smartReplyTab3"];
     187                "smartReplyTab", "smartReplyTab1", "smartReplyTab2"];
    144188            for( var i = 0; i < elementIDs.length; i++ ) {
    145189                if (element.checked)
     
    150194                        .setAttribute("disabled", "true");
    151195            }
    152             vI_prefDialog.base.smartReplyResultConstraint();
    153         },
    154        
    155         smartReplyResultConstraint : function() {
    156             if (!document.getElementById("VIdent_identity.smart_reply").checked) return;
    157             var ask = document.getElementById("VIdent_identity.smart_reply_ask")
    158             var ask_always = document.getElementById("VIdent_identity.smart_reply_ask_always")
    159             var autocreate = document.getElementById("VIdent_identity.smart_reply_autocreate")
    160             var autocreate_desc = document.getElementById("VIdent_identity.smart_reply_autocreate.desc")
     196            vI_prefDialog.base.idSelectionConstraint();
     197        },
     198       
     199        idSelectionResultConstraint : function() {
     200            var ask = document.getElementById("VIdent_identity.idSelection_ask")
     201            var ask_always = document.getElementById("VIdent_identity.idSelection_ask_always")
     202            var autocreate = document.getElementById("VIdent_identity.idSelection_autocreate")
     203            var autocreate_desc = document.getElementById("VIdent_identity.idSelection_autocreate.desc")
    161204            ask_always.setAttribute("disabled", (autocreate.checked || !ask.checked))
    162205            autocreate.setAttribute("disabled", (ask.checked && ask_always.checked))
     
    165208        },
    166209       
    167         storageSmartReplyConstraint : function() {
    168             var use_for_smart_reply = document.getElementById("VIdent_identity.storage_use_for_smart_reply")
    169             var prefer_smart_reply = document.getElementById("VIdent_identity.storage_prefer_smart_reply")
    170             var ignore_smart_reply = document.getElementById("VIdent_identity.storage_ignore_smart_reply")
     210        idSelectionStorageSmartReplyConstraint : function() {
     211            var use_for_smart_reply = document.getElementById("VIdent_identity.idSelection_storage_use_for_smart_reply")
     212            var prefer_smart_reply = document.getElementById("VIdent_identity.idSelection_storage_prefer_smart_reply")
     213            var ignore_smart_reply = document.getElementById("VIdent_identity.idSelection_storage_ignore_smart_reply")
    171214            prefer_smart_reply.setAttribute("disabled", !use_for_smart_reply.checked)
    172215            ignore_smart_reply.setAttribute("disabled", !use_for_smart_reply.checked)
     
    179222       
    180223        smartReplyHideSignature : function() {
    181             // seamonkey has no extsnion-manager
     224            // seamonkey has no extension-manager
    182225            if (("nsIExtensionManager" in Components.interfaces) && ("@mozilla.org/extensions/manager;1" in Components.classes)) {
    183226                var switch_signature_ID="{2ab1b709-ba03-4361-abf9-c50b964ff75d}"
     
    203246            }
    204247        },
     248       
     249        storageConstraint : function(element) {
     250            var elementIDs = [
     251                "VIdent_identity.storage_storedefault",
     252                "VIdent_identity.storage_dont_update_multiple",
     253                "VIdent_identity.storage_show_switch",
     254                "VIdent_identity.storage_warn_update",
     255                "VIdent_identity.storage_warn_vI_replace",
     256                "VIdent_identity.storage_notification",
     257                "VIdent_identity.storage_getOneOnly",
     258                "VIdent_identity.storage_returnReciept",
     259                "VIdent_identity.storage_characterEncoding",
     260                "VIdent_identity.storage_messageFormat",
     261                "VIdent_identity.storage_sMime_messageEncryption",
     262                "VIdent_identity.storage_sMime_messageSignature",
     263                "VIdent_identity.storage_openPGP_messageEncryption",
     264                "VIdent_identity.storage_openPGP_messageSignature",
     265                "VIdent_identity.storage_openPGP_PGPMIME",
     266                "storageTab", "storageTab1", "storageTab2"];
     267            for( var i = 0; i < elementIDs.length; i++ ) {
     268                if (element.checked)
     269                    document.getElementById(elementIDs[i])
     270                        .removeAttribute("disabled");
     271                else
     272                    document.getElementById(elementIDs[i])
     273                        .setAttribute("disabled", "true");
     274            }
     275            vI_prefDialog.base.idSelectionConstraint();
     276        }
    205277    },
    206278
  • chrome/content/v_identity/vI_prefDialog.xul

    re86500 re3f6ae  
    8686        <tab id="smartReplyTab" label="&vI_prefDialog.smartReplyTab.label;" />
    8787        <tab id="storageTab" label="&vI_prefDialog.storageTab.label;" />
     88        <tab id="idSelection" label="&vI_prefDialog.idSelection.label;" />
    8889        <tab label="&vI_prefDialog.notificationTab.label;" />
    8990    </tabs>
     
    9394        <groupbox>
    9495        <caption label="&vI_prefDialog.commonTab.caption;"/>
     96            <checkbox id="VIdent_identity.storage" label="&vI_prefDialog.storage.label;"
     97                tooltiptext="&vI_prefDialog.storage.tooltiptext;" prefstring="storage"
     98                oncommand="vI_prefDialog.base.storageConstraint(this);" />
     99            <checkbox id="VIdent_identity.autoTimestamp" label="&vI_prefDialog.autoTimestamp.label;"
     100                tooltiptext="&vI_prefDialog.autoTimestamp.tooltiptext;" prefstring="autoTimestamp" />
     101            <spacer height="10px"/>
     102            <label value="&vI_prefDialog.smartInfo.label;" />
    95103            <label id="version-warning"
    96104                value="&vI_prefDialog.versionWarning.label;" hidden="true"/>
    97105            <checkbox id="VIdent_identity.smart_draft" label="&vI_prefDialog.smartDraft.label;"
    98                 prefstring="smart_draft"/>
     106                tooltiptext="&vI_prefDialog.smartDraft.tooltiptext;" prefstring="smart_draft"
     107                oncommand="vI_prefDialog.base.idSelectionConstraint();" />
    99108            <checkbox id="VIdent_identity.smart_reply" label="&vI_prefDialog.smartReply.label;"
    100                 prefstring="smart_reply"
    101                 oncommand="vI_prefDialog.base.smartReplyConstraint(this);"
    102                 />
     109                tooltiptext="&vI_prefDialog.smartReply.tooltiptext;" prefstring="smart_reply"
     110                oncommand="vI_prefDialog.base.smartReplyConstraint(this);" />
    103111            <hbox><spacer width="20px"/><checkbox id="VIdent_identity.smart_reply_for_newsgroups" label="&vI_prefDialog.smartReplyNewsgroups.label;"
    104                 prefstring="smart_reply_for_newsgroups" />
     112                tooltiptext="&vI_prefDialog.smartReplyNewsgroups.tooltiptext;" prefstring="smart_reply_for_newsgroups" />
    105113            </hbox>
    106             <checkbox id="VIdent_identity.smart_timestamp" label="&vI_prefDialog.smartTimestamp.label;"
    107                 prefstring="smart_timestamp" />
    108114        </groupbox>
    109115        <groupbox>
     
    286292            <tab id="smartReplyTab1" label="&vI_prefDialog.smartReplyTab.Tab1.label;" />
    287293            <tab id="smartReplyTab2" label="&vI_prefDialog.smartReplyTab.Tab2.label;" />
    288             <tab id="smartReplyTab3" label="&vI_prefDialog.smartReplyTab.Tab3.label;" />
    289294        </tabs>
    290295        <tabpanels>
     
    327332            </groupbox>
    328333            </tabpanel>
    329             <tabpanel orient="vertical">
    330             <groupbox>
    331             <caption label="&vI_prefDialog.smartReplyTab3.caption;"/>
    332             <vbox align="left">
    333                 <description width="500px">&vI_prefDialog.smartReplyTab.Tab3.desc;</description>
    334                 <checkbox id="VIdent_identity.smart_reply_ask" label="&vI_prefDialog.smartReply.ask.label;"
    335                     prefstring="smart_reply_ask"
    336                     oncommand="vI_prefDialog.base.smartReplyResultConstraint();"/>
    337                 <hbox><spacer width="20px"/><checkbox id="VIdent_identity.smart_reply_ask_always" label="&vI_prefDialog.smartReply.ask_always.label;"
    338                     prefstring="smart_reply_ask_always"
    339                     oncommand="vI_prefDialog.base.smartReplyResultConstraint();"/>
    340                 </hbox>
    341                 <hbox>
    342                 <vbox><spacer flex="1"/>
    343                 <checkbox id="VIdent_identity.smart_reply_autocreate" label="&vI_prefDialog.smartReply.autocreate.label;"
    344                     prefstring="smart_reply_autocreate"
    345                     oncommand="vI_prefDialog.base.smartReplyResultConstraint();"/>
    346                 <spacer flex="1"/></vbox>
    347                 <vbox><spacer flex="1"/>
    348                 <label value="&vI_prefDialog.smartReply.autocreate.desc;" hidden="true"
    349                     id="VIdent_identity.smart_reply_autocreate.desc" />
    350                 <spacer flex="1"/></vbox>
    351                 </hbox>
    352             </vbox>
    353             </groupbox>
    354             </tabpanel>
    355334        </tabpanels>
    356335        </tabbox>
     
    376355                <checkbox id="VIdent_identity.storage_dont_update_multiple" label="&vI_prefDialog.storage.dont_update_multiple.label;"
    377356                    prefstring="storage_dont_update_multiple"/>
     357                <spacer height="10px"/>
     358                <button id="VIdent_identity.storage.openEditor" label="&vI_prefDialog.storage.openEditor;" oncommand="openDialog('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome,modal');" />
    378359            </vbox>
    379360            </groupbox>
     
    392373            <caption label="&vI_prefDialog.storageCap3.caption;"/>
    393374            <vbox align="left">
    394                 <description width="500px">&vI_prefDialog.storage.reply.desc;</description>
    395                 <checkbox id="VIdent_identity.storage_use_for_smart_reply" label="&vI_prefDialog.storage.use_for_smart_reply.label;"
    396                     prefstring="storage_use_for_smart_reply"
    397                     oncommand="vI_prefDialog.base.storageSmartReplyConstraint();" />
    398                 <hbox><spacer width="20px"/><checkbox id="VIdent_identity.storage_prefer_smart_reply" label="&vI_prefDialog.storage.prefer_smart_reply.label;"
    399                     prefstring="storage_prefer_smart_reply"/>
    400                 </hbox>
    401                 <hbox><spacer width="20px"/><checkbox id="VIdent_identity.storage_ignore_smart_reply" label="&vI_prefDialog.storage.ignore_smart_reply.label;"
    402                     prefstring="storage_ignore_smart_reply"/>
    403                 </hbox>
     375                <checkbox id="VIdent_identity.storage_returnReciept" label="&vI_prefDialog.storage.returnReciept.label;"
     376                    prefstring="storage_returnReciept"/>
     377                <checkbox id="VIdent_identity.storage_characterEncoding" label="&vI_prefDialog.storage.characterEncoding.label;"
     378                    prefstring="storage_characterEncoding"/>
     379                <checkbox id="VIdent_identity.storage_messageFormat" label="&vI_prefDialog.storage.messageFormat.label;"
     380                    prefstring="storage_messageFormat"/>
     381                <spacer height="10px"/>
     382                <hbox><vbox>
     383                <label value="&vI_prefDialog.storage.sMime.label;"/>
     384                <checkbox id="VIdent_identity.storage_sMime_messageEncryption" label="&vI_prefDialog.storage.sMime.messageEncryption.label;"
     385                    prefstring="storage_sMime_messageEncryption"/>
     386                <checkbox id="VIdent_identity.storage_sMime_messageSignature" label="&vI_prefDialog.storage.sMime.messageSignature.label;"
     387                    prefstring="storage_sMime_messageSignature"/>
     388                </vbox><spacer flex="1"/><vbox>
     389                <label value="&vI_prefDialog.storage.openPGP.label;"/>
     390                <checkbox id="VIdent_identity.storage_openPGP_messageEncryption" label="&vI_prefDialog.storage.openPGP.messageEncryption.label;"
     391                    prefstring="storage_openPGP_messageEncryption"/>
     392                <checkbox id="VIdent_identity.storage_openPGP_messageSignature" label="&vI_prefDialog.storage.openPGP.messageSignature.label;"
     393                    prefstring="storage_openPGP_messageSignature"/>
     394                <checkbox id="VIdent_identity.storage_openPGP_PGPMIME" label="&vI_prefDialog.storage.openPGP.PGPMIME.label;"
     395                    prefstring="storage_openPGP_PGPMIME"/>
     396                </vbox></hbox>
    404397            </vbox>
    405398            </groupbox>
     
    408401        </tabbox>
    409402    </tabpanel>
     403   
     404    <tabpanel orient="vertical"  label="&vI_prefDialog.idSelection.header;">
     405        <dialogheader title="&vI_prefDialog.idSelection.header;"/>
     406        <tabbox>
     407        <tabs>
     408            <tab id="idSelection1" label="&vI_prefDialog.idSelection.Tab1.label;" />
     409            <tab id="idSelection2" label="&vI_prefDialog.idSelection.Tab2.label;" />
     410        </tabs>
     411        <tabpanels>
     412            <tabpanel orient="vertical">
     413            <groupbox>
     414            <caption label="&vI_prefDialog.idSelection.Tab1.caption;"/>
     415            <vbox align="left">
     416                <description width="500px">&vI_prefDialog.idSelection.reply.desc;</description>
     417                <checkbox id="VIdent_identity.idSelection_storage_use_for_smart_reply" label="&vI_prefDialog.idSelection.use_for_smart_reply.label;"
     418                    prefstring="idSelection_storage_use_for_smart_reply"
     419                    oncommand="vI_prefDialog.base.idSelectionStorageSmartReplyConstraint();" />
     420                <hbox><spacer width="20px"/><checkbox id="VIdent_identity.idSelection_storage_prefer_smart_reply" label="&vI_prefDialog.idSelection.prefer_smart_reply.label;"
     421                    prefstring="idSelection_storage_prefer_smart_reply"/>
     422                </hbox>
     423                <hbox><spacer width="20px"/><checkbox id="VIdent_identity.idSelection_storage_ignore_smart_reply" label="&vI_prefDialog.idSelection.ignore_smart_reply.label;"
     424                    prefstring="idSelection_storage_ignore_smart_reply"/>
     425                </hbox>
     426            </vbox>
     427            </groupbox>
     428            <groupbox>
     429            <caption label="&vI_prefDialog.idSelection.Tab1.caption2;"/>
     430            <vbox align="left">
     431                <description width="500px">&vI_prefDialog.idSelection.draft.desc;</description>
     432            </vbox>
     433            </groupbox>
     434            </tabpanel>
     435            <tabpanel orient="vertical">
     436            <groupbox>
     437            <caption label="&vI_prefDialog.idSelection.Tab2.caption;"/>
     438                <description width="500px">&vI_prefDialog.idSelection.multiselect.desc;</description>
     439                <checkbox id="VIdent_identity.idSelection_ask" label="&vI_prefDialog.idSelection.ask.label;"
     440                    prefstring="idSelection_ask"
     441                    oncommand="vI_prefDialog.base.idSelectionResultConstraint();"/>
     442                <hbox><spacer width="20px"/><checkbox id="VIdent_identity.idSelection_ask_always" label="&vI_prefDialog.idSelection.ask_always.label;"
     443                    prefstring="idSelection_ask_always"
     444                    oncommand="vI_prefDialog.base.idSelectionResultConstraint();"/>
     445                </hbox>
     446                <hbox>
     447                <vbox><spacer flex="1"/>
     448                <checkbox id="VIdent_identity.idSelection_autocreate" label="&vI_prefDialog.idSelection.autocreate.label;"
     449                    prefstring="idSelection_autocreate"
     450                    oncommand="vI_prefDialog.base.idSelectionResultConstraint();"/>
     451                <spacer flex="1"/></vbox>
     452                <vbox><spacer flex="1"/>
     453                <label value="&vI_prefDialog.idSelection.autocreate.desc;" hidden="true"
     454                    id="VIdent_identity.idSelection_autocreate.desc" />
     455                <spacer flex="1"/></vbox>
     456                </hbox>
     457            </groupbox>
     458            </tabpanel>
     459        </tabpanels>
     460        </tabbox>
     461    </tabpanel>
     462   
     463   
     464   
    410465    <tabpanel orient="vertical" label="&vI_prefDialog.notificationTab.header;">
    411466        <dialogheader title="&vI_prefDialog.notificationTab.header;"/>
  • chrome/content/v_identity/vI_smartIdentity.js

    re86500 re3f6ae  
    3939        vI_notificationBar.dump("## vI_smartIdentity: msgComposeType = " + type + "\n");
    4040       
    41         //~ if (vI.preferences.getBoolPref("smart_timestamp") &&
     41        //~ if (vI.preferences.getBoolPref("autoTimestamp") &&
    4242            //~ ((type == msgComposeType.New) || (type == msgComposeType.NewsPost) || (type == msgComposeType.MailToUrl)))
    4343                    //~ vI_smartIdentity.SmartTimestamp(hdr);
     
    105105        if (all_addresses.number > 0)
    106106            vI_smartIdentity.smartIdentitySelection(all_addresses, false)
    107         else if (vI.preferences.getBoolPref("smart_timestamp"))
     107        else if (vI.preferences.getBoolPref("autoTimestamp"))
    108108            vI_smartIdentity.SmartTimestamp(); 
    109109    },
     
    351351       
    352352        // check if Storage-search should be used in SmartReply-case
    353         if (vI.preferences.getBoolPref("storage_use_for_smart_reply")) {
     353        if (vI.preferences.getBoolPref("idSelection_storage_use_for_smart_reply")) {
    354354            vI_storage.getVIdentityFromAllRecipients(storage_addresses);
    355355            vI_notificationBar.dump("## vI_smartIdentity: checked for stored VIdentities and found " + storage_addresses.number + " address(es)\n")
     
    358358        vI_notificationBar.dump("## vI_smartIdentity: ----------------------------------------------------------\n")
    359359        if (hdr) {
    360             if (storage_addresses.number == 0 || !vI.preferences.getBoolPref("storage_ignore_smart_reply")) {
     360            if (storage_addresses.number == 0 || !vI.preferences.getBoolPref("idSelection_storage_ignore_smart_reply")) {
    361361           
    362362                vI_smartIdentity.collectAddresses(all_addresses, hdr);
     
    390390       
    391391        // merge SmartReply-Identities and Storage-Identites
    392         if (vI.preferences.getBoolPref("storage_prefer_smart_reply"))
     392        if (vI.preferences.getBoolPref("idSelection_storage_prefer_smart_reply"))
    393393            all_addresses = vI_smartIdentity.mergeWithoutDuplicates(all_addresses, storage_addresses)
    394394        else
     
    417417        vI_msgIdentityClone.addIdentitiesToCloneMenu(all_addresses);
    418418       
    419         if (!autocreate && vI.preferences.getBoolPref("smart_reply_ask") &&
    420             ((all_addresses.number == 1 && vI.preferences.getBoolPref("smart_reply_ask_always"))
     419        if (!autocreate && vI.preferences.getBoolPref("idSelection_ask") &&
     420            ((all_addresses.number == 1 && vI.preferences.getBoolPref("idSelection_ask_always"))
    421421                || all_addresses.number > 1))
    422422            window.openDialog("chrome://v_identity/content/vI_smartReplyDialog.xul",0, // give the Dialog a unique id
     
    424424                     all_addresses,
    425425                    /* callback: */ vI_smartIdentity.changeIdentityToSmartIdentity).focus();
    426         else if (autocreate || vI.preferences.getBoolPref("smart_reply_autocreate")) {
     426        else if (autocreate || vI.preferences.getBoolPref("idSelection_autocreate")) {
    427427            var label=vI.elements.strings.getString("vident.smartIdentity.vIUsage");
    428428            if (all_addresses.number > 1) label += " "
  • chrome/locale/en-US/v_identity/vI_prefDialog.dtd

    re86500 re3f6ae  
    11<!ENTITY vI_prefDialog.dlgTitle.label "Virtual Identity Settings">
    22<!ENTITY vI_prefDialog.vidLogo.tooltiptext "Open Virtual Identity Homepage">
     3
    34<!ENTITY vI_prefDialog.commonTab.label "Main">
    45<!ENTITY vI_prefDialog.vIdentityTab.label "Virtual Identity">
    56<!ENTITY vI_prefDialog.smartReplyTab.label "Smart Reply">
     7<!ENTITY vI_prefDialog.storageTab.label "Storage">
     8<!ENTITY vI_prefDialog.idSelection.label "Identity-Selection">
    69<!ENTITY vI_prefDialog.notificationTab.label "Status Messages">
     10
    711<!ENTITY vI_prefDialog.commonTab.header "General Configuration">
    8 <!ENTITY vI_prefDialog.commonTab.caption "use following features">
    9 <!ENTITY vI_prefDialog.commonTab.caption2 "interface and warnings">
     12
     13<!ENTITY vI_prefDialog.commonTab.caption "features">
     14<!ENTITY vI_prefDialog.storage.label "store (and recall) used Identities">
     15<!ENTITY vI_prefDialog.storage.tooltiptext "Used Identities might be stored related to the reciepients of your email. If you write again to the same reciepient, the same virtual or non-virtual Identity wil be used">
     16<!ENTITY vI_prefDialog.autoTimestamp.label "autogenerate Timestamp-Identity for new mails">
     17<!ENTITY vI_prefDialog.autoTimestamp.tooltiptext "On composing a new email, modify your usual sender-address with a timestamp. On easy way to create unique Identities, off by default.">
     18<!ENTITY vI_prefDialog.smartInfo.label "detect Identity by analysing the mail-header:">
    1019<!ENTITY vI_prefDialog.versionWarning.label "your Email-program is too old to use the Smart Draft feature">
    1120<!ENTITY vI_prefDialog.smartDraft.label "use Smart Draft">
     21<!ENTITY vI_prefDialog.smartDraft.tooltiptext "'Smart Draft' tries to detect the to-be used sender of the Draft or Template by analysing the header of the stored email. Recommended, on by default.">
    1222<!ENTITY vI_prefDialog.smartReply.label "use Smart Reply">
     23<!ENTITY vI_prefDialog.smartReply.tooltiptext "'Smart Reply' tries to detect the to-be used sender of the Reply by analysing the header of the received email. It's relevant if this Identity is not yet in your storage. Best results if configured in the approriate Tab. Recommended, on by default.">
    1324<!ENTITY vI_prefDialog.smartReplyNewsgroups.label "use Smart Reply also if answering to a newsgroup">
    14 <!ENTITY vI_prefDialog.smartTimestamp.label "use Smart Timestamp">
     25<!ENTITY vI_prefDialog.smartReplyNewsgroups.tooltiptext "You can use 'Smart Reply' for detecting your senders Identity while answering to newsposts. If not configured approriate, this won't work nicely. Therefore off by default.">
     26
     27<!ENTITY vI_prefDialog.commonTab.caption2 "interface">
    1528<!ENTITY vI_prefDialog.SMTP.label "show SMTP Menu">
    16 <!ENTITY vI_prefDialog.menuEntry.label "add entry for Settings-Dialog to Tools menu">
     29<!ENTITY vI_prefDialog.menuEntry.label "add entry for Settings-Dialog and Storage-Editor to Tools menu">
    1730<!ENTITY vI_prefDialog.warnNonvirtual.label "warn on any usage of non-virtual Identities">
    18 <!ENTITY vI_prefDialog.warnVirtual.label "warn on any usage of virtual Identities">
     31<!ENTITY vI_prefDialog.warnVirtual.label "warn on any usage of Virtual Identities">
     32
    1933<!ENTITY vI_prefDialog.vIdentityTab.header "Properties of Virtual Identities">
    2034<!ENTITY vI_prefDialog.vIdentityTab.valueTab.label "attributes to copy">
     
    2943<!ENTITY vI_prefDialog.HideSignature.warning.desc "note: to enable dynamic deactivation of signatures you have to install (and activate) the &apos;Signature Switch&apos; extension. By now this option is not available.">
    3044<!ENTITY vI_prefDialog.HideSignature.label "remove any &apos;Signatur&apos; while using a Virtual Identity">
    31 <!ENTITY vI_prefDialog.autoReplyToSelf.label "set Virtual Identity as Reply-To Address">
     45<!ENTITY vI_prefDialog.autoReplyToSelf.label "set Virtual Identity as Reply-To address">
    3246<!ENTITY vI_prefDialog.vIdentityTab.fccTab.caption "while sending a message with a Virtual Identity">
    3347<!ENTITY vI_prefDialog.vidFccAccount.label "Folder used by Account changed with Virtual Identity">
    3448<!ENTITY vI_prefDialog.vidFccDefault.label "Folder used by Default Account">
     49
    3550<!ENTITY vI_prefDialog.smartReplyTab.header "Smart Reply Settings">
    3651<!ENTITY vI_prefDialog.smartReplyTab.Tab1.label "1. get addresses">
    3752<!ENTITY vI_prefDialog.smartReplyTab.Tab2.label "2. filter addresses">
    38 <!ENTITY vI_prefDialog.smartReplyTab.Tab3.label "3. use addresses">
    3953<!ENTITY vI_prefDialog.smartReplyTab.caption "Virtual Identity Smart Reply">
    40 <!ENTITY vI_prefDialog.smartReplyTab3.caption "Virtual Identity Smart Reply / Storage">
    4154<!ENTITY vI_prefDialog.smartReplyTab.Tab1.desc "To find a Reply-Identity, Smart Reply has to get a list of possible sender identities. Therefore usually the header-fields &apos;To&apos; and &apos;Cc&apos; are analyzed. Here you can enter those and/or other header-fields. (additional options: to select header number n out of any headers with the same name add &apos;:n&apos;. If you add &apos;:@&apos; to any entry, only email-addresses are used, names are ignored.)">
    4255<!ENTITY vI_prefDialog.smartReply.headers.desc "additional headers  -  one per line, for instance &apos;x-original-to&apos; or &apos;x-original-to:@&apos; or &apos;x-original-to:2:@&apos;">
     
    4659<!ENTITY vI_prefDialog.smartReply.ignoreFullname.label "ignore full name while comparing email addresses with existing identities">
    4760<!ENTITY vI_prefDialog.smartReply.defaultFullname.label "if there is no name to any found email-address, use the following one:">
    48 <!ENTITY vI_prefDialog.smartReplyTab.Tab3.desc "At the end the filtered addresses are combined with the stored previous Virtual Identities (see storage configuration). Than they are added to the message-identity dropdown menu. You can also select, how they are might be used as the new senders identity.">
    49 <!ENTITY vI_prefDialog.smartReply.ask.label "open a dialog to choose Identity">
    50 <!ENTITY vI_prefDialog.smartReply.ask_always.label "ask also if there is only one possible address">
    51 <!ENTITY vI_prefDialog.smartReply.autocreate.label "use first found identity without interaction">
    52 <!ENTITY vI_prefDialog.smartReply.autocreate.desc "(if there is only one possible address)">
    53 <!ENTITY vI_prefDialog.storageTab.label "Storage">
    54 <!ENTITY vI_prefDialog.storageTab.header "Storing Virtual Identities">
    55 <!ENTITY vI_prefDialog.storageCap1.caption "Storing of Virtual Identities">
    56 <!ENTITY vI_prefDialog.storageCap2.caption "Reading of Virtual Identities">
    57 <!ENTITY vI_prefDialog.storageCap3.caption "Configure Reply-Identities">
    58 <!ENTITY vI_prefDialog.storageTab.Tab1.label "1. Common Configurations">
    59 <!ENTITY vI_prefDialog.storageTab.Tab2.label "2. Reply-Identities">
    60 <!ENTITY vI_prefDialog.storage.storedefault.label "save Virtual Identities while sending emails">
    61 <!ENTITY vI_prefDialog.storage.warn_update.label "ask before overwriting Virtual Identities in your Storage">
     61
     62<!ENTITY vI_prefDialog.storageTab.header "Identity Storage">
     63<!ENTITY vI_prefDialog.storageTab.Tab1.label "storage options">
     64<!ENTITY vI_prefDialog.storageCap1.caption "storing of Identities">
     65<!ENTITY vI_prefDialog.storageCap2.caption "reading of Identities">
     66<!ENTITY vI_prefDialog.storage.storedefault.label "save used Identities while sending emails">
     67<!ENTITY vI_prefDialog.storage.warn_update.label "ask before overwriting Identities in your Storage">
    6268<!ENTITY vI_prefDialog.storage.dont_update_multiple.label "never overwrite (and ask) if email has multiple recipients">
    6369<!ENTITY vI_prefDialog.storage.show_switch.label "show switch to activate/deactivate saving of Identities">
    64 <!ENTITY vI_prefDialog.storage.warn_vI_replace.label "ask before Virtual Identity in Sender-Field will be replaced">
     70<!ENTITY vI_prefDialog.storage.openEditor "edit stored data">
     71<!ENTITY vI_prefDialog.storage.warn_vI_replace.label "ask before Virtual Identity in sender-field will be replaced">
    6572<!ENTITY vI_prefDialog.storage.get_One_Only.label "ignore Storage after first Virtual Identity was retrieved">
    66 <!ENTITY vI_prefDialog.storage.reply.desc "If you answer any emails, the priority of stored Virtual Identities compared to ones retrieved with &apos;Smart Reply&apos; can configured here. Choosing in between the resulting Identities is done the same way as configured under &apos;Smart Reply&apos;.">
    67 <!ENTITY vI_prefDialog.storage.use_for_smart_reply.label "use stored Identities together with &apos;Smart-Reply&apos;">
    68 <!ENTITY vI_prefDialog.storage.prefer_smart_reply.label "prefer &apos;Smart Reply&apos;-Identities">
    69 <!ENTITY vI_prefDialog.storage.ignore_smart_reply.label "ignore &apos;Smart Reply&apos;-Identities if Virtual Identities were found stored">
     73
     74<!ENTITY vI_prefDialog.storageTab.Tab2.label "additional options">
     75<!ENTITY vI_prefDialog.storageCap3.caption "store (and recall) the following settings">
     76<!ENTITY vI_prefDialog.storage.returnReciept.label "return reciept status">
     77<!ENTITY vI_prefDialog.storage.characterEncoding.label "selected character encoding">
     78<!ENTITY vI_prefDialog.storage.messageFormat.label "selected message format">
     79
     80<!ENTITY vI_prefDialog.storage.sMime.label "S/MIME">
     81<!ENTITY vI_prefDialog.storage.sMime.messageEncryption.label "encryption status">
     82<!ENTITY vI_prefDialog.storage.sMime.messageSignature.label "signature usage">
     83<!ENTITY vI_prefDialog.storage.openPGP.label "OpenPGP">
     84<!ENTITY vI_prefDialog.storage.openPGP.messageEncryption.label "encryption status">
     85<!ENTITY vI_prefDialog.storage.openPGP.messageSignature.label "signature usage">
     86<!ENTITY vI_prefDialog.storage.openPGP.PGPMIME.label "PGP/MIME usage">
     87
     88<!ENTITY vI_prefDialog.idSelection.header "Identity Selection">
     89<!ENTITY vI_prefDialog.idSelection.Tab1.label "identity selection">
     90<!ENTITY vI_prefDialog.idSelection.Tab2.label "results handling">
     91
     92<!ENTITY vI_prefDialog.idSelection.Tab1.caption "Smart Reply and Storage">
     93<!ENTITY vI_prefDialog.idSelection.Tab1.caption2 "Smart Draft and Storage">
     94<!ENTITY vI_prefDialog.idSelection.Tab2.caption "Handling of the Results">
     95
     96<!ENTITY vI_prefDialog.idSelection.reply.desc "If you answer any emails, the priority of stored Virtual Identities compared to ones retrieved with &apos;Smart Reply&apos; can configured here.">
     97<!ENTITY vI_prefDialog.idSelection.use_for_smart_reply.label "use stored Identities together with &apos;Smart-Reply&apos;">
     98<!ENTITY vI_prefDialog.idSelection.prefer_smart_reply.label "prefer &apos;Smart Reply&apos;-Identities">
     99<!ENTITY vI_prefDialog.idSelection.ignore_smart_reply.label "ignore &apos;Smart Reply&apos;-Identities if Identities for recipients found stored">
     100
     101<!ENTITY vI_prefDialog.idSelection.draft.desc "If you edit a Draft (or a Template) there is nothing to configure. If the extension is able to read the header of the stored email, a related Virtual Identity is created. There is no information about SMTP or any other specific settings in the Draft/Template. This information is, if possible, retrieved from the Virtual Identity Storage.">
     102
     103<!ENTITY vI_prefDialog.idSelection.multiselect.desc "The results of the search in the Virtual Identity Storage and the Smart Reply or Smart Draft header analysis are added to the message-identity dropdown menu. You can also select, how they are might be used as the new senders identity.">
     104<!ENTITY vI_prefDialog.idSelection.ask.label "open a dialog to choose Identity">
     105<!ENTITY vI_prefDialog.idSelection.ask_always.label "ask also if there is only one possible address">
     106<!ENTITY vI_prefDialog.idSelection.autocreate.label "use first found identity without interaction">
     107<!ENTITY vI_prefDialog.idSelection.autocreate.desc "(if there is only one possible address)">
     108
    70109<!ENTITY vI_prefDialog.notificationTab.header "Status Messages">
    71110<!ENTITY vI_prefDialog.notificationTab.caption "Notifications">
     
    76115<!ENTITY vI_prefDialog.notifyTime.postfix.label "seconds">
    77116<!ENTITY vI_prefDialog.notificationTab.Debug.caption "Debugging">
    78 <!ENTITY vI_prefDialog.notifyDebug.desc "To find bugs, solve configuration problems and understand what Virtual Identity is doing, especially with the SmartReply-filters, you can enable some additional informations. Using this option slows down your mail-client, therefore it shouldn&apos;t be activated permanently.">
     117<!ENTITY vI_prefDialog.notifyDebug.desc "To find bugs, solve configuration problems and understand what Virtual Identity is doing, especially with the Smart Reply-filters, you can enable some additional informations. Using this option slows down your mail-client, therefore it shouldn&apos;t be activated permanently.">
    79118<!ENTITY vI_prefDialog.notifyDebug.label "show area with debug-informations">
Note: See TracChangeset for help on using the changeset viewer.