javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/InstallerUiTexts.java
--- a/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/InstallerUiTexts.java Fri May 14 15:47:24 2010 +0300
+++ b/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/InstallerUiTexts.java Thu May 27 12:49:31 2010 +0300
@@ -29,81 +29,139 @@
{
/*** ----------------------------- PUBLIC ------------------------------ */
- // Define constants for logical names of localised strings.
- public static final String OK = "ok";
- public static final String CANCEL = "cancel";
- public static final String BACK = "back";
- public static final String DETAILS = "failed_details";
- public static final String INSTALL = "progress";
- public static final String UNINSTALL = "uninstalling_progress";
- public static final String START = "start";
- public static final String SHOW = "show";
- public static final String CLOSE = "close";
- public static final String INSTALL_QUERY = "query";
- public static final String UPDATE_QUERY = "update_query";
- public static final String UNINSTALL_QUERY = "uninstall_query";
- public static final String DETAILS_QUERY = "view_app_details";
- public static final String APP_CONVERSION_PROGRESS = "app_conversion_progress";
+ // Define constants for localised text ids.
+ public static final String OK = "Ok";
+ public static final String CANCEL = "Cancel";
+ public static final String BACK = "Ok";
+ public static final String HIDE = "Hide";
+ public static final String SHOW = "Show";
+ public static final String CLOSE = "Close";
+ public static final String INSTALL_QUERY = "Install?";
+ public static final String UPDATE_QUERY = "Update?";
+ public static final String OCSP_CHECK_PROGRESS = "Checking certificate validity";
+ public static final String INSTALLING = "Installing";
+ public static final String INSTALL_FAILED = "Installation failed";
+ public static final String INSTALLATION_COMPLETE = "Installed";
+ public static final String DOWNLOADING = "Downloading";
+ public static final String CONNECT_TO = "Connect to";
+ public static final String DOWNLOAD_APPLICATION = "To download %U you need to authenticate yourself";
+ public static final String USERNAME = "Username:";
+ public static final String PASSWORD = "Password:";
+ public static final String SUITE_NAME = "%U (%U)";
+ public static final String SUITE_VENDOR = "%U";
+ public static final String SUITE_VERSION = "%U";
+ public static final String APP_NAME = "%U";
+ public static final String SIZE_KB = "%U kB";
+ public static final String SIZE_MB = "%U MB";
+ public static final String RETAIN_USER_DATA = "Retain application data";
+ // Certificate info texts.
+ public static final String NOT_CERTIFIED_TITLE = "Application is not certified.";
+ public static final String NOT_CERTIFIED_INFO = "Application %U is from an unknown source.";
+ public static final String CERTIFICATE_TITLE = "Application is certified.";
+ public static final String DOMAIN = "Domain: %U";
+ public static final String DOMAIN_MANU = "Manufacturer";
+ public static final String DOMAIN_OPER = "Operator";
+ public static final String DOMAIN_ITP = "Trusted 3rd party";
+ public static final String DOMAIN_UTP = "Untrusted 3rd party";
+ public static final String ISSUER = "Issuer: %U";
+ public static final String SUBJECT = "Subject: %U";
+ public static final String ORGANIZATION = "Organization: %U";
+ public static final String VALID_FROM = "Valid from: %U";
+ public static final String VALID_UNTIL = "Valid until: %U";
+ public static final String SERIAL_NUMBER = "Serial number: %U";
+ public static final String FINGERPRINT = "Fingerprint: %U";
+ // Texts for installation drive selection.
+ public static final String DRIVE_TYPE_UNKNOWN = "%U: Unknown";
+ public static final String DRIVE_TYPE_UNKNOWN_KB = "%U: Unknown (%N kB)";
+ public static final String DRIVE_TYPE_UNKNOWN_MB = "%U: Unknown (%N MB)";
+ public static final String DRIVE_TYPE_UNKNOWN_GB = "%U: Unknown (%N GB)";
+ public static final String DRIVE_TYPE_PHONE_MEMORY = "%U: Phone memory";
+ public static final String DRIVE_TYPE_PHONE_MEMORY_KB = "%U: Phone memory (%N kB)";
+ public static final String DRIVE_TYPE_PHONE_MEMORY_MB = "%U: Phone memory (%N MB)";
+ public static final String DRIVE_TYPE_PHONE_MEMORY_GB = "%U: Phone memory (%N GB)";
+ public static final String DRIVE_TYPE_MEMORY_CARD = "%U: Memory card";
+ public static final String DRIVE_TYPE_MEMORY_CARD_KB = "%U: Memory card (%N kB)";
+ public static final String DRIVE_TYPE_MEMORY_CARD_MB = "%U: Memory card (%N MB)";
+ public static final String DRIVE_TYPE_MEMORY_CARD_GB = "%U: Memory card (%N GB)";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE = "%U: Internal Mass Storage";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_KB = "%U: Internal Mass Storage (%N kB)";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_MB = "%U: Internal Mass Storage (%N MB)";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_GB = "%U: Internal Mass Storage (%N GB)";
+ // Texts for permission confirmation view.
+ public static final String PERM_QUERY = "Application %U asks permissions to access protected device functionality.";
+ public static final String PERM_VIEW_DETAILS = "Details";
+ public static final String PERM_ALLOW_ALWAYS = "Allow always";
+ public static final String PERM_ASK_ME_LATER = "Ask me later";
+ public static final String PERM_CANCEL = "Cancel installing";
+ public static final String PERM_VIEW_DETAILS_TITLE = "Application asks permissions for:";
+
+ /*
+ // Define constants for localised text ids.
+ public static final String OK = "button_ok";
+ public static final String CANCEL = "button_cancel";
+ public static final String BACK = "button_back_ok";
+ public static final String HIDE = "button_hide";
+ public static final String SHOW = "button_show";
+ public static final String CLOSE = "button_close";
+ public static final String INSTALL_QUERY = "title_install";
+ public static final String UPDATE_QUERY = "title_update_query";
public static final String OCSP_CHECK_PROGRESS = "ocsp_check_progress";
- public static final String INSTALLING = "progress";
- public static final String UNINSTALLING = "uninstalling_progress";
- public static final String INSTALL_FAILED = "failed";
- public static final String UNINSTALL_FAILED = "uninst_failed";
- public static final String INSTALLATION_COMPLETE = "complete";
- public static final String INSTALLED_TO = "installed_to";
- public static final String DOWNLOADING = "download_progress";
- public static final String CONNECT_TO = "auth_query";
- public static final String DOWNLOAD_APPLICATION = "auth_yourself";
- public static final String USERNAME = "auth_username";
- public static final String PASSWORD = "auth_password";
- public static final String APP_DETAILS = "view_app_details";
- public static final String NAME = "app_details_name";
- public static final String VENDOR = "app_details_vendor";
- public static final String VERSION = "app_details_version";
- public static final String SIZE = "app_details_size_kb";
- public static final String APPLICATIONS = "app_details_apps_list";
- public static final String APP_NAME = "application_name";
- public static final String NOT_CERTIFIED_INFO = "view_not_certified_details";
- public static final String NOT_CERTIFIED_TITLE = "not_certified_title";
- public static final String NOT_CERTIFIED_WARNING = "not_certified_warning";
- public static final String CERTIFICATE_INFO = "view_cert_details";
- public static final String CERTIFICATE_INFO_FOR_APP = "cert_details_title";
- public static final String DOMAIN = "cert_details_domain";
- public static final String DOMAIN_MANU = "cert_details_domain_manufacturer";
- public static final String DOMAIN_OPER = "cert_details_domain_operator";
- public static final String DOMAIN_ITP = "cert_details_domain_trusted_third_party";
- public static final String DOMAIN_UTP = "cert_details_domain_untrusted_third_party";
- public static final String ISSUER = "cert_details_issuer";
- public static final String SUBJECT = "cert_details_subject";
- public static final String VALID_FROM = "cert_details_valid_from";
- public static final String VALID_UNTIL = "cert_details_valid_until";
- public static final String SERIAL_NUMBER = "cert_details_serial_number";
- public static final String FINGERPRINT = "cert_details_fingerprint";
- public static final String INSTALL_TO_DRIVE = "app_details_install_to_drive";
- public static final String INSTALL_TO_GROUP = "app_details_install_to_group";
- public static final String RETAIN_USER_DATA = "update_retain_user_data";
- public static final String DRIVE_TYPE_UNKNOWN = "drive_type_unknown";
- public static final String DRIVE_TYPE_UNKNOWN_KB = "drive_type_unknown_kb";
- public static final String DRIVE_TYPE_UNKNOWN_MB = "drive_type_unknown_mb";
- public static final String DRIVE_TYPE_UNKNOWN_GB = "drive_type_unknown_gb";
- public static final String DRIVE_TYPE_PHONE_MEMORY = "drive_type_phone_memory";
- public static final String DRIVE_TYPE_PHONE_MEMORY_KB = "drive_type_phone_memory_kb";
- public static final String DRIVE_TYPE_PHONE_MEMORY_MB = "drive_type_phone_memory_mb";
- public static final String DRIVE_TYPE_PHONE_MEMORY_GB = "drive_type_phone_memory_gb";
- public static final String DRIVE_TYPE_MEMORY_CARD = "drive_type_memory_card";
- public static final String DRIVE_TYPE_MEMORY_CARD_KB = "drive_type_memory_card_kb";
- public static final String DRIVE_TYPE_MEMORY_CARD_MB = "drive_type_memory_card_mb";
- public static final String DRIVE_TYPE_MEMORY_CARD_GB = "drive_type_memory_card_gb";
- public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE = "drive_type_internal_mass_memory";
- public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_KB = "drive_type_internal_mass_memory_kb";
- public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_MB = "drive_type_internal_mass_memory_mb";
- public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_GB = "drive_type_internal_mass_memory_gb";
+ public static final String INSTALLING = "title_installing";
+ public static final String INSTALL_FAILED = "title_inst_failed";
+ public static final String INSTALLATION_COMPLETE = "title_installation_complete";
+ public static final String DOWNLOADING = "title_downloading";
+ public static final String CONNECT_TO = "title_auth_query";
+ public static final String DOWNLOAD_APPLICATION = "info_auth_yourself";
+ public static final String USERNAME = "dialog_username";
+ public static final String PASSWORD = "dialog_password";
+ public static final String SUITE_NAME = "info_app_suite_name";
+ public static final String SUITE_VENDOR = "info_vendor";
+ public static final String SUITE_VERSION = "info_version";
+ public static final String APP_NAME = "info_app_name";
+ public static final String SIZE_KB = "info_size_kb";
+ public static final String SIZE_MB = "info_size_mb";
+ public static final String RETAIN_USER_DATA = "info_update_retain_user_data";
+ // Certificate info texts.
+ public static final String NOT_CERTIFIED_TITLE = "title_app_not_cert";
+ public static final String NOT_CERTIFIED_INFO = "info_inst_pkg_not_cert";
+ public static final String CERTIFICATE_TITLE = "title_app_cert";
+ public static final String DOMAIN = "setlabel_cert_domain";
+ public static final String DOMAIN_MANU = "setlabel_cert_domain_val_manufacturer";
+ public static final String DOMAIN_OPER = "setlabel_cert_domain_val_operator";
+ public static final String DOMAIN_ITP = "setlabel_cert_domain_val_trusted_third_party";
+ public static final String DOMAIN_UTP = "setlabel_cert_domain_val_untrusted_third_party";
+ public static final String ISSUER = "setlabel_issuer";
+ public static final String SUBJECT = "setlabel_subject";
+ public static final String ORGANIZATION = "setlabel_organization";
+ public static final String VALID_FROM = "setlabel_valid_from";
+ public static final String VALID_UNTIL = "setlabel_valid_until";
+ public static final String SERIAL_NUMBER = "setlabel_serial_number";
+ public static final String FINGERPRINT = "setlabel_fingerprint";
+ // Texts for installation drive selection.
+ public static final String DRIVE_TYPE_UNKNOWN = "list_unknown";
+ public static final String DRIVE_TYPE_UNKNOWN_KB = "list_unknown_kb";
+ public static final String DRIVE_TYPE_UNKNOWN_MB = "list_unknown_mb";
+ public static final String DRIVE_TYPE_UNKNOWN_GB = "list_unknown_gb";
+ public static final String DRIVE_TYPE_PHONE_MEMORY = "list_phone_mem";
+ public static final String DRIVE_TYPE_PHONE_MEMORY_KB = "list_phone_mem_kb";
+ public static final String DRIVE_TYPE_PHONE_MEMORY_MB = "list_phone_mem_mb";
+ public static final String DRIVE_TYPE_PHONE_MEMORY_GB = "list_phone_mem_gb";
+ public static final String DRIVE_TYPE_MEMORY_CARD = "list_mem_card";
+ public static final String DRIVE_TYPE_MEMORY_CARD_KB = "list_mem_card_kb";
+ public static final String DRIVE_TYPE_MEMORY_CARD_MB = "list_mem_card_mb";
+ public static final String DRIVE_TYPE_MEMORY_CARD_GB = "list_mem_card_gb";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE = "list_mass_mem";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_KB = "list_mass_mem_kb";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_MB = "list_mass_mem_mb";
+ public static final String DRIVE_TYPE_INTERNAL_MASS_STORAGE_GB = "list_mass_mem_gb";
// Texts for permission confirmation view.
- public static final String PERM_QUERY = "perm_query";
- public static final String PERM_VIEW_DETAILS = "perm_view_details";
- public static final String PERM_VIEW_DETAILS_TITLE = "perm_view_details_title";
- public static final String PERM_ALLOW_ALWAYS = "perm_allow_always";
- public static final String PERM_ASK_ME_LATER = "perm_ask_me_later";
+ public static final String PERM_QUERY = "info_perm_query";
+ public static final String PERM_VIEW_DETAILS = "button_view_perm_details";
+ public static final String PERM_ALLOW_ALWAYS = "button_perm_allow_always";
+ public static final String PERM_ASK_ME_LATER = "button_perm_ask_me_later";
+ public static final String PERM_CANCEL = "button_perm_cancel_installing";
+ public static final String PERM_VIEW_DETAILS_TITLE = "title_perm_view_details";
+ */
/**
* Method for retrieving a text string with given id and no parameters.
@@ -125,11 +183,12 @@
*/
public static String get(String aTextId, Object[] aTextParameters)
{
- if (iRes == null)
- {
- iRes = ResourceLoader.getInstance("javainstallation", "qtn_java_inst_");
- }
- return iRes.format(aTextId, aTextParameters);
+ return new com.nokia.mj.impl.utils.Formatter(aTextId).format(aTextParameters);
+ //if (iRes == null)
+ //{
+ // iRes = ResourceLoader.getInstance("javaapplicationinstaller", "txt_java_inst_");
+ //}
+ //return iRes.format(aTextId, aTextParameters);
}
/*** ---------------------------- PROTECTED --------------------------- */