--- a/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rls	Tue Aug 31 17:00:08 2010 +0300
+++ b/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rls	Wed Sep 01 12:40:57 2010 +0100
@@ -23,9 +23,7 @@
 // Usage
 rls_string STRING_r_keytool_usage "Usage: keytool \t[{-list -l} {-liststores -ls} {-import -i} {-remove -r} "
 rls_string STRING_r_keytool_usage2 "\t\t {-page -p } {-help -h} {-setuser -s} {-setallusers -a} {-removeuser -ru} {-setmanager -m}] {KeyLabel}"
-#ifdef SYMBIAN_AUTH_SERVER
-rls_string STRING_r_keytool_usage5 "\t\t or [ {-migratestore} old key file name ]"
-#endif // SYMBIAN_AUTH_SERVER
+
 rls_string STRING_r_keytool_usage3 "Type keytool -h {CommandName} for details on a particular command."
 
 rls_string STRING_r_keytool_usage4 "Type keytool -h noninteractive for details on how to run the commands in noninteractive mode."
@@ -61,20 +59,6 @@
 rls_string STRING_r_keytool_usage_keyaccess "-access  Displays tool usage"
 rls_string STRING_r_keytool_usage_keyaccesses "Possible access restrictions are: Extractable, Sensitive."
 
-#ifdef SYMBIAN_AUTH_SERVER
-
-rls_string STRING_r_keytool_usage_migrate 	"-migrate OldKeyFile Passphrase [-new NewKeyFile] [-expr AuthExpression] [-freshness Freshness]."
-rls_string STRING_r_keytool_usage_migrate1 	"Migrates the old key file to the new format. If new key file name"
-rls_string STRING_r_keytool_usage_migrate2 	"is provided then it is saved using that name otherwise it is saved"
-rls_string STRING_r_keytool_usage_migrate3 	"as newkeys.dat in the system drive. Every key store in old implementation was encrypted" 
-rls_string STRING_r_keytool_usage_migrate4 	"with a passphrase, this should be supplied for successful porting."
-rls_string STRING_r_keytool_usage_migrate5 	"If authexpression is not provided it uses the system wide default plugin. "
-rls_string STRING_r_keytool_usage_migrate6 	"If freshness is not provided then it uses 0 as the default freshness which" 
-rls_string STRING_r_keytool_usage_migrate7 	"means always authenticate the user. The supplied auth expression and freshness "
-rls_string STRING_r_keytool_usage_migrate8 	"would be used to determine whether to use the current authenticated identity" 
-rls_string STRING_r_keytool_usage_migrate9 	"if available or to authenticate the user again."
-
-#endif // SYMBIAN_AUTH_SERVER
 
 // Errors
 rls_string STRING_r_keytool_err_command "Invalid Command."
@@ -119,8 +103,3 @@
 rls_string STRING_r_keytool_err_nousers "No users specified."
 rls_string STRING_r_keytool_err_nokey "No key specified."
 
-#ifdef SYMBIAN_AUTH_SERVER
-rls_string STRING_r_keytool_err_migrationfail "Key Migration Failed..."
-rls_string STRING_r_keytool_usage_oldkey_absent "Key file to be migrated not provided."
-rls_string STRING_r_keytool_usage_passphrase_absent "Passphrase absent."
-#endif // SYMBIAN_AUTH_SERVER