=== modified file 'dhis-live/src/main/java/org/hisp/dhis/LiveMessagingService.java'
--- dhis-live/src/main/java/org/hisp/dhis/LiveMessagingService.java	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/LiveMessagingService.java	2010-09-18 12:33:38 +0000
@@ -44,33 +44,42 @@
     private static final String defaultLanguage = "en";
 
     private static final String defaultCountry = "GB";
-
-    private ResourceBundle getMessageBundle()
-    {
-        ResourceBundle messages;
-        String currentLanguage = TrayApp.appConfig.getLocaleLanguage();
-        String currentCountry = TrayApp.appConfig.getLocaleCountry();
-        Locale currentLocale = new Locale( currentLanguage, currentCountry );
+    private static final Locale defaultLocale = new Locale (defaultLanguage, defaultCountry);
+    private static final String messageLocation = "messages/messages";
+
+    private ResourceBundle getDefaultMessageBundle()
+    {
+        ResourceBundle messages;
+        messages = ResourceBundle.getBundle(messageLocation, defaultLocale);
+        return messages;
+    }
+
+    private ResourceBundle getMessageBundle(Locale currentLocale)
+    {
+        ResourceBundle messages;
+        messages = getDefaultMessageBundle();
         log.debug( "Current locale set to " + currentLocale.toString() );
         try
         {
-            messages = ResourceBundle.getBundle( "messages", currentLocale );
+            messages = ResourceBundle.getBundle( messageLocation, currentLocale );
         } catch ( Exception e )
         {
             //problem loading the desired resource bundle fall back to default
-            log.error( "The desired resource bundle could not be loaded. Using default" );
-            currentLocale = new Locale( defaultLanguage, defaultCountry );
-            messages = ResourceBundle.getBundle( "messages", currentLocale );
+            log.error( "The desired resource bundle could not be loaded." );
+            
         }
         return messages;
     }
 
     public String getString( String messageName )
     {
-        ResourceBundle messages = getMessageBundle();
+        String currentLanguage = TrayApp.appConfig.getLocaleLanguage();
+        String currentCountry = TrayApp.appConfig.getLocaleCountry();
+        Locale currentLocale = new Locale(currentLanguage,currentCountry);
+        ResourceBundle messages = getMessageBundle(currentLocale);
 
-        String returnMessage = null;
-        if ( messageName.isEmpty() )
+        String returnMessage = messageName;
+        if ( messageName.isEmpty() | messageName == null )
         {
             returnMessage = "messageName not valid";
             return returnMessage;
@@ -86,7 +95,7 @@
                 }
             } else
             {
-                returnMessage = "Message key " + messageName + " not found.";
+                returnMessage = getDefaultMessageBundle().getString( messageName );
             }
             return returnMessage;
         }

=== modified file 'dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java'
--- dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java	2010-09-17 11:47:18 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/SettingsWindow.java	2010-09-18 12:33:38 +0000
@@ -27,6 +27,7 @@
 package org.hisp.dhis;
 
 
+import java.util.ResourceBundle;
 import javax.swing.JOptionPane;
 import javax.swing.UIManager;
 import javax.swing.JFileChooser;
@@ -37,6 +38,7 @@
 
 public class SettingsWindow extends JFrame
 {
+    private static final LiveMessagingService messageService = new LiveMessagingService();
 
     public SettingsWindow()
     {
@@ -87,37 +89,37 @@
         saveButton = new javax.swing.JButton();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
-        setTitle("DHIS 2 Live - Settings");
+        setTitle(messageService.getString("settings.windowtitle"));
         setAlwaysOnTop(true);
         setResizable(false);
 
-        appConfigPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Application Configuration"));
+        appConfigPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(messageService.getString("settings.appconfig")));
 
-        portLabel.setText("Port:");
+        portLabel.setText(messageService.getString("settings.port"));
 
         org.jdesktop.beansbinding.Binding binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, org.jdesktop.beansbinding.ELProperty.create("${appConfiguration.port}"), portField, org.jdesktop.beansbinding.BeanProperty.create("text_ON_FOCUS_LOST"), "portBinding");
         bindingGroup.addBinding(binding);
 
-        hostLabel.setText("Host:");
+        hostLabel.setText(messageService.getString("settings.host"));
 
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, org.jdesktop.beansbinding.ELProperty.create("${appConfiguration.host}"), hostField, org.jdesktop.beansbinding.BeanProperty.create("text_ON_FOCUS_LOST"), "hostBinding");
         bindingGroup.addBinding(binding);
 
-        browserPathLabel.setText("Preferred Browser Path:");
+        browserPathLabel.setText(messageService.getString("settings.browserpath"));
 
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, org.jdesktop.beansbinding.ELProperty.create("${appConfiguration.preferredBrowser}"), browserPathField, org.jdesktop.beansbinding.BeanProperty.create("text_ON_FOCUS_LOST"), "browserPathBinding");
         bindingGroup.addBinding(binding);
 
-        browserPathButton.setText("Browse");
+        browserPathButton.setText(messageService.getString("settings.browse"));
         browserPathButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 browserPathButtonActionPerformed(evt);
             }
         });
 
-        langLabel.setText("Language:");
+        langLabel.setText(messageService.getString("settings.language"));
 
