diff -r 675a964f4eb5 -r 35751d3474b7 cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rss
--- a/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rss	Tue Jul 21 01:04:32 2009 +0100
+++ b/cryptoservices/filebasedcertificateandkeystores/test/keytool/keytool.rss	Thu Sep 10 14:01:51 2009 +0300
@@ -1,670 +1,744 @@
-/*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-NAME KEYT
-
-#include <uikon.rh>
-#include "keytool.rls"
-#include "certtool.rls"
-
-RESOURCE RSS_SIGNATURE {}
-
-
-// Keytool General Strings
-
-RESOURCE TBUF r_keytool_shortName
-	{
-	buf = STRING_r_keytool_shortName;
-	}
-	
-RESOURCE TBUF r_keytool_name
-	{
-	buf = STRING_r_keytool_name;
-	}
-	
-RESOURCE TBUF r_keytool_copyright
-	{
-	buf = STRING_r_keytool_copyright;
-	}
-	
-RESOURCE TBUF r_keytool_done
-	{
-	buf = STRING_r_keytool_done;
-	}
-	
-
-// Keytool usage strings	
-
-RESOURCE TBUF r_keytool_usage
-	{
-	buf = STRING_r_keytool_usage;
-	}
-	
-RESOURCE TBUF r_keytool_usage2
-	{
-	buf = STRING_r_keytool_usage2;
-	}
-
-RESOURCE TBUF r_keytool_usage3
-	{
-	buf = STRING_r_keytool_usage3;
-	}	
-
-
-RESOURCE TBUF r_keytool_usage4
-	{
-	buf = STRING_r_keytool_usage4;
-	}	
-	
-RESOURCE TBUF r_keytool_usage_list
-	{
-	buf = STRING_r_keytool_usage_list;
-	}
-
-RESOURCE TBUF r_keytool_usage_list2
-	{
-	buf = STRING_r_keytool_usage_list2;
-	}
-
-RESOURCE TBUF r_keytool_usage_list3
-	{
-	buf = STRING_r_keytool_usage_list3;
-	}
-
-RESOURCE TBUF r_keytool_usage_list4
-	{
-	buf = STRING_r_keytool_usage_list4;
-	}
-
-RESOURCE TBUF r_keytool_usage_page
-	{
-	buf = STRING_r_keytool_usage_page;
-	}
-
-RESOURCE TBUF r_keytool_usage_page2
-	{
-	buf = STRING_r_keytool_usage_page2;
-	}
-
-RESOURCE TBUF r_keytool_usage_liststores
-	{
-	buf = STRING_r_keytool_usage_liststores;
-	}
-	
-RESOURCE TBUF r_keytool_usage_import
-	{
-	buf = STRING_r_keytool_usage_import;
-	}
-
-RESOURCE TBUF r_keytool_usage_import2
-	{
-	buf = STRING_r_keytool_usage_import2;
-	}
-
-RESOURCE TBUF r_keytool_usage_import3
-	{
-	buf = STRING_r_keytool_usage_import3;
-	}
-
-RESOURCE TBUF r_keytool_usage_import4
-	{
-	buf = STRING_r_keytool_usage_import4;
-	}
-
-RESOURCE TBUF r_keytool_usage_remove
-	{
-	buf = STRING_r_keytool_usage_remove;
-	}
-	
-RESOURCE TBUF r_keytool_usage_setuser
-	{
-	buf = STRING_r_keytool_usage_setuser;
-	}
-	
-RESOURCE TBUF r_keytool_usage_setallusers
-	{
-	buf = STRING_r_keytool_usage_setallusers;
-	}
-	
-RESOURCE TBUF r_keytool_usage_setmanager
-	{
-	buf = STRING_r_keytool_usage_setmanager;
-	}
-	
-RESOURCE TBUF r_keytool_usage_removeuser
-	{
-	buf = STRING_r_keytool_usage_removeuser;
-	}
-
-RESOURCE TBUF r_keytool_usage_help
-	{
-	buf = STRING_r_keytool_usage_help;
-	}
-	
-RESOURCE TBUF r_keytool_usage_keyusage
-	{
-	buf = STRING_r_keytool_usage_keyusage;
-	}
-	
-RESOURCE TBUF r_keytool_usage_keyusages
-	{
-	buf = STRING_r_keytool_usage_keyusages;
-	}
-	
-RESOURCE TBUF r_keytool_usage_keyaccess
-	{
-	buf = STRING_r_keytool_usage_keyaccess;
-	}
-	
-RESOURCE TBUF r_keytool_usage_keyaccesses
-	{
-	buf = STRING_r_keytool_usage_keyaccesses;
-	}
-
-RESOURCE TBUF r_keytool_usage_noninteractive
-	{
-	buf = STRING_r_keytool_usage_noninteractive;
-	}
-	
-RESOURCE TBUF r_keytool_usage_noninteractive1
-	{
-	buf = STRING_r_keytool_usage_noninteractive1;
-	}
-
-// Keytool error strings
-
-RESOURCE TBUF r_keytool_err_deletefail
-	{
-	buf = STRING_r_keytool_err_deletefail;
-	}
-	
-RESOURCE TBUF r_keytool_err_ruserfail
-	{
-	buf = STRING_r_keytool_err_ruserfail;
-	}
-	
-RESOURCE TBUF r_keytool_err_suserfail
-	{
-	buf = STRING_r_keytool_err_suserfail;
-	}
-	
-RESOURCE TBUF r_keytool_err_sallusersfail
-	{
-	buf = STRING_r_keytool_err_sallusersfail;
-	}
-
-RESOURCE TBUF r_keytool_err_smanagerfail
-	{
-	buf = STRING_r_keytool_err_smanagerfail;
-	}
-
-RESOURCE TBUF r_keytool_err_access
-	{
-	buf = STRING_r_keytool_err_access;
-	}
-	
-RESOURCE TBUF r_keytool_err_nousers
-	{
-	buf = STRING_r_keytool_err_nousers;
-	}
-	
-RESOURCE TBUF r_keytool_err_nokey
-	{
-	buf = STRING_r_keytool_err_nokey;
-	}
-	
-RESOURCE TBUF r_keytool_err_command
-	{
-	buf = STRING_r_keytool_err_command;
-	}
-	
-RESOURCE TBUF r_keytool_err_unknown
-	{
-	buf = STRING_r_keytool_err_unknown;
-	}
-
-RESOURCE TBUF r_keytool_err_notexist
-	{
-	buf = STRING_r_keytool_err_notexist;
-	}
-	
-RESOURCE TBUF r_keytool_err_notfound
-	{
-	buf = STRING_r_keytool_err_notfound;
-	}
-	
-RESOURCE TBUF r_keytool_err_keyfile
-	{
-	buf = STRING_r_keytool_err_keyfile;
-	}
-	
-RESOURCE TBUF r_keytool_err_empty
-	{
-	buf = STRING_r_keytool_err_empty;
-	}
-	
-// import
-
-RESOURCE TBUF r_keytool_err_import
-	{
-	buf = STRING_r_keytool_err_import;
-	}
-	
-RESOURCE TBUF r_keytool_err_corrupt
-	{
-	buf = STRING_r_keytool_err_corrupt;
-	}
-	
-RESOURCE TBUF r_keytool_err_corruptlong
-	{
-	buf = STRING_r_keytool_err_corruptlong;
-	}
-	
-RESOURCE TBUF r_keytool_err_openfail
-	{
-	buf = STRING_r_keytool_err_openfail;
-	}
-	
-RESOURCE TBUF r_keytool_err_emptyfile
-	{
-	buf = STRING_r_keytool_err_emptyfile;
-	}
-	
-RESOURCE TBUF r_keytool_err_dh
-	{
-	buf = STRING_r_keytool_err_dh;
-	}
-
-RESOURCE TBUF r_keytool_err_notsupported
-	{
-	buf = STRING_r_keytool_err_notsupported;
-	}
-	
-RESOURCE TBUF r_keytool_err_pkcs8
-	{
-	buf = STRING_r_keytool_err_pkcs8;
-	}
-	
-RESOURCE TBUF r_keytool_err_importsuccess
-	{
-	buf = STRING_r_keytool_err_importsuccess;
-	}
-	
-RESOURCE TBUF r_keytool_err_passphrase
-	{
-	buf = STRING_r_keytool_err_passphrase;
-	}
-	
-RESOURCE TBUF r_keytool_err_weak
-	{
-	buf = STRING_r_keytool_err_weak;
-	}
-	
-RESOURCE TBUF r_keytool_err_usage
-	{
-	buf = STRING_r_keytool_err_usage;
-	}
-	
-
-// List
-	
-RESOURCE TBUF r_keytool_err_list
-	{
-	buf = STRING_r_keytool_err_list;
-	}
-
-RESOURCE TBUF r_keytool_err_listfail
-	{
-	buf = STRING_r_keytool_err_listfail;
-	}
-	
-RESOURCE TBUF r_keytool_err_deletesuccess
-	{
-	buf = STRING_r_keytool_err_deletesuccess;
-	}
-
-RESOURCE TBUF r_keytool_err_rusersuccess
-	{
-	buf = STRING_r_keytool_err_rusersuccess;
-	}
-
-RESOURCE TBUF r_keytool_err_salluserssuccess
-	{
-	buf = STRING_r_keytool_err_salluserssuccess;
-	}
-
-RESOURCE TBUF r_keytool_err_susersuccess
-	{
-	buf = STRING_r_keytool_err_susersuccess;
-	}
-
-RESOURCE TBUF r_keytool_err_smanagersuccess
-	{
-	buf = STRING_r_keytool_err_smanagersuccess;
-	}
-			
-RESOURCE TBUF r_keytool_err_remove
-	{
-	buf = STRING_r_keytool_err_remove;
-	}
-	
-	
-//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
-
-
-// Certtool General Strings
-
-RESOURCE TBUF r_certtool_shortName
-	{
-	buf = STRING_r_certtool_shortName;
-	}
-	
-RESOURCE TBUF r_certtool_name
-	{
-	buf = STRING_r_certtool_name;
-	}
-	
-RESOURCE TBUF r_certtool_copyright
-	{
-	buf = STRING_r_certtool_copyright;
-	}
-	
-RESOURCE TBUF r_certtool_done
-	{
-	buf = STRING_r_certtool_done;
-	}
-
-
-
-// certtool error strings	
-RESOURCE TBUF r_certtool_err_remove
-	{
-	buf = STRING_r_certtool_err_remove;
-	}
-
-RESOURCE TBUF r_certtool_err_remove_success
-	{
-	buf = STRING_r_certtool_err_remove_success;
-	}
-	
-RESOURCE TBUF r_certtool_err_list
-	{
-	buf = STRING_r_certtool_err_list;
-	}
-	
-RESOURCE TBUF r_certtool_err_listfail
-	{
-	buf = STRING_r_certtool_err_listfail;
-	}
-	
-RESOURCE TBUF r_certtool_err_command
-	{
-	buf = STRING_r_certtool_err_command;
-	}
-	
-RESOURCE TBUF r_certtool_err_unknown
-	{
-	buf = STRING_r_certtool_err_unknown;
-	}
-	
-RESOURCE TBUF r_certtool_err_notexist
-	{
-	buf = STRING_r_certtool_err_notexist;
-	}
-	
-RESOURCE TBUF r_certtool_err_notfound
-	{
-	buf = STRING_r_certtool_err_notfound;
-	}
-	
-RESOURCE TBUF r_certtool_err_certfile
-	{
-	buf = STRING_r_certtool_err_certfile;
-	}
-	
-RESOURCE TBUF r_certtool_err_empty
-	{
-	buf = STRING_r_certtool_err_empty;
-	}
-	
-// import
-
-RESOURCE TBUF r_certtool_err_import
-	{
-	buf = STRING_r_certtool_err_import;
-	}
-	
-RESOURCE TBUF r_certtool_err_corrupt
-	{
-	buf = STRING_r_certtool_err_corrupt;
-	}
-	
-RESOURCE TBUF r_certtool_err_corruptlong
-	{
-	buf = STRING_r_certtool_err_corruptlong;
-	}
-	
-RESOURCE TBUF r_certtool_err_openfail
-	{
-	buf = STRING_r_certtool_err_openfail;
-	}
-	
-RESOURCE TBUF r_certtool_err_emptyfile
-	{
-	buf = STRING_r_certtool_err_emptyfile;
-	}
-
-RESOURCE TBUF r_certtool_err_notsupported
-	{
-	buf = STRING_r_certtool_err_notsupported;
-	}
-		
-RESOURCE TBUF r_certtool_err_importsuccess
-	{
-	buf = STRING_r_certtool_err_importsuccess;
-	}
-	
-RESOURCE TBUF r_certtool_err_passphrase
-	{
-	buf = STRING_r_certtool_err_passphrase;
-	}
-	
-RESOURCE TBUF r_certtool_err_weak
-	{
-	buf = STRING_r_certtool_err_weak;
-	}
-	
-RESOURCE TBUF r_certtool_err_usage
-	{
-	buf = STRING_r_certtool_err_usage;
-	}
-	
-	
-// Certtool usage strings	
-
-RESOURCE TBUF r_certtool_usage
-	{
-	buf = STRING_r_certtool_usage;
-	}
-
-RESOURCE TBUF r_certtool_usage2
-	{
-	buf = STRING_r_certtool_usage2;
-	}
-	
-RESOURCE TBUF r_certtool_usage3
-	{
-	buf = STRING_r_certtool_usage3;
-	}
-
-RESOURCE TBUF r_certtool_usage4
-	{
-	buf = STRING_r_certtool_usage4;
-	}
-	
-RESOURCE TBUF r_certtool_usage_list
-	{
-	buf = STRING_r_certtool_usage_list;
-	}
-
-RESOURCE TBUF r_certtool_usage_list2
-	{
-	buf = STRING_r_certtool_usage_list2;
-	}
-	
-RESOURCE TBUF r_certtool_usage_list3
-	{
-	buf = STRING_r_certtool_usage_list3;
-	}
-
-RESOURCE TBUF r_certtool_usage_list4
-	{
-	buf = STRING_r_certtool_usage_list4;
-	}
-
-RESOURCE TBUF r_certtool_usage_list5
-	{
-	buf = STRING_r_certtool_usage_list5;
-	}
-	
-RESOURCE TBUF r_certtool_usage_page
-	{
-	buf = STRING_r_certtool_usage_page;
-	}
-
-RESOURCE TBUF r_certtool_usage_page2
-	{
-	buf = STRING_r_certtool_usage_page2;
-	}
-
-RESOURCE TBUF r_certtool_usage_import
-	{
-	buf = STRING_r_certtool_usage_import;
-	}
-
-RESOURCE TBUF r_certtool_usage_import2
-	{
-	buf = STRING_r_certtool_usage_import2;
-	}
-	
-RESOURCE TBUF r_certtool_usage_import3
-	{
-	buf = STRING_r_certtool_usage_import3;
-	}
-
-RESOURCE TBUF r_certtool_usage_import4
-	{
-	buf = STRING_r_certtool_usage_import4;
-	}
-
-RESOURCE TBUF r_certtool_usage_import5
-	{
-	buf = STRING_r_certtool_usage_import5;
-	}
-	
-
-RESOURCE TBUF r_certtool_usage_liststores
-	{
-	buf = STRING_r_certtool_usage_liststores;
-	}
-
-RESOURCE TBUF r_certtool_usage_remove
-	{
-	buf = STRING_r_certtool_usage_remove;
-	}
-
-RESOURCE TBUF r_certtool_usage_remove2
-	{
-	buf = STRING_r_certtool_usage_remove2;
-	}
-	
-RESOURCE TBUF r_certtool_usage_help
-	{
-	buf = STRING_r_certtool_usage_help;
-	}
-
-RESOURCE TBUF r_certtool_usage_addapps
-	{
-	buf = STRING_r_certtool_usage_addapps;
-	}
-
-RESOURCE TBUF r_certtool_usage_addapps2
-	{
-	buf = STRING_r_certtool_usage_addapps2;
-	}
-	
-RESOURCE TBUF r_certtool_usage_setapps
-	{
-	buf = STRING_r_certtool_usage_setapps;
-	}
-
-RESOURCE TBUF r_certtool_usage_setapps2
-	{
-	buf = STRING_r_certtool_usage_setapps2;
-	}
-
-RESOURCE TBUF r_certtool_usage_noninteractive
-	{
-	buf = STRING_r_certtool_usage_noninteractive;
-	}
-
-RESOURCE TBUF r_certtool_usage_noninteractive1
-	{
-	buf = STRING_r_certtool_usage_noninteractive1;
-	}
-	
-RESOURCE TBUF r_certtool_usage_removeapps
-	{
-	buf = STRING_r_certtool_usage_removeapps;
-	}
-	
-RESOURCE TBUF r_certtool_usage_removeapps2
-	{
-	buf = STRING_r_certtool_usage_removeapps2;
-	}
-	
-RESOURCE TBUF r_certtool_usage_noapps
-	{
-	buf = STRING_r_certtool_usage_noapps;
-	}
-	
-RESOURCE TBUF r_certtool_usage_nocert
-	{
-	buf = STRING_r_certtool_usage_nocert;
-	}
-	
-RESOURCE TBUF r_certtool_err_setapps_success
-	{
-	buf = STRING_r_certtool_err_setapps_success;
-	}
-
-RESOURCE TBUF r_certtool_err_addapps_success
-	{
-	buf = STRING_r_certtool_err_addapps_success;
-	}
-
-RESOURCE TBUF r_certtool_err_addapps_fail
-	{
-	buf = STRING_r_certtool_err_addapps_fail;
-	}
-
-RESOURCE TBUF r_certtool_err_removeapps_success
-	{
-	buf = STRING_r_certtool_err_removeapps_success;
-	}	
-	
+/*
+* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+NAME KEYT
+
+#include <uikon.rh>
+#include "keytool.rls"
+#include "certtool.rls"
+
+RESOURCE RSS_SIGNATURE {}
+
+
+// Keytool General Strings
+
+RESOURCE TBUF r_keytool_shortName
+	{
+	buf = STRING_r_keytool_shortName;
+	}
+	
+RESOURCE TBUF r_keytool_name
+	{
+	buf = STRING_r_keytool_name;
+	}
+	
+RESOURCE TBUF r_keytool_copyright
+	{
+	buf = STRING_r_keytool_copyright;
+	}
+	
+RESOURCE TBUF r_keytool_done
+	{
+	buf = STRING_r_keytool_done;
+	}
+	
+
+// Keytool usage strings	
+
+RESOURCE TBUF r_keytool_usage
+	{
+	buf = STRING_r_keytool_usage;
+	}
+	
+RESOURCE TBUF r_keytool_usage2
+	{
+	buf = STRING_r_keytool_usage2;
+	}
+
+RESOURCE TBUF r_keytool_usage3
+	{
+	buf = STRING_r_keytool_usage3;
+	}	
+
+
+RESOURCE TBUF r_keytool_usage4
+	{
+	buf = STRING_r_keytool_usage4;
+	}	
+
+#ifdef SYMBIAN_AUTH_SERVER
+RESOURCE TBUF r_keytool_usage5
+	{
+	buf = STRING_r_keytool_usage5;
+	}	
+#endif // SYMBIAN_AUTH_SERVER
+RESOURCE TBUF r_keytool_usage_list
+	{
+	buf = STRING_r_keytool_usage_list;
+	}
+
+RESOURCE TBUF r_keytool_usage_list2
+	{
+	buf = STRING_r_keytool_usage_list2;
+	}
+
+RESOURCE TBUF r_keytool_usage_list3
+	{
+	buf = STRING_r_keytool_usage_list3;
+	}
+
+RESOURCE TBUF r_keytool_usage_list4
+	{
+	buf = STRING_r_keytool_usage_list4;
+	}
+
+RESOURCE TBUF r_keytool_usage_page
+	{
+	buf = STRING_r_keytool_usage_page;
+	}
+
+RESOURCE TBUF r_keytool_usage_page2
+	{
+	buf = STRING_r_keytool_usage_page2;
+	}
+
+RESOURCE TBUF r_keytool_usage_liststores
+	{
+	buf = STRING_r_keytool_usage_liststores;
+	}
+	
+RESOURCE TBUF r_keytool_usage_import
+	{
+	buf = STRING_r_keytool_usage_import;
+	}
+
+RESOURCE TBUF r_keytool_usage_import2
+	{
+	buf = STRING_r_keytool_usage_import2;
+	}
+
+RESOURCE TBUF r_keytool_usage_import3
+	{
+	buf = STRING_r_keytool_usage_import3;
+	}
+
+RESOURCE TBUF r_keytool_usage_import4
+	{
+	buf = STRING_r_keytool_usage_import4;
+	}
+
+RESOURCE TBUF r_keytool_usage_remove
+	{
+	buf = STRING_r_keytool_usage_remove;
+	}
+	
+RESOURCE TBUF r_keytool_usage_setuser
+	{
+	buf = STRING_r_keytool_usage_setuser;
+	}
+	
+RESOURCE TBUF r_keytool_usage_setallusers
+	{
+	buf = STRING_r_keytool_usage_setallusers;
+	}
+	
+RESOURCE TBUF r_keytool_usage_setmanager
+	{
+	buf = STRING_r_keytool_usage_setmanager;
+	}
+	
+RESOURCE TBUF r_keytool_usage_removeuser
+	{
+	buf = STRING_r_keytool_usage_removeuser;
+	}
+
+RESOURCE TBUF r_keytool_usage_help
+	{
+	buf = STRING_r_keytool_usage_help;
+	}
+	
+RESOURCE TBUF r_keytool_usage_keyusage
+	{
+	buf = STRING_r_keytool_usage_keyusage;
+	}
+	
+RESOURCE TBUF r_keytool_usage_keyusages
+	{
+	buf = STRING_r_keytool_usage_keyusages;
+	}
+	
+RESOURCE TBUF r_keytool_usage_keyaccess
+	{
+	buf = STRING_r_keytool_usage_keyaccess;
+	}
+	
+RESOURCE TBUF r_keytool_usage_keyaccesses
+	{
+	buf = STRING_r_keytool_usage_keyaccesses;
+	}
+
+RESOURCE TBUF r_keytool_usage_noninteractive
+	{
+	buf = STRING_r_keytool_usage_noninteractive;
+	}
+	
+RESOURCE TBUF r_keytool_usage_noninteractive1
+	{
+	buf = STRING_r_keytool_usage_noninteractive1;
+	}
+
+#ifdef SYMBIAN_AUTH_SERVER
+RESOURCE TBUF r_keytool_usage_migrate
+	{
+	buf = STRING_r_keytool_usage_migrate;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate1
+	{
+	buf = STRING_r_keytool_usage_migrate1;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate2
+	{
+	buf = STRING_r_keytool_usage_migrate2;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate3
+	{
+	buf = STRING_r_keytool_usage_migrate3;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate4
+	{
+	buf = STRING_r_keytool_usage_migrate4;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate5
+	{
+	buf = STRING_r_keytool_usage_migrate5;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate6
+	{
+	buf = STRING_r_keytool_usage_migrate6;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate7
+	{
+	buf = STRING_r_keytool_usage_migrate7;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate8
+	{
+	buf = STRING_r_keytool_usage_migrate8;
+	}
+
+RESOURCE TBUF r_keytool_usage_migrate9
+	{
+	buf = STRING_r_keytool_usage_migrate9;
+	}
+
+RESOURCE TBUF r_keytool_usage_oldkey_absent
+	{
+	buf = STRING_r_keytool_usage_oldkey_absent;
+	}
+
+RESOURCE TBUF r_keytool_usage_passphrase_absent
+	{
+	buf = STRING_r_keytool_usage_passphrase_absent;
+	}
+
+#endif // SYMBIAN_AUTH_SERVER
+// Keytool error strings
+
+RESOURCE TBUF r_keytool_err_deletefail
+	{
+	buf = STRING_r_keytool_err_deletefail;
+	}
+	
+RESOURCE TBUF r_keytool_err_ruserfail
+	{
+	buf = STRING_r_keytool_err_ruserfail;
+	}
+	
+RESOURCE TBUF r_keytool_err_suserfail
+	{
+	buf = STRING_r_keytool_err_suserfail;
+	}
+	
+RESOURCE TBUF r_keytool_err_sallusersfail
+	{
+	buf = STRING_r_keytool_err_sallusersfail;
+	}
+
+RESOURCE TBUF r_keytool_err_smanagerfail
+	{
+	buf = STRING_r_keytool_err_smanagerfail;
+	}
+
+RESOURCE TBUF r_keytool_err_access
+	{
+	buf = STRING_r_keytool_err_access;
+	}
+	
+RESOURCE TBUF r_keytool_err_nousers
+	{
+	buf = STRING_r_keytool_err_nousers;
+	}
+	
+RESOURCE TBUF r_keytool_err_nokey
+	{
+	buf = STRING_r_keytool_err_nokey;
+	}
+	
+RESOURCE TBUF r_keytool_err_command
+	{
+	buf = STRING_r_keytool_err_command;
+	}
+	
+RESOURCE TBUF r_keytool_err_unknown
+	{
+	buf = STRING_r_keytool_err_unknown;
+	}
+
+RESOURCE TBUF r_keytool_err_notexist
+	{
+	buf = STRING_r_keytool_err_notexist;
+	}
+	
+RESOURCE TBUF r_keytool_err_notfound
+	{
+	buf = STRING_r_keytool_err_notfound;
+	}
+	
+RESOURCE TBUF r_keytool_err_keyfile
+	{
+	buf = STRING_r_keytool_err_keyfile;
+	}
+	
+RESOURCE TBUF r_keytool_err_empty
+	{
+	buf = STRING_r_keytool_err_empty;
+	}
+	
+// import
+
+RESOURCE TBUF r_keytool_err_import
+	{
+	buf = STRING_r_keytool_err_import;
+	}
+	
+RESOURCE TBUF r_keytool_err_corrupt
+	{
+	buf = STRING_r_keytool_err_corrupt;
+	}
+	
+RESOURCE TBUF r_keytool_err_corruptlong
+	{
+	buf = STRING_r_keytool_err_corruptlong;
+	}
+	
+RESOURCE TBUF r_keytool_err_openfail
+	{
+	buf = STRING_r_keytool_err_openfail;
+	}
+	
+RESOURCE TBUF r_keytool_err_emptyfile
+	{
+	buf = STRING_r_keytool_err_emptyfile;
+	}
+	
+RESOURCE TBUF r_keytool_err_dh
+	{
+	buf = STRING_r_keytool_err_dh;
+	}
+
+RESOURCE TBUF r_keytool_err_notsupported
+	{
+	buf = STRING_r_keytool_err_notsupported;
+	}
+	
+RESOURCE TBUF r_keytool_err_pkcs8
+	{
+	buf = STRING_r_keytool_err_pkcs8;
+	}
+	
+RESOURCE TBUF r_keytool_err_importsuccess
+	{
+	buf = STRING_r_keytool_err_importsuccess;
+	}
+	
+RESOURCE TBUF r_keytool_err_passphrase
+	{
+	buf = STRING_r_keytool_err_passphrase;
+	}
+	
+RESOURCE TBUF r_keytool_err_weak
+	{
+	buf = STRING_r_keytool_err_weak;
+	}
+	
+RESOURCE TBUF r_keytool_err_usage
+	{
+	buf = STRING_r_keytool_err_usage;
+	}
+	
+
+// List
+	
+RESOURCE TBUF r_keytool_err_list
+	{
+	buf = STRING_r_keytool_err_list;
+	}
+
+RESOURCE TBUF r_keytool_err_listfail
+	{
+	buf = STRING_r_keytool_err_listfail;
+	}
+	
+RESOURCE TBUF r_keytool_err_deletesuccess
+	{
+	buf = STRING_r_keytool_err_deletesuccess;
+	}
+
+RESOURCE TBUF r_keytool_err_rusersuccess
+	{
+	buf = STRING_r_keytool_err_rusersuccess;
+	}
+
+RESOURCE TBUF r_keytool_err_salluserssuccess
+	{
+	buf = STRING_r_keytool_err_salluserssuccess;
+	}
+
+RESOURCE TBUF r_keytool_err_susersuccess
+	{
+	buf = STRING_r_keytool_err_susersuccess;
+	}
+
+RESOURCE TBUF r_keytool_err_smanagersuccess
+	{
+	buf = STRING_r_keytool_err_smanagersuccess;
+	}
+			
+RESOURCE TBUF r_keytool_err_remove
+	{
+	buf = STRING_r_keytool_err_remove;
+	}
+	
+#ifdef SYMBIAN_AUTH_SERVER
+RESOURCE TBUF r_keytool_err_migrationfail
+	{
+	buf = STRING_r_keytool_err_migrationfail;
+	}
+#endif // SYMBIAN_AUTH_SERVER
+	
+//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\
+
+
+// Certtool General Strings
+
+RESOURCE TBUF r_certtool_shortName
+	{
+	buf = STRING_r_certtool_shortName;
+	}
+	
+RESOURCE TBUF r_certtool_name
+	{
+	buf = STRING_r_certtool_name;
+	}
+	
+RESOURCE TBUF r_certtool_copyright
+	{
+	buf = STRING_r_certtool_copyright;
+	}
+	
+RESOURCE TBUF r_certtool_done
+	{
+	buf = STRING_r_certtool_done;
+	}
+
+
+
+// certtool error strings	
+RESOURCE TBUF r_certtool_err_remove
+	{
+	buf = STRING_r_certtool_err_remove;
+	}
+
+RESOURCE TBUF r_certtool_err_remove_success
+	{
+	buf = STRING_r_certtool_err_remove_success;
+	}
+	
+RESOURCE TBUF r_certtool_err_list
+	{
+	buf = STRING_r_certtool_err_list;
+	}
+	
+RESOURCE TBUF r_certtool_err_listfail
+	{
+	buf = STRING_r_certtool_err_listfail;
+	}
+	
+RESOURCE TBUF r_certtool_err_command
+	{
+	buf = STRING_r_certtool_err_command;
+	}
+	
+RESOURCE TBUF r_certtool_err_unknown
+	{
+	buf = STRING_r_certtool_err_unknown;
+	}
+	
+RESOURCE TBUF r_certtool_err_notexist
+	{
+	buf = STRING_r_certtool_err_notexist;
+	}
+	
+RESOURCE TBUF r_certtool_err_notfound
+	{
+	buf = STRING_r_certtool_err_notfound;
+	}
+	
+RESOURCE TBUF r_certtool_err_certfile
+	{
+	buf = STRING_r_certtool_err_certfile;
+	}
+	
+RESOURCE TBUF r_certtool_err_empty
+	{
+	buf = STRING_r_certtool_err_empty;
+	}
+	
+// import
+
+RESOURCE TBUF r_certtool_err_import
+	{
+	buf = STRING_r_certtool_err_import;
+	}
+	
+RESOURCE TBUF r_certtool_err_corrupt
+	{
+	buf = STRING_r_certtool_err_corrupt;
+	}
+	
+RESOURCE TBUF r_certtool_err_corruptlong
+	{
+	buf = STRING_r_certtool_err_corruptlong;
+	}
+	
+RESOURCE TBUF r_certtool_err_openfail
+	{
+	buf = STRING_r_certtool_err_openfail;
+	}
+	
+RESOURCE TBUF r_certtool_err_emptyfile
+	{
+	buf = STRING_r_certtool_err_emptyfile;
+	}
+
+RESOURCE TBUF r_certtool_err_notsupported
+	{
+	buf = STRING_r_certtool_err_notsupported;
+	}
+		
+RESOURCE TBUF r_certtool_err_importsuccess
+	{
+	buf = STRING_r_certtool_err_importsuccess;
+	}
+	
+RESOURCE TBUF r_certtool_err_passphrase
+	{
+	buf = STRING_r_certtool_err_passphrase;
+	}
+	
+RESOURCE TBUF r_certtool_err_weak
+	{
+	buf = STRING_r_certtool_err_weak;
+	}
+	
+RESOURCE TBUF r_certtool_err_usage
+	{
+	buf = STRING_r_certtool_err_usage;
+	}
+	
+	
+// Certtool usage strings	
+
+RESOURCE TBUF r_certtool_usage
+	{
+	buf = STRING_r_certtool_usage;
+	}
+
+RESOURCE TBUF r_certtool_usage2
+	{
+	buf = STRING_r_certtool_usage2;
+	}
+	
+RESOURCE TBUF r_certtool_usage3
+	{
+	buf = STRING_r_certtool_usage3;
+	}
+
+RESOURCE TBUF r_certtool_usage4
+	{
+	buf = STRING_r_certtool_usage4;
+	}
+	
+RESOURCE TBUF r_certtool_usage_list
+	{
+	buf = STRING_r_certtool_usage_list;
+	}
+
+RESOURCE TBUF r_certtool_usage_list2
+	{
+	buf = STRING_r_certtool_usage_list2;
+	}
+	
+RESOURCE TBUF r_certtool_usage_list3
+	{
+	buf = STRING_r_certtool_usage_list3;
+	}
+
+RESOURCE TBUF r_certtool_usage_list4
+	{
+	buf = STRING_r_certtool_usage_list4;
+	}
+
+RESOURCE TBUF r_certtool_usage_list5
+	{
+	buf = STRING_r_certtool_usage_list5;
+	}
+	
+RESOURCE TBUF r_certtool_usage_page
+	{
+	buf = STRING_r_certtool_usage_page;
+	}
+
+RESOURCE TBUF r_certtool_usage_page2
+	{
+	buf = STRING_r_certtool_usage_page2;
+	}
+
+RESOURCE TBUF r_certtool_usage_import
+	{
+	buf = STRING_r_certtool_usage_import;
+	}
+
+RESOURCE TBUF r_certtool_usage_import2
+	{
+	buf = STRING_r_certtool_usage_import2;
+	}
+	
+RESOURCE TBUF r_certtool_usage_import3
+	{
+	buf = STRING_r_certtool_usage_import3;
+	}
+
+RESOURCE TBUF r_certtool_usage_import4
+	{
+	buf = STRING_r_certtool_usage_import4;
+	}
+
+RESOURCE TBUF r_certtool_usage_import5
+	{
+	buf = STRING_r_certtool_usage_import5;
+	}
+	
+
+RESOURCE TBUF r_certtool_usage_liststores
+	{
+	buf = STRING_r_certtool_usage_liststores;
+	}
+
+RESOURCE TBUF r_certtool_usage_remove
+	{
+	buf = STRING_r_certtool_usage_remove;
+	}
+
+RESOURCE TBUF r_certtool_usage_remove2
+	{
+	buf = STRING_r_certtool_usage_remove2;
+	}
+	
+RESOURCE TBUF r_certtool_usage_help
+	{
+	buf = STRING_r_certtool_usage_help;
+	}
+
+RESOURCE TBUF r_certtool_usage_addapps
+	{
+	buf = STRING_r_certtool_usage_addapps;
+	}
+
+RESOURCE TBUF r_certtool_usage_addapps2
+	{
+	buf = STRING_r_certtool_usage_addapps2;
+	}
+	
+RESOURCE TBUF r_certtool_usage_setapps
+	{
+	buf = STRING_r_certtool_usage_setapps;
+	}
+
+RESOURCE TBUF r_certtool_usage_setapps2
+	{
+	buf = STRING_r_certtool_usage_setapps2;
+	}
+
+RESOURCE TBUF r_certtool_usage_noninteractive
+	{
+	buf = STRING_r_certtool_usage_noninteractive;
+	}
+
+RESOURCE TBUF r_certtool_usage_noninteractive1
+	{
+	buf = STRING_r_certtool_usage_noninteractive1;
+	}
+	
+RESOURCE TBUF r_certtool_usage_removeapps
+	{
+	buf = STRING_r_certtool_usage_removeapps;
+	}
+	
+RESOURCE TBUF r_certtool_usage_removeapps2
+	{
+	buf = STRING_r_certtool_usage_removeapps2;
+	}
+	
+RESOURCE TBUF r_certtool_usage_noapps
+	{
+	buf = STRING_r_certtool_usage_noapps;
+	}
+	
+RESOURCE TBUF r_certtool_usage_nocert
+	{
+	buf = STRING_r_certtool_usage_nocert;
+	}
+	
+RESOURCE TBUF r_certtool_err_setapps_success
+	{
+	buf = STRING_r_certtool_err_setapps_success;
+	}
+
+RESOURCE TBUF r_certtool_err_addapps_success
+	{
+	buf = STRING_r_certtool_err_addapps_success;
+	}
+
+RESOURCE TBUF r_certtool_err_addapps_fail
+	{
+	buf = STRING_r_certtool_err_addapps_fail;
+	}
+
+RESOURCE TBUF r_certtool_err_removeapps_success
+	{
+	buf = STRING_r_certtool_err_removeapps_success;
+	}	
+