--- a/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/ViewBase.java	Fri May 14 15:47:24 2010 +0300
+++ b/javamanager/javainstaller/installerui/javasrc/com/nokia/mj/impl/installer/ui/eswt2/ViewBase.java	Thu May 27 12:49:31 2010 +0300
@@ -450,12 +450,12 @@
         boolean aSecurityButton)
     {
         // Add title.
-        String title = "Install?";
+        String title = InstallerUiTexts.get(InstallerUiTexts.INSTALL_QUERY);
         if (aInstallInfo != null)
         {
             if (aInstallInfo.getOldVersion() != null)
             {
-                title = "Update?";
+                title = InstallerUiTexts.get(InstallerUiTexts.UPDATE_QUERY);
             }
             iCertificates = aInstallInfo.getCertificates();
         }
@@ -527,9 +527,25 @@
             return;
         }
 
-        // Add suite name.
+        // Add suite name and version.
         createAppInfoLabel(
-            aInstallInfo.getName() + " " + aInstallInfo.getVersion());
+            InstallerUiTexts.get(
+                InstallerUiTexts.SUITE_NAME,
+                new String[] { aInstallInfo.getName(),
+                               aInstallInfo.getVersion() }));
+        if (aFull)
+        {
+            // Add vendor.
+            if (aInstallInfo.getCertificates() != null)
+            {
+                // Vendor information must be displayed only for
+                // identified applications.
+                createAppInfoLabel(
+                    InstallerUiTexts.get(
+                        InstallerUiTexts.SUITE_VENDOR,
+                        new String[] { aInstallInfo.getVendor() }));
+            }
+        }
         // Add size.
         long size = 0;
         if (aInstallInfo.getJarSize() > 0)
@@ -544,21 +560,11 @@
         {
             createAppInfoLabel(
                 InstallerUiTexts.get(
-                    InstallerUiTexts.SIZE,
+                    InstallerUiTexts.SIZE_KB,
                     new String[] { Long.toString(1 + size/1024) }));
         }
         if (aFull)
         {
-            // Add vendor.
-            if (aInstallInfo.getCertificates() != null)
-            {
-                // Vendor information must be displayed only for
-                // identified applications.
-                createAppInfoLabel(
-                    InstallerUiTexts.get(
-                        InstallerUiTexts.VENDOR,
-                        new String[] { aInstallInfo.getVendor() }));
-            }
             // Add application names.
             ApplicationInfo[] apps = aInstallInfo.getApplications();
             if (apps != null && apps.length > 0)
@@ -568,7 +574,10 @@
                 {
                     for (int i = 0; i < apps.length; i++)
                     {
-                        createAppInfoLabel(apps[i].getName());
+                        createAppInfoLabel(
+                            InstallerUiTexts.get(
+                                InstallerUiTexts.APP_NAME,
+                                new String[] { apps[i].getName() }));
                     }
                 }
             }