-        countryLabel.setText("Country:");
+        countryLabel.setText(messageService.getString("settings.country"));
 
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, org.jdesktop.beansbinding.ELProperty.create("${appConfiguration.localeLanguage}"), langField, org.jdesktop.beansbinding.BeanProperty.create("text_ON_FOCUS_LOST"), "langBinding");
         bindingGroup.addBinding(binding);
@@ -125,14 +127,14 @@
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, org.jdesktop.beansbinding.ELProperty.create("${appConfiguration.localeCountry}"), countryField, org.jdesktop.beansbinding.BeanProperty.create("text_ON_FOCUS_LOST"), "countryBinding");
         bindingGroup.addBinding(binding);
 
-        maxSizeLabel.setText("Max Form Content Size:");
+        maxSizeLabel.setText(messageService.getString("settings.maxformsize"));
 
         binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, org.jdesktop.beansbinding.ELProperty.create("${appConfiguration.maxFormContentSize}"), maxSizeField, org.jdesktop.beansbinding.BeanProperty.create("text"));
         bindingGroup.addBinding(binding);
 
-        maxSizeDefaultLabel.setText("(* requires restart of DHIS 2 Live - default: 200000)");
+        maxSizeDefaultLabel.setText(messageService.getString("settings.restartinfo"));
 
-        unitLabel.setText("(bytes)");
+        unitLabel.setText(messageService.getString("settings.bytes"));
 
         javax.swing.GroupLayout appConfigPanelLayout = new javax.swing.GroupLayout(appConfigPanel);
         appConfigPanel.setLayout(appConfigPanelLayout);
@@ -212,9 +214,9 @@
                 .addContainerGap())
         );
 
-        databaseConfigPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Database Configuration"));
+        databaseConfigPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(messageService.getString("settings.dbconfig")));
 
-        connTypePanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Connection Types"));
+        connTypePanel.setBorder(javax.swing.BorderFactory.createTitledBorder(messageService.getString("settings.conntypes")));
 
         connTypeTable.setColumnSelectionAllowed(true);
         connTypeTable.getTableHeader().setReorderingAllowed(false);
@@ -222,7 +224,7 @@
         org.jdesktop.beansbinding.ELProperty eLProperty = org.jdesktop.beansbinding.ELProperty.create("${databaseConfiguration.connectionTypes.connectionType}");
         org.jdesktop.swingbinding.JTableBinding jTableBinding = org.jdesktop.swingbinding.SwingBindings.createJTableBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, config, eLProperty, connTypeTable);
         org.jdesktop.swingbinding.JTableBinding.ColumnBinding columnBinding = jTableBinding.addColumnBinding(org.jdesktop.beansbinding.ELProperty.create("${id}"));
-        columnBinding.setColumnName("ID");
+        columnBinding.setColumnName(messageService.getString("ID"));
         columnBinding.setColumnClass(String.class);
         columnBinding = jTableBinding.addColumnBinding(org.jdesktop.beansbinding.ELProperty.create("${dialect}"));
         columnBinding.setColumnName("Dialect");
@@ -235,14 +237,14 @@
         connTypePane.setViewportView(connTypeTable);
         connTypeTable.getColumnModel().getSelectionModel().setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
 
-        connTypeAddButton.setText("Add");
+        connTypeAddButton.setText(messageService.getString("settings.add"));
         connTypeAddButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 connTypeAddButtonActionPerformed(evt);
             }
         });
 
-        connTypeDelButton.setText("Remove");
+        connTypeDelButton.setText(messageService.getString("settings.remove"));
         connTypeDelButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 connTypeDelButtonActionPerformed(evt);
@@ -274,7 +276,7 @@
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
-        connPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Connections"));
+        connPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(messageService.getString("settings.connections")));
 
         connTable.setColumnSelectionAllowed(true);
         connTable.getTableHeader().setReorderingAllowed(false);
@@ -307,14 +309,14 @@
         connTable.getColumnModel().getColumn(1).setCellRenderer(null);
         connTable.getColumnModel().getColumn(3).setPreferredWidth(60);
 
-        connAddButton.setText("Add");
+        connAddButton.setText(messageService.getString("settings.add"));
         connAddButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 connAddButtonActionPerformed(evt);
             }
         });
 
-        connDelButton.setText("Remove");
+        connDelButton.setText(messageService.getString("settings.remove"));
         connDelButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 connDelButtonActionPerformed(evt);
@@ -371,8 +373,8 @@
                 .addContainerGap())
         );
 
-        saveButton.setText("Save and Close");
-        saveButton.setToolTipText("Save and Close");
+        saveButton.setText(messageService.getString("settings.saveclose"));
+        saveButton.setToolTipText(messageService.getString("settings.saveclose"));
         saveButton.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 saveButtonActionPerformed(evt);

=== modified file 'dhis-live/src/main/java/org/hisp/dhis/TrayApp.java'
--- dhis-live/src/main/java/org/hisp/dhis/TrayApp.java	2010-09-17 11:47:18 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/TrayApp.java	2010-09-18 12:33:38 +0000
@@ -89,7 +89,7 @@
 
     private static final String RUNNING_ICON = "/icons/running.png";
 
