rpms/esc/devel esc-1.0.0-strings-fix.patch, NONE, 1.1 esc.spec, 1.12, 1.13

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Aug 31 04:15:08 UTC 2006


Author: jmagne

Update of /cvs/dist/rpms/esc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22754/devel

Modified Files:
	esc.spec 
Added Files:
	esc-1.0.0-strings-fix.patch 
Log Message:
auto-import esc-1.0.0-9 on branch devel from esc-1.0.0-9.src.rpm

esc-1.0.0-strings-fix.patch:
 app/xpcom/rhCoolKey.cpp                        |    2 
 app/xul/esc/application.ini                    |    2 
 app/xul/esc/chrome/content/esc/ESC.js          |   17 +-
 app/xul/esc/chrome/content/esc/esc.xul         |    6 
 app/xul/esc/chrome/content/esc/settings.xul    |    8 -
 app/xul/esc/chrome/locale/en-US/esc.dtd        |   74 ++++-------
 app/xul/esc/chrome/locale/en-US/esc.properties |  166 ++++++++++++-------------
 lib/NssHttpClient/manifest.mn                  |    2 
 lib/coolkey/manifest.mn                        |    2 
 9 files changed, 135 insertions(+), 144 deletions(-)

--- NEW FILE esc-1.0.0-strings-fix.patch ---
--- ./esc/src/lib/coolkey/manifest.mn.fix8	2006-08-30 20:18:34.177950000 -0700
+++ ./esc/src/lib/coolkey/manifest.mn	2006-08-30 20:18:41.529929000 -0700
@@ -21,7 +21,9 @@
 MODULE		= ckymanager
 LIBRARY_NAME	= $(MODULE)
 REQUIRES	= httpchunked nss nspr ckyapplet 
+ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
+endif
 DEFINES		+= -I$(CORE_DEPTH)/esc/app/xpcom -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/PCSC  -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
 MAPFILE 	= $(OBJDIR)/ckymanager.def
 
--- ./esc/src/lib/NssHttpClient/manifest.mn.fix8	2006-08-30 20:19:28.305789000 -0700
+++ ./esc/src/lib/NssHttpClient/manifest.mn	2006-08-30 20:19:36.075765000 -0700
@@ -22,7 +22,9 @@
 LIBRARY_NAME	= $(MODULE)
 SHARED_NAME	= $(MODULE)
 REQUIRES	= nss nspr 
+ifndef MOZ_OFFSET
 MOZ_OFFSET	= mozilla-1.7.13
+endif
 MAPFILE		= $(OBJDIR)/httpchunked.def
 DEFINES		= -I$(SYS_INC)/nspr4 -I$(SYS_INC)/nss3 -I$(SYS_INC)/$(MOZ_OFFSET)/nspr -I$(SYS_INC)/$(MOZ_OFFSET)/nss
 
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix8	2006-08-30 20:11:35.004211000 -0700
+++ ./esc/src/app/xpcom/rhCoolKey.cpp	2006-08-30 20:11:50.841160000 -0700
@@ -1316,7 +1316,7 @@
 {
     PR_LOG( coolKeyLog, PR_LOG_DEBUG, ("rhCoolKey::GetCoolKeyVersion \n"));
 
-    char *version = "1.0.0-8";
+    char *version = "1.0.0-9";
     
     char *versionVal =  (char *) nsMemory::Clone(version,sizeof(char) * strlen(version) +  1);
 
--- ./esc/src/app/xul/esc/chrome/content/esc/ESC.js.fix8	2006-08-30 20:14:09.218746000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/ESC.js	2006-08-30 20:14:14.800729000 -0700
@@ -797,6 +797,8 @@
 
     var dump = "";
 
+    dump += "<p><br>" + getBundleString("diagnosticsMessage") + "<br></p>";
+
     dump += "<p><br><b>" +  getBundleString("coolkeyComponentVersion") + "</b>" ;
     dump += " " + coolkeyVersion ;
 
@@ -1835,11 +1837,6 @@
   // We do want notify events though
   var doPreserveNotify = true;
  
-  if(!TrayLoadedOK())
-  {
-      MyAlert(getBundleString("errorTrayComponent"));
-  }
-
   TrayRemoveWindow(doPreserveNotify);
 }
 