-    private static LiveMessagingService messageService = new LiveMessagingService();
+    protected static LiveMessagingService messageService = new LiveMessagingService();
 
     private static TrayApp instance;
 
@@ -311,7 +311,7 @@
             @Override
             public void actionPerformed( ActionEvent e )
             {
-                String s = (String) JOptionPane.showInputDialog( null, "Name of the blank database: ", "Blank DB",
+                String s = (String) JOptionPane.showInputDialog( null, "menuitem.dbname", "Blank DB",
                     JOptionPane.QUESTION_MESSAGE );
                 Connection conn = new Connection();
                 conn.setId( s );
@@ -473,14 +473,17 @@
     private String defaultPreferredBrowserPath()
     {
         String preferredBrowserPath = appConfig.getPreferredBrowser();
+
+        if (preferredBrowserPath.length() > 0  )
+        {
         try
         {
-            log.info( "Config reports browser path to be" + preferredBrowserPath );
+            log.debug( "Config reports browser path to be" + preferredBrowserPath );
             boolean browserIsValid = new File( preferredBrowserPath ).exists();
             if ( !browserIsValid )
             {
-                preferredBrowserPath = null;
-                log.warn( "Browser does not appear to be valid.Please check that the browser exists." );
+                preferredBrowserPath = "";
+                log.info( "No preferred browser detected.Using default." );
             }
 
         } catch ( Exception e )
@@ -488,6 +491,9 @@
             log.warn( "There was a problem reading the preferred browser from the config file." );
         }
         log.info( "Preferred browser path reported to be " + preferredBrowserPath );
+
+        }
+        
         return preferredBrowserPath;
     }
 
@@ -498,7 +504,7 @@
     {
         String preferredBrowserPath = defaultPreferredBrowserPath();
 
-        if ( preferredBrowserPath != null )
+        if ( preferredBrowserPath.length() > 0 )
         {
             try
             {   //if the preferred browser has not been defined and appears to be valid
@@ -525,16 +531,15 @@
      * <preferredBrowser> tag
      */
     private void launchPreferredBrowser()
-    {   //initialize a return variable.false denotes failure.  true success
-        try
+    {
+        String preferredBrowserPath =  defaultPreferredBrowserPath();
+       
+        if ( preferredBrowserPath != null )
         {
-            String preferredBrowserPath = defaultPreferredBrowserPath();
-            String thisurl = getUrl();
-            log.info( "About to open " + thisurl + " with " + preferredBrowserPath );
-            String openPrefBrowser = ( preferredBrowserPath + " " + thisurl );
 
-            if ( preferredBrowserPath != null && thisurl != null )
-            {
+                    String thisurl = getUrl();
+                    log.debug( "About to open " + thisurl + " with " + preferredBrowserPath );
+                    String openPrefBrowser = ( preferredBrowserPath + " " + thisurl );
                 //try and launch the prefered browser
                 try
                 {
@@ -543,16 +548,12 @@
                 } catch ( IOException e )
                 {
                     log.error( "There was a problem opening the preferred browser. " + e );
-                    //Try and fall back to the default browser
-                    launchDefaultBrowser();
                 }
             }
-        } catch ( Exception ex )
-        {
-            log.error( "An error occurred while attempting to open the preferred browser " + ex );
-            //Try and fall back to the default browser
-            launchDefaultBrowser();
-        }
+        else
+            {
+                launchDefaultBrowser();
+            }
     }
 
     /**
@@ -668,6 +669,7 @@
             Marshaller m = jc.createMarshaller();
             m.setProperty( Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE );
             //Marshal object into file.
+            boolean confDirExists = createConfigDirectory();
             m.marshal( configElement, new FileOutputStream( installDir + CONFIG_FILE_NAME ) );
             log.info( "Config Saved at: " + installDir + CONFIG_FILE_NAME );
         } catch ( FileNotFoundException ex )
@@ -711,6 +713,7 @@
                 props.setProperty( "hibernate.connection.password", "" );
             }
             props.setProperty( "hibernate.hbm2ddl.auto", "update" );
+            boolean confDirExists = createConfigDirectory();
             props.store( new FileWriter( System.getProperty( "dhis2.home" ) + "/hibernate.properties" ), "DHIS2 Live Created" );
             log.info( "Hibernate properties written at: " + System.getProperty( "dhis2.home" ) + "/hibernate.properties" );
         } catch ( IOException ioex )
@@ -720,4 +723,24 @@
             System.exit( 1 );
         }
     }
+    private boolean createConfigDirectory()
+    {
+
+        File   fileDirectory = new File(getInstallDir() + "/conf");
+        boolean success = fileDirectory.exists();
+        if ( !success )
+                 {
+                    try
+                    {
+                        success = fileDirectory.mkdir();
+
+                     }
+                    catch (Exception e)
+                    {
+                        log.error ("Could not create config directory");
+                    }
+                }
+         return success;
+        }
+    
 }

=== added directory 'dhis-live/src/main/resources/messages'
=== added file 'dhis-live/src/main/resources/messages/messages_de.properties'
--- dhis-live/src/main/resources/messages/messages_de.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_de.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,15 @@
+menuitem.open=Open dhis 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=Ausgang
+menuitem.settings=Einstellungen
+menuitem.database=Datenbanken
+dialogbox.unsupportedPlatform=System Tray nicht unterst\u00c3\u00bctzt auf dieser Plattform
+dialogbox.initFailure=DHIS2-live nicht \ nWenden Protokoll f\u00c3\u00bcr Details zu initialisieren
+dialogbox.webserverFailure=Web-Server nicht gestartet werden - siehe Protokolle f\u00c3\u00bcr Details
+notification.started=Started
+notification.startedDetails=Dhis 2 l\u00c3\u00a4uft. Ihr Browser wird \ n hingewiesen werden
+notification.starting=Beginnend
+notification.startingDetails=Dhis 2 ist ab. \ NBitte geduldig zu sein.
+notification.stopped=Gestoppt
+notification.stoppedDetails=Dhis 2 hat aufgeh\u00c3\u00b6rt.
+tooltip.running=Dhis 2 Server laufen

=== added file 'dhis-live/src/main/resources/messages/messages_en_GB.properties'
--- dhis-live/src/main/resources/messages/messages_en_GB.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_en_GB.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,40 @@
+menuitem.open=Open DHIS 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=Exit
+menuitem.settings=Settings
+menuitem.database=Databases
+menuitem.dbname= Name of the blank database
+
+dialogbox.unsupportedPlatform = System Tray not supported on this platform
+dialogbox.initFailure = DHIS2-live failed to initialize\nSee log for details
+dialogbox.webserverFailure = Web server failed to start - see logs for details
+
+notification.started = Started
+notification.startedDetails = DHIS 2 is running. Your browser will\n be pointed to
+notification.starting = Starting
+notification.startingDetails = DHIS 2 is starting.\nPlease be patient.
+notification.stopped = Stopped
+notification.stoppedDetails = DHIS 2 has stopped.
+
+tooltip.running = DHIS 2 Server running
+#org.hisp.dhis.SettingsWindow
+settings.windowtitle=DHIS 2 Live - Settings
+settings.appconfig=Application Configuration'
+settings.port=Port:
+settings.host=Host:
+settings.browserpath="Preferred Browser Path:
+settings.browse=Browse
+settings.language=Language:
+settings.country=Country:
+settings.maxformsize=Max Form Content Size:
+settings.restartinfo=(* requires restart of DHIS 2 Live - default: 200000)
+settings.bytes=(bytes)
+settings.dbconfig= Database Configuration
+settings.conntypes=Connection Types
+settings.remove=Remove
+settings.connections=Connections:
+settings.add=Add
+settings.saveclose=Save and close
+
+ID=ID
+REMOVE=Remove

=== added file 'dhis-live/src/main/resources/messages/messages_es.properties'
--- dhis-live/src/main/resources/messages/messages_es.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_es.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,15 @@
+menuitem.open=Abrir DHIS 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=Salida
+menuitem.settings=Configuraci\u00c3\u00b3n
+menuitem.database=Bases de datos
+dialogbox.unsupportedPlatform=La bandeja del sistema no se admite en esta plataforma
+dialogbox.initFailure=DHIS2-live no se pudo inicializar \ log nConsulte para obtener m\u00c3\u00a1s detalles
+dialogbox.webserverFailure=servidor Web no se pudo iniciar - ver los registros de datos
+notification.started=Introducci\u00c3\u00b3n
+notification.startedDetails=DHIS 2 est\u00c3\u00a1 en ejecuci\u00c3\u00b3n. Su navegador \ n se refiri\u00c3\u00b3 a
+notification.starting=A partir
+notification.startingDetails=DHIS 2 se est\u00c3\u00a1 iniciando. \ NPor favor, sea paciente.
+notification.stopped=Detenido
+notification.stoppedDetails=DHIS 2 se ha detenido.
+tooltip.running=DHIS 2 Server que se ejecuta

=== added file 'dhis-live/src/main/resources/messages/messages_fr.properties'
--- dhis-live/src/main/resources/messages/messages_fr.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_fr.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,35 @@
+menuitem.open= Open H2 database
+menuitem.blank=Blank H2 database
+menuitem.exit=Sortie
+menuitem.settings=Param\u00e8tres
+menuitem.database=Bases de donn\u00e9es
+dialogbox.unsupportedPlatform=System Tray pas support\u00e9 sur cette plate-forme
+dialogbox.initFailure=DHIS2-live n'a pas pu initialiser\nVoir log pour plus de d\u00e9tails
+dialogbox.webserverFailure=serveur Web n'a pas pu d\u00e9marrer - voir les logs pour plus de d\u00e9tails
+notification.started=En route
+notification.startedDetails=DHIS2 est en cours d'ex\u00e9cution. Votre navigateur \n lieu de relever \u00e0
+notification.starting=\u00c0 partir
+notification.startingDetails=DHIS2 est de d\u00e9part. \nVeuillez \u00eatre patient.
+notification.startingDetails = DHIS22 est de d\u00e9part. \nVeuillez \u00eatre patient.
+notification.stopped = Arr\u00eat\u00e9
+notification.stoppedDetails = DHIS 2 a cess\u00e9.
+
+
+
+settings.windowtitle = DHIS 2 Live - Param\u00e8tres
+settings.appconfig = Application Configuration '
+settings.port = Port:
+settings.host = Host:
+settings.browserpath = Pr\u00e9f\u00e9r\u00e9s navigateur Path:
+settings.browse = Parcourir
+settings.language = Langue:
+settings.country = Pays:
+settings.maxformsize = Taille maximum de contenu d'un formulaire:
+settings.restartinfo = (* n\u00e9cessite un red\u00e9marrage de DHIS 2 Live - par d\u00e9faut: 200000)
+settings.bytes = (octets)
+settings.dbconfig = Base de donn\u00e9es de configuration
+settings.conntypes = Les types de connexion
+
+settings.connections = Connexions =:
+settings.add = Ajouter
+settings.saveclose = Enregistrer et fermer
\ No newline at end of file

=== added file 'dhis-live/src/main/resources/messages/messages_pt.properties'
--- dhis-live/src/main/resources/messages/messages_pt.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_pt.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,15 @@
+menuitem.open=Open DHIS 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=Sa\u00c3\u00adda
+menuitem.settings=Configura\u00c3\u00a7\u00c3\u00b5es
+menuitem.database=Bases de dados
+dialogbox.unsupportedPlatform=Bandeja do sistema n\u00c3\u00a3o \u00c3\u00a9 suportado nesta plataforma
+dialogbox.initFailure=DHIS2 vivo falhou ao inicializar \ log nConsulte para detalhes
+dialogbox.webserverFailure=servidor Web falhou ao iniciar - ver logs para obter detalhes
+notification.started=Come\u00c3\u00a7ado
+notification.startedDetails=DHIS 2 est\u00c3\u00a1 funcionando. Seu navegador \ n ser apontado
+notification.starting=Come\u00c3\u00a7ando
+notification.startingDetails=DHIS 2 est\u00c3\u00a1 de partida. \ NPor favor, seja paciente.
+notification.stopped=Parado
+notification.stoppedDetails=DHIS 2 parou.
+tooltip.running=DHIS 2 Server executando

=== added file 'dhis-live/src/main/resources/messages/messages_ru.properties'
--- dhis-live/src/main/resources/messages/messages_ru.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_ru.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,15 @@
+menuitem.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c DHIS 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=\u0412\u044b\u0445\u043e\u0434
+menuitem.settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
+menuitem.database=\u0411\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445
+dialogbox.unsupportedPlatform=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u043b\u043e\u0442\u043e\u043a \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043d\u0430 \u044d\u0442\u043e\u0439 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435
+dialogbox.initFailure=DHIS2-\u0436\u0438\u0442\u044c \u043d\u0435 \u0441\u043c\u043e\u0433 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \ nSee \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435
+dialogbox.webserverFailure=\u0412\u0435\u0431-\u0441\u0435\u0440\u0432\u0435\u0440 \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c - \u0441\u043c. \u0436\u0443\u0440\u043d\u0430\u043b\u044b \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435
+notification.started=\u0420\u0430\u0431\u043e\u0442\u044b
+notification.startedDetails=DHIS 2 \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442. \u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \ \u043f, \u0447\u0442\u043e\u0431\u044b \u043e\u0442\u043c\u0435\u0442\u0438\u0442\u044c
+notification.starting=\u041e\u0442\u043f\u0440\u0430\u0432\u043d\u043e\u0439
+notification.startingDetails=DHIS 2 \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442\u0441\u044f. \u0425\u043f\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0431\u0443\u0434\u044c\u0442\u0435 \u0442\u0435\u0440\u043f\u0435\u043b\u0438\u0432\u044b.
+notification.stopped=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0432\u0448\u0438\u0439\u0441\u044f
+notification.stoppedDetails=DHIS 2 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0441\u044f.
+tooltip.running=DHIS 2 Server \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442

=== added file 'dhis-live/src/main/resources/messages/messages_sw.properties'
--- dhis-live/src/main/resources/messages/messages_sw.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_sw.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,15 @@
+menuitem.open=Open DHIS 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=Exit
+menuitem.settings=Vipimo
+menuitem.database=Databaser
+dialogbox.unsupportedPlatform=Mfumo tray si mkono kwenye jukwaa hili
+dialogbox.initFailure=DHIS2-kuishi alishindwa initialize \ nSee logi kwa maelezo
+dialogbox.webserverFailure=Web server alishindwa kuanza - angalia magogo kwa maelezo
+notification.started=Started
+notification.startedDetails=DHIS 2 anakimbia. browser yako \ n kuelekezwa kwa
+notification.starting=Kuanzia
+notification.startingDetails=DHIS 2 ni kuanzia \ nPlease kuwa na subira..
+notification.stopped=Kusimamishwa
+notification.stoppedDetails=DHIS 2 kimesimama.
+tooltip.running=DHIS 2 Server mbio

=== added file 'dhis-live/src/main/resources/messages/messages_vi.properties'
--- dhis-live/src/main/resources/messages/messages_vi.properties	1970-01-01 00:00:00 +0000
+++ dhis-live/src/main/resources/messages/messages_vi.properties	2010-09-18 12:33:38 +0000
@@ -0,0 +1,15 @@
+menuitem.open=M\u1edf DHIS 2 Live
+menuitem.blank=Blank H2 database
+menuitem.exit=Ra
+menuitem.settings=C\u00e0i \u0111\u1eb7t
+menuitem.database=C\u01a1 s\u1edf d\u1eef li\u1ec7u
+dialogbox.unsupportedPlatform=Khay h\u1ec7 th\u1ed1ng kh\u00f4ng h\u1ed7 tr\u1ee3 tr\u00ean n\u1ec1n t\u1ea3ng n\u00e0y
+dialogbox.initFailure=DHIS2-s\u1ed1ng kh\u00f4ng th\u1ec3 kh\u1edfi t\u1ea1o \ log nSee \u0111\u1ec3 bi\u1ebft chi ti\u1ebft
+dialogbox.webserverFailure=Web server kh\u00f4ng th\u00e0nh c\u00f4ng \u0111\u1ec3 b\u1eaft \u0111\u1ea7u - xem nh\u1eadt k\u00fd \u0111\u1ec3 bi\u1ebft chi ti\u1ebft
+notification.started=B\u1eaft \u0111\u1ea7u
+notification.startedDetails=DHIS 2 \u0111ang ch\u1ea1y. Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n s\u1ebd \ n \u0111\u01b0\u1ee3c ch\u1ec9 ra
+notification.starting=B\u1eaft \u0111\u1ea7u
+notification.startingDetails=DHIS 2 l\u00e0 b\u1eaft \u0111\u1ea7u. \ NH\u00e3y \u0111\u01b0\u1ee3c b\u1ec7nh nh\u00e2n.
+notification.stopped=Ng\u01b0ng
+notification.stoppedDetails=DHIS 2 \u0111\u00e3 ng\u1eebng.
+tooltip.running=2 DHIS m\u00e1y ch\u1ee7 \u0111ang ch\u1ea1y

=== removed file 'dhis-live/src/main/resources/messages_de.properties'
--- dhis-live/src/main/resources/messages_de.properties	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/resources/messages_de.properties	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-menuitem.open=Open dhis 2 Live
-menuitem.blank=Blank H2 database
-menuitem.exit=Ausgang
-menuitem.settings=Einstellungen
-menuitem.database=Datenbanken
-dialogbox.unsupportedPlatform=System Tray nicht unterst\u00c3\u00bctzt auf dieser Plattform
-dialogbox.initFailure=DHIS2-live nicht \ nWenden Protokoll f\u00c3\u00bcr Details zu initialisieren
-dialogbox.webserverFailure=Web-Server nicht gestartet werden - siehe Protokolle f\u00c3\u00bcr Details
-notification.started=Started
-notification.startedDetails=Dhis 2 l\u00c3\u00a4uft. Ihr Browser wird \ n hingewiesen werden
-notification.starting=Beginnend
-notification.startingDetails=Dhis 2 ist ab. \ NBitte geduldig zu sein.
-notification.stopped=Gestoppt
-notification.stoppedDetails=Dhis 2 hat aufgeh\u00c3\u00b6rt.
-tooltip.running=Dhis 2 Server laufen

=== removed file 'dhis-live/src/main/resources/messages_en_GB.properties'
--- dhis-live/src/main/resources/messages_en_GB.properties	2010-09-16 08:17:27 +0000
+++ dhis-live/src/main/resources/messages_en_GB.properties	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-menuitem.open = Open DHIS 2 Live
-menuitem.blank = Blank H2 database
-menuitem.exit = Exit
-menuitem.settings = Settings
-menuitem.database = Databases
-
-dialogbox.unsupportedPlatform = System Tray not supported on this platform
-dialogbox.initFailure = DHIS2-live failed to initialize\nSee log for details
-dialogbox.webserverFailure = Web server failed to start - see logs for details
-
-notification.started = Started
-notification.startedDetails = DHIS 2 is running. Your browser will\n be pointed to
-notification.starting = Starting
-notification.startingDetails = DHIS 2 is starting.\nPlease be patient.
-notification.stopped = Stopped
-notification.stoppedDetails = DHIS 2 has stopped.
-
-tooltip.running = DHIS 2 Server running
\ No newline at end of file

=== removed file 'dhis-live/src/main/resources/messages_es.properties'
--- dhis-live/src/main/resources/messages_es.properties	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/resources/messages_es.properties	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-menuitem.open=Abrir DHIS 2 Live
-menuitem.blank=Blank H2 database
-menuitem.exit=Salida
-menuitem.settings=Configuraci\u00c3\u00b3n
-menuitem.database=Bases de datos
-dialogbox.unsupportedPlatform=La bandeja del sistema no se admite en esta plataforma
-dialogbox.initFailure=DHIS2-live no se pudo inicializar \ log nConsulte para obtener m\u00c3\u00a1s detalles
-dialogbox.webserverFailure=servidor Web no se pudo iniciar - ver los registros de datos
-notification.started=Introducci\u00c3\u00b3n
-notification.startedDetails=DHIS 2 est\u00c3\u00a1 en ejecuci\u00c3\u00b3n. Su navegador \ n se refiri\u00c3\u00b3 a
-notification.starting=A partir
-notification.startingDetails=DHIS 2 se est\u00c3\u00a1 iniciando. \ NPor favor, sea paciente.
-notification.stopped=Detenido
-notification.stoppedDetails=DHIS 2 se ha detenido.
-tooltip.running=DHIS 2 Server que se ejecuta

=== removed file 'dhis-live/src/main/resources/messages_fr.properties'
--- dhis-live/src/main/resources/messages_fr.properties	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/resources/messages_fr.properties	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-menuitem.open=Open DHIS 2 Live
-menuitem.blank=Blank H2 database
-menuitem.exit=Sortie
-menuitem.settings=Param\u00c3\u00a8tres
-menuitem.database=Bases de donn\u00c3\u00a9es
-dialogbox.unsupportedPlatform=Barre d&#39;\u00c3\u00a9tat syst\u00c3\u00a8me n&#39;est pas support\u00c3\u00a9 sur cette plate-forme
-dialogbox.initFailure=DHIS2-live n&#39;a pas pu initialiser \ log nContactez pour plus de d\u00c3\u00a9tails
-dialogbox.webserverFailure=serveur Web n&#39;a pas pu d\u00c3\u00a9marrer - voir les journaux pour plus de d\u00c3\u00a9tails
-notification.started=En route
-notification.startedDetails=DHIS 2 est en cours d&#39;ex\u00c3\u00a9cution. Votre navigateur n \ \u00c3\u00aatre soulign\u00c3\u00a9
-notification.starting=D\u00c3\u00a9part
-notification.startingDetails=DHIS 2 est de d\u00c3\u00a9part. \ NVeuillez \u00c3\u00aatre patient.
-notification.stopped=Arr\u00c3\u00aat\u00c3\u00a9
-notification.stoppedDetails=DHIS 2 a cess\u00c3\u00a9.
-tooltip.running=DHIS 2 Server en cours d&#39;ex\u00c3\u00a9cution

=== removed file 'dhis-live/src/main/resources/messages_pt.properties'
--- dhis-live/src/main/resources/messages_pt.properties	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/resources/messages_pt.properties	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-menuitem.open=Open DHIS 2 Live
-menuitem.blank=Blank H2 database
-menuitem.exit=Sa\u00c3\u00adda
-menuitem.settings=Configura\u00c3\u00a7\u00c3\u00b5es
-menuitem.database=Bases de dados
-dialogbox.unsupportedPlatform=Bandeja do sistema n\u00c3\u00a3o \u00c3\u00a9 suportado nesta plataforma
-dialogbox.initFailure=DHIS2 vivo falhou ao inicializar \ log nConsulte para detalhes
-dialogbox.webserverFailure=servidor Web falhou ao iniciar - ver logs para obter detalhes
-notification.started=Come\u00c3\u00a7ado
-notification.startedDetails=DHIS 2 est\u00c3\u00a1 funcionando. Seu navegador \ n ser apontado
-notification.starting=Come\u00c3\u00a7ando
-notification.startingDetails=DHIS 2 est\u00c3\u00a1 de partida. \ NPor favor, seja paciente.
-notification.stopped=Parado
-notification.stoppedDetails=DHIS 2 parou.
-tooltip.running=DHIS 2 Server executando

=== removed file 'dhis-live/src/main/resources/messages_ru.properties'
--- dhis-live/src/main/resources/messages_ru.properties	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/resources/messages_ru.properties	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-menuitem.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c DHIS 2 Live
-menuitem.blank=Blank H2 database
-menuitem.exit=\u0412\u044b\u0445\u043e\u0434
-menuitem.settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-menuitem.database=\u0411\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445
-dialogbox.unsupportedPlatform=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u043b\u043e\u0442\u043e\u043a \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u043d\u0430 \u044d\u0442\u043e\u0439 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435
-dialogbox.initFailure=DHIS2-\u0436\u0438\u0442\u044c \u043d\u0435 \u0441\u043c\u043e\u0433 \u0438\u043d\u0438\u0446\u0438\u0430\u043b\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u0442\u044c \ nSee \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435
-dialogbox.webserverFailure=\u0412\u0435\u0431-\u0441\u0435\u0440\u0432\u0435\u0440 \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c - \u0441\u043c. \u0436\u0443\u0440\u043d\u0430\u043b\u044b \u043f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435
-notification.started=\u0420\u0430\u0431\u043e\u0442\u044b
-notification.startedDetails=DHIS 2 \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442. \u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \ \u043f, \u0447\u0442\u043e\u0431\u044b \u043e\u0442\u043c\u0435\u0442\u0438\u0442\u044c
-notification.starting=\u041e\u0442\u043f\u0440\u0430\u0432\u043d\u043e\u0439
-notification.startingDetails=DHIS 2 \u043d\u0430\u0447\u0438\u043d\u0430\u0435\u0442\u0441\u044f. \u0425\u043f\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0431\u0443\u0434\u044c\u0442\u0435 \u0442\u0435\u0440\u043f\u0435\u043b\u0438\u0432\u044b.
-notification.stopped=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0432\u0448\u0438\u0439\u0441\u044f
-notification.stoppedDetails=DHIS 2 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043b\u0441\u044f.
-tooltip.running=DHIS 2 Server \u0440\u0430\u0431\u043e\u0442\u0430\u0435\u0442

=== removed file 'dhis-live/src/main/resources/messages_sw.properties'
--- dhis-live/src/main/resources/messages_sw.properties	2010-09-14 22:43:21 +0000
+++ dhis-live/src/main/resources/messages_sw.properties	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-menuitem.open=Open DHIS 2 Live
-menuitem.blank=Blank H2 database
-menuitem.exit=Exit
-menuitem.settings=Vipimo
-menuitem.database=Databaser
-dialogbox.unsupportedPlatform=Mfumo tray si mkono kwenye jukwaa hili
-dialogbox.initFailure=DHIS2-kuishi alishindwa initialize \ nSee logi kwa maelezo
-dialogbox.webserverFailure=Web server alishindwa kuanza - angalia magogo kwa maelezo
-notification.started=Started
-notification.startedDetails=DHIS 2 anakimbia. browser yako \ n kuelekezwa kwa
-notification.starting=Kuanzia
-notification.startingDetails=DHIS 2 ni kuanzia \ nPlease kuwa na subira..
-notification.stopped=Kusimamishwa
-notification.stoppedDetails=DHIS 2 kimesimama.
-tooltip.running=DHIS 2 Server mbio

=== removed file 'dhis-live/src/main/resources/messages_vi.properties'
--- dhis-live/src/main/resources/messages_vi.properties	2010-09-16 08:17:27 +0000
+++ dhis-live/src/main/resources/messages_vi.properties	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-menuitem.open = M\u1edf DHIS 2 Live
-menuitem.blank = Kh\u1edfi t\u1ea1o C\u01a1 s\u1edf d\u1eef li\u1ec7u H2 r\u1ed7ng
-menuitem.exit = Tho\u00e1t
-menuitem.settings = Thi\u1ebft l\u1eadp
-menuitem.database = C\u01a1 s\u1edf d\u1eef li\u1ec7u
-
-dialogbox.unsupportedPlatform = Khay h\u1ec7 th\u1ed1ng kh\u00f4ng h\u1ed7 tr\u1ee3 tr\u00ean n\u1ec1n t\u1ea3ng n\u00e0y
-dialogbox.initFailure = DHIS2-Live kh\u00f4ng th\u1ec3 kh\u1edfi t\u1ea1o \nXem nh\u1eadt k\u00fd (log) \u0111\u1ec3 bi\u1ebft th\u00eam chi ti\u1ebft
-dialogbox.webserverFailure = Kh\u00f4ng th\u1ec3 kh\u1edfi \u0111\u1ed9ng Web server - xem nh\u1eadt k\u00fd (log) \u0111\u1ec3 bi\u1ebft th\u00eam chi ti\u1ebft
-
-notification.started = \u0110\u00e3 kh\u1edfi \u0111\u1ed9ng
-notification.startedDetails = DHIS 2 \u0111ang ch\u1ea1y. Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n s\u1ebd\n \u0111\u01b0\u1ee3c tr\u1ecf t\u1edbi
-notification.starting = \u0110ang kh\u1edfi \u0111\u1ed9ng
-notification.startingDetails = DHIS 2 \u0111ang kh\u1edfi \u0111\u1ed9ng.\nVui l\u00f2ng ch\u1edd
-notification.stopped = Ng\u01b0ng
-notification.stoppedDetails = DHIS 2 \u0111\u00e3 ng\u1eebng ch\u1ea1y.
-
-tooltip.running = M\u00e1y ch\u1ee7 DHIS \u0111ang ch\u1ea1y

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml	2010-09-15 09:44:37 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml	2010-09-18 12:33:38 +0000
@@ -2,19 +2,21 @@
     <shortName>DHIS2</shortName>
     <fullName>DHIS2</fullName>
     <version>2.0.4</version>
-    <installerFilename>${product_shortname}-${product_version}-${platform_name}-lite-JRE.${platform_exec_suffix}</installerFilename>
+    <installerFilename>${product_shortname}-${product_version}-${platform_name}-JRE-fr.${platform_exec_suffix}</installerFilename>
     <readmeFile>../../resources/files/Readme.txt</readmeFile>
     <licenseFile>../../resources/files/Licence.txt</licenseFile>
     <leftImage>../../resources/images/dhis2-logo-rotated.png</leftImage>
     <logoImage>../../resources/images/dhis2-logo.png</logoImage>
     <splashImage>../../resources/images/dhis2-logo.png</splashImage>
+    <defaultLanguage>fr</defaultLanguage>
+    <allowLanguageSelection>1</allowLanguageSelection>
     <preBuildActionList>
         <copyFile>
             <destination>${build_project_directory}/temp/</destination>
             <origin>${env(DHIS2_SRC)}/dhis-2/dhis-web/dhis-web-portal/target/dhis.war</origin>
         </copyFile>
         <copyFile>
-            <destination>${build_project_directory}/temp/dhis2-live.jar</destination>
+            <destination>${build_project_directory}/temp/dhis2-live-jar-with-dependencies.jar</destination>
             <origin>${env(DHIS2_SRC)}/dhis-live/target/dhis2-live-jar-with-dependencies.jar</origin>
         </copyFile>
         <copyFile>
@@ -72,7 +74,7 @@
                             <origin>../../resources/conf</origin>
                         </distributionDirectory>
                         <distributionFile>
-                            <origin>temp/dhis2-live.jar</origin>
+                            <origin>temp/dhis2-live-jar-with-dependencies.jar</origin>
                         </distributionFile>
                     </distributionFileList>
                     <shortcutList>