@@ -1989,7 +1986,7 @@
        //Launch admin page if factory mode is enabled
        // or we are without the tray icon.
 
-       if(gFactoryMode  || !TrayLoadedOK())
+       if(gFactoryMode)
        { 
 
            if(adminWnd)    // Handle case where admin page is already up
@@ -2375,7 +2372,7 @@
          EnableItem(enrollbtn);
          DisableItem(resetpinbtn);
          if(!isBusy)
-           detailsKeyLabel.setAttribute("value","Uninitialized Key");
+           detailsKeyLabel.setAttribute("value",getBundleString("uninitializedKey"));
 
          EnableItem(formatbtn);
 
@@ -3164,7 +3161,7 @@
 
   StopCylonAnimation("cylon1", "eye1");
   SetOperationText("");
-  MyAlert(getBundleString("enrollmentFor") + " Key  "  + getBundleString("wasSuccessful"));
+  MyAlert(getBundleString("enrollmentFor") + " "  + getBundleString("smartCard") + " " + getBundleString("wasSuccessful"));
 
 
   if(gEnrollmentPage)
@@ -3215,7 +3212,7 @@
 
   StopCylonAnimation("cylon1", "eye1");
   SetOperationText("");
-  MyAlert(getBundleString("formatOf") + " Key  "    + getBundleString("wasSuccessful"));
+  MyAlert(getBundleString("formatOf") + " " + getBundleString("smartCard") + " "  + getBundleString("wasSuccessful"));
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
 
    if(gAdminPage)
@@ -4190,7 +4187,7 @@
 function MyAlert(message)
 {
     if(message)
-        DoMyAlert(message,"Red Hat Enterprise Security Client"); 
+        DoMyAlert(message,getBundleString("escTitle")); 
 }
 
 function DoMyAlert(message,title)
--- ./esc/src/app/xul/esc/chrome/content/esc/settings.xul.fix8	2006-08-30 20:14:51.172619000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/settings.xul	2006-08-30 20:14:59.479595000 -0700
@@ -74,10 +74,10 @@
                       </listcols>
                       <listhead>
                           <listheader />
-                          <listheader label="Issuer"/>
-                          <listheader label="Issued To"/>
-                          <listheader label="Status"/>
-                          <listheader label=""/>
+                          <listheader label="&keyIssuer;"/>
+                          <listheader label="&keyIssuedTo;"/>
+                          <listheader label="&keyStatus;"/>
+                          <listheader label="&keyProgress;"/>
                       </listhead>
                   </listbox>
              </groupbox>
--- ./esc/src/app/xul/esc/chrome/content/esc/esc.xul.fix8	2006-08-30 20:15:22.110527000 -0700
+++ ./esc/src/app/xul/esc/chrome/content/esc/esc.xul	2006-08-30 20:15:29.786502000 -0700
@@ -96,17 +96,17 @@
                           </columns>
                           <rows>
                               <row>
-                                  <label value = "Issuer" />
+                                  <label value = "&keyIssuer;" />
                                   <spacer flex ="1"/>
                                   <label id="issuer-id" value ="&unknownIssuer;" />
                               </row>
                               <row>
-                                  <label value = "Status"/>
+                                  <label value = "&keyStatus;"/>
                                   <spacer flex = "1"/>
                                   <label id="status-id" value ="&unknown;"/>
                               </row>
                               <row>
-                                  <label value = "Issued"/>
+                                  <label value = "&keyIssuedTo;"/>
                                   <spacer flex = "1"/>
                                   <label id="issued-to-id" value ="&unknown;"/>
                              </row>
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd.fix8	2006-08-30 20:16:41.346289000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.dtd	2006-08-30 20:16:47.579273000 -0700
@@ -15,12 +15,16 @@
  * All rights reserved.
  ***** END COPYRIGHT BLOCK ***** -->
 
-<!ENTITY escTitle "Red Hat Enterprise Security Client">
-<!ENTITY settingsTitle "Red Hat Enterprise Security Client Settings">
-<!ENTITY configTitle "TPS Configuration Information">
+<!ENTITY escCompany "Red Hat">
+<!ENTITY smartCardManager  "smart card manager">
+<!ENTITY smartCardManagerU "Smart Card Manager">
+<!ENTITY smartCard "smart card">
+<!ENTITY smartCardU "Smart Card">
+<!ENTITY escTitle "Smart Card Manager">
+<!ENTITY configTitle "Phone Home Configuration Information">
 <!ENTITY certInfoTitle "ESC Key Info">
-<!ENTITY advancedInfoTitle "ESC Diagnostics Information">
-<!ENTITY genericAuthTitle "ESC Authentication">
+<!ENTITY advancedInfoTitle "Diagnostics Information">
+<!ENTITY genericAuthTitle "Authentication">
 <!ENTITY progressHeader "Progress">
 <!ENTITY unknownIssuer "Unknown Issuer">
 <!ENTITY unknown "Unknown">
@@ -29,23 +33,12 @@
 <!ENTITY doCancel "Cancel">
 <!ENTITY doResetPin "Reset Pin">
 <!ENTITY doFormat "Format"> 
-<!ENTITY doShowKeyInfo "Show KeyInfo">
-<!ENTITY keyInfo "Key Info">
-<!ENTITY keyPassword "Key Password">
-<!ENTITY navigationMenu "Navigation">
-<!ENTITY operationsMenu "Operations">
-<!ENTITY settingsMenuItem "Settings">
-<!ENTITY enrollmentMenuItem "Enrollment">
-<!ENTITY configMenuItem "Configuration">
-<!ENTITY keysCaption "Keys">
-<!ENTITY keyOperationsCaption "Key Operations">
-<!ENTITY chooseKeyOperation "Choose Key Operation">
-<!ENTITY keyIssuer "Key Issuer">
-<!ENTITY keyIssuedTo "Key Issued To">
-<!ENTITY keyStatus "Key Status">
-<!ENTITY keyProgress "Key Progress">
-<!ENTITY noKeysPresent "NO KEYS PRESENT">
-<!ENTITY keyInformation "Key Information">
+<!ENTITY keyPassword "Password">
+<!ENTITY keyIssuer "Issuer">
+<!ENTITY keyIssuedTo "Issued To">
+<!ENTITY keyStatus "Status">
+<!ENTITY keyProgress "Progress">
+<!ENTITY noKeysPresent "No Cards Present">
 <!ENTITY enterKeyPin "Enter Key Pin">
 <!ENTITY reEnterKeyPin "Re Enter Key Pin">
 <!ENTITY editConfigValues "Edit Configuration Values">
@@ -53,16 +46,15 @@
 <!ENTITY escEnrollURIHeader "ESC ENROLL URI:">
 <!ENTITY updateValues "Update Values">
 <!ENTITY doTest "Test URL">
-<!ENTITY escTitle "Red Hat Enterprise Security Client">
-<!ENTITY pleaseEnroll "Security Key Enrollment">
-<!ENTITY unenrolledDetected "Unenrolled Key Detected">
-<!ENTITY noKeyDetected "No Key Detected">
-<!ENTITY enrollMessage "To begin this enrollment process, you will need to choose a password to protect the key. You will need to enter this password each time you use your new key.  You will also need to enter the security information below needed by ESC to complete your enrollment.">
-<!ENTITY detectedMessage "ESC has detected that you have entered a new and un-enrolled key.  Before you can use this key, you have to enroll it.  Enrolling your key personalizes it so only you can make use of it.">
-<!ENTITY readyToProceed "When you are ready to begin the process,click  Enroll My Key Now.">
-<!ENTITY noKey "Unable to detect your security token.">
-<!ENTITY insertKey "To enroll your key, please insert your security token card or USB key now.">
-<!ENTITY adminNoKeysMessage "In order to administer your security keys, you must have one  or more keys connected to the computer. Please do so now.">
+<!ENTITY pleaseEnroll "Smartcard Enrollment">
+<!ENTITY unenrolledDetected "Unenrolled Smartcard Detected">
+<!ENTITY noKeyDetected "No Smartcard Detected">
+<!ENTITY enrollMessage "To begin the smartcard enrollment process, you will need to choose a password to protect the smartcard. You will need to enter this password each time you use your new smartcard.  You will also need to enter the security information below needed by Smartcard Manager to complete your enrollment.">
+<!ENTITY detectedMessage "Smartcard Manager has detected that you have entered a new and un-enrolled smartcard.  Before you can use this smartcard, you have to enroll it.  Enrolling your smartcard personalizes it so only you can use it for secure operations.">
+<!ENTITY readyToProceed "When you are ready to begin the process,click  Enroll My Smartcard Now.">
+<!ENTITY noKey "Unable to detect your smartcard.">
+<!ENTITY insertKey "To enroll your smartcard, please insert your security card or USB key now.">
+<!ENTITY adminNoKeysMessage "In order to administer your security smartcards, you must have one  or more cards connected to the computer. Please do so now.">
 <!ENTITY progressHeader "Progress">
 <!ENTITY detectedKeyDetailsHeader "Security Information">
 <!ENTITY keyEnrollmentHeader "Create Password">
@@ -71,22 +63,18 @@
 <!ENTITY unknown "Unknown">
 <!ENTITY pleaseEnterPassword "Enter new password:">
 <!ENTITY pleaseReEnterPassword "Re-enter password:">
-<!ENTITY cancel "Cancel">
 <!ENTITY closeEnrollLater "Close, I'll Enroll Later">
 <!ENTITY closeAdminLater "Close">
 <!ENTITY closeNow "Close">
-<!ENTITY enrollKeyNow "Enroll My Key Now">
-<!ENTITY enrollKey "Enroll Key">
-<!ENTITY administerKeys "Manage Keys">
-<!ENTITY administerMessage "Here you can perform various operations upon your key(s). Formatting a key involves preparing a key with the proper information needed to perform future user key enrollments.">
+<!ENTITY enrollKeyNow "Enroll My Smartcard Now">
+<!ENTITY enrollKey "Enroll Smartcard">
+<!ENTITY administerKeys "Manage Smartcards">
+<!ENTITY administerMessage "Here you can perform various operations upon your smartcard(s). For instance, Formatting a card results in preparing a card for future  enrollment.">
 <!ENTITY blankKeyLabel "Blank Key">
-<!ENTITY adminDetailsMessage "This key is not personalized.">
+<!ENTITY adminDetailsMessage "This smartcard is not personalized.">
 <!ENTITY advancedInfo "Diagnostics">
-<!ENTITY doEnroll "Enroll Key">
-<!ENTITY doResetPin "Set/Change Password">
-<!ENTITY doFormat "Format Key">
 <!ENTITY doViewCerts "View Certificates">
-<!ENTITY getESCPassword "ESC Password Information">
+<!ENTITY getESCPassword "Password Information">
 <!ENTITY escOK "OK">
 <!ENTITY escCancel "Cancel">
-<!ENTITY tpsConfigDesc "ESC has detected a totally blank key for which it knows nothing about.  ESC can not determine the location of the TPS information for this key. Please enter the correct value so ESC can contact the TPS. The correct value is of the form: http(s)://test.host.com:7888/home.cgi.">
+<!ENTITY tpsConfigDesc "Smartcard Manager has detected a totally blank smartcard.  Smartcard Manager can not determine the location of the Smartcard Server for this card. Please enter the correct URL value so the Smartcard Server can be reached. The value should be of the form: http(s)://test.host.com:7888/home.cgi.">
--- ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties.fix8	2006-08-30 20:17:19.147177000 -0700
+++ ./esc/src/app/xul/esc/chrome/locale/en-US/esc.properties	2006-08-30 20:17:27.326152000 -0700
@@ -16,10 +16,13 @@
 
 #ESC strings used in Javascript
 #Strings for ESC.js 
-escTitle=Red Hat Enterprise Security Client
-enrolledKey=Enrolled Key
-noKeysPresent=No Keys Present
-blankKey=Blank Key
+escTitle=Smart Card Manager
+smartCard=smartcard
+smartCardU=Smartcard
+enrolledKey=Enrolled
+noKeysPresent=No Cards Present
+blankKey=Blank
+uninitializedKey=Uninitialized
 statusEnrolled=ENROLLED
 statusUnavailable=UNAVAILABLE
 statusNoApplet=NO APPLET
@@ -27,70 +30,70 @@
 statusUnknown=UNKNOWN
 statusBusy=BUSY
 unknownIssuer=Unknown Issuer
-redHatUser=Red Hat User
+redHatUser=User
 statusUnknown=Unknown
-tokenInformation=TOKEN INFORMATION
+tokenInformation=CARD INFORMATION
 advancedInformation=Diagnostics Information
 keyID=Key ID
-tpsURI=TPS Server URL
-tpsUI=TPS External UI URL
+tpsURI=Server URL
+tpsUI=External UI URL
 status=Status
 issuer=Issuer
-escLogEntries=ESC Log Entries
+escLogEntries=Log Entries
 noLogFileOrData=No Log File or Log File Has No Data.
 certsOnToken=CERTIFICATES on KEY 
 certificateNickname=Certificate Nickname:
-coolkeyComponentVersion=ESC Version
-coolkeyDetectedNumberKeys=Number of Security Keys Detected
-enrolledDetected=Enrolled Key Detected
-enrolledDetectedMessage=ESC has detected an enrolled key. If you would rather not re-enroll this key press "Close".  
-formatingToken=Formatting Key 
-enrollingToken=Enrolling Key 
-resettingTokenPIN=Resetting Key Pin 
-cancellingOperation=Cancelling 
-blinkingToken=Blinking 
-keyInserted=Key Inserted!
-keyRemoved=Key Removed!
-keyInsertedComputer=Security Key Inserted into the computer.
-keyRemovedComputer=Security Key Removed from the computer.
+coolkeyComponentVersion=Smartcard Manager Version
+coolkeyDetectedNumberKeys=Number of Security Smartcards Detected
+enrolledDetected=Enrolled Smartcard Detected
+enrolledDetectedMessage=Smartcard Manager has detected an enrolled card. If you would rather not re-enroll this card press "Close".  
+formatingToken=Formatting... 
+enrollingToken=Enrolling... 
+resettingTokenPIN=Resetting Password... 
+cancellingOperation=Cancelling... 
+blinkingToken=Blinking... 
+keyInserted=Smartcard Inserted!
+keyRemoved=Smartcard Removed!
+keyInsertedComputer=Security Smartcard Inserted into the computer.
+keyRemovedComputer=Security Smartcard Removed from the computer.
+diagnosticsMessage=The information below is diagnostic information that your system generates as you use your smartcard. If you are having smartcard problems, you may be asked by your support engineer to send this information for analysis.
 #ESC Error Messages from TPS
 errorNone=Operation Completed Successfully.
-serverError=Server Error.
-errorProblemResetTokenPin=Problem resetting token's pin.
-errorTokenEnrollment=Token Enrollment Error.
-errorCommCA=Error communicating with the Certificate Authority, try again later.
-errorInternalServer=Internal Server Error.
-errorResetPin=Error resetting the token's pin.
-errorInternalServer=Internal Server Error.
-errorAuthFailure=Authentication Failure, Try Again.
-errorTokenDisabled=Token is disabled, contact technical support.
-errorProblemCommToken=Problem communicating with the token.
-errorTokenUpgrade=Cannot upgrade token software.
-errorInvalidTokenType=Invalid token type.
-errorCannotPublish=Cannot publish.
-errorCommTokenDB=Cannot communicate with token database, try again later.
-errorTokenDisabled=Token is disabled, contact techincal support.
-errorPinReset=Cannot reset pin value for the token, contact technical support.
-errorConnLost=Connection to server lost. If problem persists, contact technical support. 
-errorEntryTokenDB=Can not create entry for token in database, contact technical support.
-errorNoTokenState=No such token state, contact technical support.
-errorInvalidLostTokenReason=Invalid lost token reason, contact technical support.
-errorTokenUnusable=Token unusable due to compromise,contact technical support.
-errorNoInactiveToken=No such inactive token, contact technical support.
-errorProcessMultiTokens=Can not process more than one active token.
-errorKeyRecoveryProcessed=Key Recovery has been processed.
-errorKeyRecoveryFailed=Key Recovery failed, contact technical support.
-errorNoOperateLostToken=Can not operate on token reported lost, contact technical support.
-errorKeyArchival=Key archival error, contact technical support.
-errorConnTKS=Problem connecting to the TKS, contact technical support.
-errorFailUpdateTokenDB=Failed to update token database, contact technical support.
-errorCertRevocation=Internal certificate revocation error,contact technical support.
-errorNotOwnToken=User does not own this token, contact technical support.
-errorESCMisconfigured=ESC has been misconfigured, reconfigure and try again.
-errorESCNoCommCardReader=ESC can't communicate with card reader.
-errorESCNoTokenSession=ESC can't initiate session with token.
-errorESCNoTalkTPS=ESC can't talk to TPS.
-errorESCNoTalkTokenReader=ESC can't talk to token reader.
+serverError=Smartcard Server error.
+errorProblemResetTokenPin=Problem resetting smartcard's pin.
+errorTokenEnrollment=Smartcard enrollment error.
+errorCommCA=Error communicating with the Certification Authority.
+errorInternalServer=Internal Smartcard Server error.
+errorResetPin=Error resetting the smartcard's password.
+errorInternalServer=Internal Smartcard server error.
+errorAuthFailure=Smartcard Server authentication failure.
+errorTokenDisabled=Your smartcard is listed as disabled.
+errorProblemCommToken=Problem communicating with the smartcard.
+errorTokenUpgrade=Cannot upgrade smartcard software.
+errorInvalidTokenType=Invalid smartcard type.
+errorCannotPublish=Cannot publish smartcard information.
+errorCommTokenDB=Cannot communicate with smartcard database.
+errorPinReset=Cannot reset the password value for the smartcard.
+errorConnLost=Connection to Smartcard Server.
+errorEntryTokenDB=Can not create entry for smartcard in smartcard database.
+errorNoTokenState=Smartcard found to be in an inconsistent state.
+errorInvalidLostTokenReason=Invalid reason for lost smartcard submitted.
+errorTokenUnusable=Smartcard found to be unusable due to compromise.
+errorNoInactiveToken=No such inactive smartcard found.
+errorProcessMultiTokens=Can not process more than one active smartcard.
+errorKeyRecoveryProcessed=Smartcard key recovery has been processed.
+errorKeyRecoveryFailed=Smartcard key recovery failed.
+errorNoOperateLostToken=Cannot process this smartcard, which has been reported lost.
+errorKeyArchival=Smartcard key archival error.
+errorConnTKS=Problem connecting to the Smartcard TKS Server.
+errorFailUpdateTokenDB=Failed to update smartcard database.
+errorCertRevocation=Internal certificate revocation error discovered.
+errorNotOwnToken=User does not own this smartcard.
+errorESCMisconfigured=Smartcard Manager has been misconfigured.
+errorESCNoCommCardReader=Smartcard Manager can't communicate with card reader.
+errorESCNoTokenSession=Smartcard Manager can't initiate session with smartcard.
+errorESCNoTalkTPS=Smartcard Manager can't talk to Smartcard Server.
+errorESCNoTalkTokenReader=Smartcard Manager can't talk to smartcard reader.
 #ESC text in general  Alert messages
 errorCoolKeyIsAuth=coolkey.GetCoolKeyIsAuthenticated() failed!
 errorAuthCoolKey=coolkey.AuthenticateCoolKey failed!
@@ -101,19 +104,19 @@
 errorSetConfigValue=Error SettingConfig Value: 
 errorBlankTPSURI=Blank Tps Uri submitted.
 noTpsConfigUrl=You must provide a Url to test!
-aboutToTestTPSURI=About to test TPS URI:
-errorSelectKey=Please select a key.
-tpsURLContacted=TPS URL has been successfully contacted.
-errorContactTPSURL=Error contacting TPS URL, reconfigure and try again.
+aboutToTestTPSURI=About to test Smartcard Server URI:
+errorSelectKey=Please select a Smartcard.
+tpsURLContacted=Smartcard Server URL has been successfully contacted.
+errorContactTPSURL=Error contacting Smartcard Server URL, reconfigure and try again.
 errorBlankEnrollURI=Blank Enroll Uri submitted.
 aboutToTestEnrollURI=About to test Enroll URI:
-enrollURLContacted=ESC Enrollment URL has been successfully contacted.
-errorContactEnrollURL=Error contacting ESC Enroll URL, reconfigure and try again.
-tpsConfigSuccess=TPS config information successfully obtained!
-tpsConfigError=Error obtaining TPS config information!
-tpsConfigTest=About to test the TSP Phone Home Url :
-tpsNoConfigUrl=Provide a valid TPS config URL!
-tpsURIMustHaveValue=TPS URI item must have a value!
+enrollURLContacted=x Enrollment URL has been successfully contacted.
+errorContactEnrollURL=Error contacting  Enroll URL, reconfigure and try again.
+tpsConfigSuccess=Smartcard Server config information successfully obtained!
+tpsConfigError=Error obtaining Smartcard Server config information!
+tpsConfigTest=About to test the Smartcard Server Phone Home Url :
+tpsNoConfigUrl=Provide a valid Smartcard Server config URL!
+tpsURIMustHaveValue=Smartcard Server URL item must have a value!
 errorSetConfigValue=Error setting config value!:
 configChangesSubmitted=Configuration changes submitted.
 errorSetDataValue=Error Setting data values:
@@ -127,34 +130,33 @@
 errorGetAvailCoolKeys=coolkey.GetAvailableCoolKeys() failed!
 errorEnollCoolKey=coolkey.EnrollCoolKey() failed!
 errorCoolKeyIsEnrolled=coolkey.GetCoolKeyIsEnrolled failed!
-errorResetCoolKeyPIN=coolkey.ResestCoolKeyPIN() failed! Make sure Key is properly Enrolled.
+errorResetCoolKeyPIN=coolkey.ResestCoolKeyPIN() failed! Make sure Smartcard is properly Enrolled.
 errorFormatCoolKey=coolkey.FormatCoolKey() failed!
 errorCancelCoolKey=coolkeyCancelCoolKeyOperation() failed!
 errorBlinkCoolKey=coolkey.BlinkCoolKey() failes!
-noCurrentlySelectedToken=No currently selected Key!
+noCurrentlySelectedToken=No currently selected smartcard!
 errorProvideScreenName=You must provide a valid screen name!
 errorProvideTokenPIN=You must provide a valid TokenPIN!
 errorMatchPinValues=The PIN values you entered don't match!
 errorValidUserPassword=You must provide a valid User Password!
-errorSelectKey=Please select a key.
-errorEnrolledFirst=Key must be enrolled first! Enroll key and try again.
+errorSelectKey=Please select a smartcard.
+errorEnrolledFirst=Smartcard must be enrolled first! Enroll card and try again.
 enrollmentFor=Enrollment for
 wasSuccessful=was successful.
-pinResetSuccessful=PIN Reset was successfull!
+pinResetSuccessful=Password Reset was successfull!
 formatOf=Format of
 error=Error
 serverResponse= \n\n Server Response: 
-enrollmentOfKey=Enrollment of key
-formatingOfKey=Formatting of key
-pinResetOfKey=PIN Reset for key
-operationForKey=Operation for key
+enrollmentOfKey=Enrollment of smartcard 
+formatingOfKey=Formatting of smartcard
+pinResetOfKey=PIN Reset for smartcard 
+operationForKey=Operation for smartcard 
 failed=failed. 
 cancelled=cancelled.
-errorFindESCPlatform=Unable to determine ESC platform.
+errorFindESCPlatform=Unable to determine Smartcard Manager platform.
 errorIssuerInfo=Error obtaining Issuer Info for key.
-#Strings for TRAY.js
-errorTrayComponent=ESC can not be operated with its Icon in the notification area. \n Please insert a Security Key to bring ESC to life.
-errorTrayIsInitialized=Can't get if Tray is already intialized!
+#Strings for TRAY.j
+errorTrayIsInitialized=Can't determine if Icon component is already intialized!
 errorShowAllWindows=Error Showing All Windows:
 errorHideAllWindows=Error Hiding all Windows:
 errorShowWindow=Error Showing Window:
--- ./esc/src/app/xul/esc/application.ini.fix8	2006-08-30 20:12:28.666045000 -0700
+++ ./esc/src/app/xul/esc/application.ini	2006-08-30 20:12:40.277012000 -0700
@@ -29,7 +29,7 @@
 ;
 ; This field specifies your application's build ID (timestamp).  This field is
 ; required.
-BuildID=0000000008
+BuildID=0000000009
 ;
 ; This ID is just an example.  Every XUL app ought to have it's own unique ID.
 ; You can use the microsoft "guidgen" or "uuidgen" tools, or go on


Index: esc.spec
===================================================================
RCS file: /cvs/dist/rpms/esc/devel/esc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- esc.spec	30 Aug 2006 03:43:44 -0000	1.12
+++ esc.spec	31 Aug 2006 04:15:03 -0000	1.13
@@ -1,6 +1,6 @@
 Name: esc 
 Version: 1.0.0
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 Summary: Enterprise Security Client Smart Card Client
 License: GPL
 URL: http://directory.fedora.redhat.com/wiki/CoolKey 
@@ -15,6 +15,7 @@
 Patch5: esc-1.0.0-xul-sys-nss-nspr.patch
 Patch6: esc-1.0.0-ui-enhance.patch
 Patch7: esc-1.0.0-notify-icon-fixes.patch
+Patch8: esc-1.0.0-strings-fix.patch
 
 BuildRequires: doxygen fontconfig-devel freetype-devel >= 2.1
 BuildRequires: glib2-devel libIDL-devel atk-devel gtk2-devel libjpeg-devel
@@ -68,6 +69,7 @@
 %patch5 -p1 -b .fix5
 %patch6 -p1 -b .fix6
 %patch7 -p1 -b .fix7
+%patch8 -p1 -b .fix8
 
 #Unpack xulrunner where esc expects it to be.
 
@@ -175,6 +177,9 @@
 fi
 
 %changelog
+* Wed Aug 30 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-9
+- Revision of the strings used in ESC.
+
 * Sat Aug 27 2006 Jack Magne <jmagne at redhat.com>-  1.0.0-8
 - Fixes to get libnotify working properly on FC6 systems.
 




More information about the fedora-cvs-commits mailing list