Changeset 5349


Ignore:
Timestamp:
2003-08-29T11:21:01+12:00 (21 years ago)
Author:
mdewsnip
Message:

Changed dictionary get()s to have the whole key.

Location:
trunk/gli/src/org/greenstone/gatherer
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/gli/src/org/greenstone/gatherer/GAuthenticator.java

    r5335 r5349  
    8282    protected PasswordAuthentication getPasswordAuthentication() {
    8383    // Component definition.
    84     dialog = new JDialog (Gatherer.g_man, get("Title"), true);
     84    dialog = new JDialog (Gatherer.g_man, get("GAuthenticator.Title"), true);
    8585    dialog.setModal(true);
    8686    dialog.setSize(SIZE);
    … …  
    8888    JLabel title_label = new JLabel(getRequestingPrompt());
    8989    JPanel user_panel = new JPanel();
    90     JLabel username_label = new JLabel(get("Username"));
     90    JLabel username_label = new JLabel(get("GAuthenticator.Username"));
    9191    JTextField username = new JTextField();
    9292    JPanel password_panel = new JPanel();
    93     JLabel password_label = new JLabel(get("Password"));
     93    JLabel password_label = new JLabel(get("GAuthenticator.Password"));
    9494    password = new JPasswordField();
    9595    password.setEchoChar ('*');

  • trunk/gli/src/org/greenstone/gatherer/gui/LockFileDialog.java

    r4675 r5349  
    3232
    3333    public LockFileDialog(JFrame parent, String name, File lock_file) {
    34     super(parent, get("Title"), true);
     34    super(parent, get("LockFileDialog.Title"), true);
    3535    setSize(SIZE);
    3636    setJMenuBar(new SimpleMenuBar("2.3"));
    … …  
    4646    JPanel title_pane = new JPanel();
    4747    JLabel title_one_label = new JLabel(get("General.Warning"));
    48     JLabel title_two_label = new JLabel(get("Lockfile_Message_One"));
     48    JLabel title_two_label = new JLabel(get("LockFileDialog.Lockfile_Message_One"));
    4949    JPanel central_pane = new JPanel();
    5050    JPanel name_pane = new JPanel();
    51     JLabel name_label = new JLabel(get("Name"));
     51    JLabel name_label = new JLabel(get("LockFileDialog.Name"));
    5252    name_label.setPreferredSize(LABEL_SIZE);
    5353    TextFieldLabel name_field = new TextFieldLabel(name);
    5454    name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    5555    JPanel person_pane = new JPanel();
    56     JLabel person_label = new JLabel(get("User"));
     56    JLabel person_label = new JLabel(get("LockFileDialog.User"));
    5757    person_label.setPreferredSize(LABEL_SIZE);
    5858    TextFieldLabel person_field = new TextFieldLabel(getValue("User"));
    5959    person_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    6060    JPanel machine_pane = new JPanel();
    61     JLabel machine_label = new JLabel(get("Machine"));
     61    JLabel machine_label = new JLabel(get("LockFileDialog.Machine"));
    6262    machine_label.setPreferredSize(LABEL_SIZE);
    6363    TextFieldLabel machine_field = new TextFieldLabel(getValue("Machine"));
    6464    machine_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    6565    JPanel created_pane = new JPanel();
    66     JLabel created_label = new JLabel(get("Date"));
     66    JLabel created_label = new JLabel(get("LockFileDialog.Date"));
    6767    created_label.setPreferredSize(LABEL_SIZE);
    6868    TextFieldLabel created_field = new TextFieldLabel(getValue("Date"));
    6969    created_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    70     JLabel central_label = new JLabel(get("Lockfile_Message_Two"));
     70    JLabel central_label = new JLabel(get("LockFileDialog.Lockfile_Message_Two"));
    7171    JPanel button_pane = new JPanel();
    7272    ok_button = new JButton(get("General.OK"));
    … …  
    145145    }
    146146    else {
    147         value = get("Error");
     147        value = get("LockFileDialog.Error");
    148148    }
    149149    return value;

  • trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java

    r5289 r5349  
    10131013
    10141014        JPanel value_pane = new JPanel();
    1015         JLabel value_label = new JLabel(get("Value"));
     1015        JLabel value_label = new JLabel(get("MetaEdit.Value"));
    10161016        value_label.setPreferredSize(VALUE_LABEL_SIZE);
    10171017
    … …  
    10281028
    10291029        JPanel tree_pane = new JPanel();
    1030         JLabel tree_label = new JLabel(get("Tree"));
     1030        JLabel tree_label = new JLabel(get("MetaEdit.Tree"));
    10311031
    10321032        tree = new JTree(new GValueModel());
    … …  
    11341134        String[] args = new String[1];
    11351135        args[0] = selected_metadata_element.toString();
    1136         extracted_message.setText(get("AutoMessage", args));
     1136        extracted_message.setText(get("MetaEdit.AutoMessage", args));
    11371137        card_layout.show(this, NONE);
    11381138        card_showing = NONE;

  • trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

    r5312 r5349  
    4545    setJMenuBar(new SimpleMenuBar("2.1"));
    4646    setSize(size);
    47     setTitle(get("Title"));
     47    setTitle(get("NewCollectionPrompt.Title"));
    4848    // Model building. Build a model of all of the collections in the gsdl collect directory with the appropriate directories and hardcode the big five.
    4949    Vector base_collection_model = new Vector();
    … …  
    7272    // Sort the result.
    7373    Collections.sort(base_collection_model);
    74     base_collection_model.add(0, new Item(null, get("NewCollection")));
     74    base_collection_model.add(0, new Item(null, get("NewCollectionPrompt.NewCollection")));
    7575    // Creation.
    7676    JPanel content_pane = (JPanel) getContentPane();
    … …  
    7878    JPanel upper_pane = new JPanel();
    7979    upper_pane.setOpaque(false);
    80     JLabel instructions_label = new JLabel(get("Instructions"));
     80    JLabel instructions_label = new JLabel(get("NewCollectionPrompt.Instructions"));
    8181    instructions_label.setOpaque(false);
    8282    JPanel title_pane = new JPanel();
    8383    title_pane.setOpaque(false);
    84     JLabel title_label = new JLabel(get("Collection_Title"));
     84    JLabel title_label = new JLabel(get("NewCollectionPrompt.Collection_Title"));
    8585    title_label.setOpaque(false);
    8686    title = new JTextField();
    8787    JPanel name_pane = new JPanel();
    8888    name_pane.setOpaque(false);
    89     JLabel name_label = new JLabel(get("Collection_Name"));
     89    JLabel name_label = new JLabel(get("NewCollectionPrompt.Collection_Name"));
    9090    name_label.setOpaque(false);
    9191    JPanel file_pane = new JPanel();
    … …  
    9696    JPanel email_pane = new JPanel();
    9797    email_pane.setOpaque(false);
    98     JLabel email_label = new JLabel(get("Collection_Email"));
     98    JLabel email_label = new JLabel(get("NewCollectionPrompt.Collection_Email"));
    9999    email_label.setOpaque(false);
    100100    JPanel host_pane = new JPanel();
    … …  
    109109    JPanel description_pane = new JPanel();
    110110    description_pane.setOpaque(false);
    111     JLabel description_label = new JLabel(get("Collection_Description"));
     111    JLabel description_label = new JLabel(get("NewCollectionPrompt.Collection_Description"));
    112112    description_label.setOpaque(false);
    113113    description = new JTextArea();
    … …  
    119119    // Base Collection
    120120    JPanel base_collection_pane = new JPanel();
    121     JLabel base_collection_label = new JLabel(get("Base_Collection"));
     121    JLabel base_collection_label = new JLabel(get("NewCollectionPrompt.Base_Collection"));
    122122    base_collection = new JComboBox(base_collection_model);
    123123    // JButton base_collection_browse = new JButton(get("General.Browse"));
    … …  
    311311        title_final = title.getText();
    312312        if(title_final.length() == 0) {
    313         GPrompt err_msg = new GPrompt(self, get("Error"), get("Title_Error"), "error.gif", null);
     313        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Title_Error"), "error.gif", null);
    314314        err_msg.display();
    315315        err_msg.destroy();
    … …  
    326326        for(int i = 0; children != null && i < children.length; i++) {
    327327            if(children[i].getName().equals(name_final)) {
    328             GPrompt err_msg = new GPrompt(self, get("Error"), get("Name_Error"), "error.gif", null);
     328            GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Name_Error"), "error.gif", null);
    329329            err_msg.display();
    330330            err_msg.destroy();
    … …  
    337337        }
    338338        else {
    339         GPrompt err_msg = new GPrompt(self, get("Error"), get("Name_Error"), "error.gif", null);
     339        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Name_Error"), "error.gif", null);
    340340        err_msg.display();
    341341        err_msg.destroy();
    … …  
    347347        email_final = address.getText() + "@" + host.getText();
    348348        if(email_final.length() == 0 || email_final.startsWith("@") || email_final.endsWith("@")) {
    349         GPrompt err_msg = new GPrompt(self, get("Error"), get("Email_Error"), "error.gif", null);
     349        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Email_Error"), "error.gif", null);
    350350        err_msg.display();
    351351        err_msg.destroy();
    … …  
    359359        description_final = description.getText();
    360360        if(description_final.length() == 0) {
    361         GPrompt err_msg = new GPrompt(self, get("Error"), get("Description_Error"), "error.gif", null);
     361        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Description_Error"), "error.gif", null);
    362362        err_msg.display();
    363363        err_msg.destroy();

  • trunk/gli/src/org/greenstone/gatherer/gui/OptionsBox.java

    r4675 r5349  
    8080
    8181    this.setModal(true);
    82     this.setTitle(get("Title"));
     82    this.setTitle(get("Options.Title"));
    8383    this.setSize(SIZE);
    8484
    … …  
    9191    tab_pane = new JTabbedPane();
    9292
    93     tab_pane.add(get("General"), buildGeneral());
     93    tab_pane.add(get("Options.General"), buildGeneral());
    9494    if(!Gatherer.config.get("workflow.mirror", true)) {
    95         tab_pane.add(get("Connection"), buildConnection());
    96         tab_pane.add(get("Download"), buildDownload());
     95        tab_pane.add(get("Options.Connection"), buildConnection());
     96        tab_pane.add(get("Options.Download"), buildDownload());
    9797    }
    9898
    … …  
    148148    general_pane = new JPanel(new GridLayout(2,1));
    149149    JPanel color_pane = new JPanel();
    150     use_colours = new JCheckBox(get("Use_Colours"));
     150    use_colours = new JCheckBox(get("Options.Use_Colours"));
    151151    // Connection
    152152    use_colours.addActionListener(this);
    … …  
    164164    proxy_pane.setBorder(BorderFactory.createTitledBorder(
    165165                                  BorderFactory.createBevelBorder(BevelBorder.LOWERED),
    166                                   get("Proxy_Configuration")));
    167 
    168     use_proxy = new JCheckBox(get("Use_Proxy"));
     166                                  get("Options.Proxy_Configuration")));
     167
     168    use_proxy = new JCheckBox(get("Options.Use_Proxy"));
    169169    use_proxy.addActionListener(this);
    170170
    171     establish_connection = new JButton(get("Establish_Connection"));
     171    establish_connection = new JButton(get("Options.Establish_Connection"));
    172172    establish_connection.addActionListener(this);
    173173
    174174    proxy_host_pane = new JPanel(new BorderLayout());
    175     proxy_host_label = new JLabel(get("Proxy_Host"));
     175    proxy_host_label = new JLabel(get("Options.Proxy_Host"));
    176176
    177177    proxy_port_pane = new JPanel(new BorderLayout());
    178     proxy_port_label = new JLabel(get("Proxy_Port"));
     178    proxy_port_label = new JLabel(get("Options.Proxy_Port"));
    179179
    180180    if(Gatherer.config.get("general.use_proxy", true)) {

  • trunk/gli/src/org/greenstone/gatherer/gui/messages/MessagePane.java

    r4366 r5349  
    106106
    107107    Gatherer.println("\tCreating source_label");
    108     source_label = new JLabel(get("Source"));
     108    source_label = new JLabel(get("Messages.Source"));
    109109    source_label.setHorizontalAlignment(JLabel.CENTER);
    110110
    111111    Gatherer.println("\tCreating source_general");
    112     source_general = new JToggleButton(get("General"), Gatherer.config.get("messages.source_general", false));
     112    source_general = new JToggleButton(get("Messages.General"), Gatherer.config.get("messages.source_general", false));
    113113    source_general.setIcon(Utility.OFF_ICON);
    114114    source_general.setSelectedIcon(Utility.ON_ICON);
    … …  
    118118
    119119    Gatherer.println("\tCreating source_browser");
    120     source_browser = new JToggleButton(get("Browser"), Gatherer.config.get("messages.source_browser", false));
     120    source_browser = new JToggleButton(get("Messages.Browser"), Gatherer.config.get("messages.source_browser", false));
    121121    source_browser.setIcon(Utility.OFF_ICON);
    122122    source_browser.setSelectedIcon(Utility.ON_ICON);
    … …  
    126126
    127127    Gatherer.println("\tCreating source_mirroring");
    128     source_mirroring = new JToggleButton(get("Mirroring"), Gatherer.config.get("messages.source_mirroring", false));
     128    source_mirroring = new JToggleButton(get("Messages.Mirroring"), Gatherer.config.get("messages.source_mirroring", false));
    129129    source_mirroring.setIcon(Utility.OFF_ICON);
    130130    source_mirroring.setSelectedIcon(Utility.ON_ICON);
    … …  
    134134
    135135    Gatherer.println("\tCreating source_session");
    136     source_session = new JToggleButton(get("Session"), Gatherer.config.get("messages.source_session", false));
     136    source_session = new JToggleButton(get("Messages.Session"), Gatherer.config.get("messages.source_session", false));
    137137    source_session.setIcon(Utility.OFF_ICON);
    138138    source_session.setSelectedIcon(Utility.ON_ICON);
    … …  
    142142
    143143    Gatherer.println("\tCreating source_metaedit");
    144     source_metaedit = new JToggleButton(get("Metaedit"), Gatherer.config.get("messages.source_metaedit", false));
     144    source_metaedit = new JToggleButton(get("Messages.Metaedit"), Gatherer.config.get("messages.source_metaedit", false));
    145145    source_metaedit.setIcon(Utility.OFF_ICON);
    146146    source_metaedit.setSelectedIcon(Utility.ON_ICON);
    … …  
    150150
    151151    Gatherer.println("\tCreating source_build");
    152     source_build = new JToggleButton(get("Build"), Gatherer.config.get("messages.source_build", false));
     152    source_build = new JToggleButton(get("Messages.Build"), Gatherer.config.get("messages.source_build", false));
    153153    source_build.setIcon(Utility.OFF_ICON);
    154154    source_build.setSelectedIcon(Utility.ON_ICON);
    … …  
    184184    args[0] = model.getSizeStr();
    185185    args[1] = model.getTotalSizeStr();
    186     message_count = new JLabel(get("Message_Count",args));
     186    message_count = new JLabel(get("Messages.Message_Count",args));
    187187    message_count.setHorizontalAlignment(JLabel.RIGHT);
    188188
    … …  
    195195
    196196    Gatherer.println("\tCreating save_message");
    197     save_messages = new JButton(get("Save_Messages"),
     197    save_messages = new JButton(get("Messages.Save_Messages"),
    198198                    new ImageIcon(Utility.RES_DIR+"save.gif"));
    199199    save_messages.addActionListener(this);
    … …  
    207207
    208208    Gatherer.println("\tCreating level_label");
    209     level_label = new JLabel(get("Level"));
     209    level_label = new JLabel(get("Messages.Level"));
    210210    level_label.setHorizontalAlignment(JLabel.CENTER);
    211211
    212212    Gatherer.println("\tCreating level_main");
    213     level_main = new JToggleButton(get("Main"), Gatherer.config.get("messages.level_main", false));
     213    level_main = new JToggleButton(get("Messages.Main"), Gatherer.config.get("messages.level_main", false));
    214214    level_main.setIcon(Utility.OFF_ICON);
    215215    level_main.setSelectedIcon(Utility.ON_ICON);
    … …  
    217217
    218218    Gatherer.println("\tCreating level_event");
    219     level_event = new JToggleButton(get("Event"), Gatherer.config.get("messages.level_event", false));
     219    level_event = new JToggleButton(get("Messages.Event"), Gatherer.config.get("messages.level_event", false));
    220220    level_event.setIcon(Utility.OFF_ICON);
    221221    level_event.setSelectedIcon(Utility.ON_ICON);
    … …  
    223223
    224224    Gatherer.println("\tCreating level_information");
    225     level_information = new JToggleButton(get("Information"), Gatherer.config.get("messages.level_information", false));
     225    level_information = new JToggleButton(get("Messages.Information"), Gatherer.config.get("messages.level_information", false));
    226226    level_information.setIcon(Utility.OFF_ICON);
    227227    level_information.setSelectedIcon(Utility.ON_ICON);
    … …  
    229229
    230230    Gatherer.println("\tCreating level_error");
    231     level_error = new JToggleButton(get("Error"), Gatherer.config.get("messages.level_error", false));
     231    level_error = new JToggleButton(get("Messages.Error"), Gatherer.config.get("messages.level_error", false));
    232232    level_error.setIcon(Utility.OFF_ICON);
    233233    level_error.setSelectedIcon(Utility.ON_ICON);
    … …  
    355355    args[0] = model.getSizeStr();
    356356    args[1] = model.getTotalSizeStr();
    357     message_count.setText(get("Message_Count",args));
     357    message_count.setText(get("Messages.Message_Count",args));
    358358    }
    359359

  • trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

    r5303 r5349  
    148148    setModal(true);
    149149    setSize(SIZE);
    150     setTitle(get("Title"));
     150    setTitle(get("MEM.Title"));
    151151    setJMenuBar(new SimpleMenuBar("11.1"));
    152152    JPanel content_pane = (JPanel) getContentPane();
    … …  
    178178    JPanel set_name_pane = new JPanel();
    179179    set_name_pane.setOpaque(false);
    180     JLabel set_name_label = new JLabel(get("Name"));
     180    JLabel set_name_label = new JLabel(get("MEM.Name"));
    181181    set_name_label.setOpaque(false);
    182182    set_name_label.setPreferredSize(LABEL_SIZE);
    … …  
    206206    JPanel element_name_pane = new JPanel();
    207207    element_name_pane.setOpaque(false);
    208     JLabel element_name_label = new JLabel(get("Name"));
     208    JLabel element_name_label = new JLabel(get("MEM.Name"));
    209209    element_name_label.setOpaque(false);
    210210    element_name_label.setPreferredSize(LABEL_SIZE);
    … …  
    249249    JPanel profile_name_pane = new JPanel();
    250250    profile_name_pane.setOpaque(false);
    251     JLabel profile_name_label = new JLabel(get("Name"));
     251    JLabel profile_name_label = new JLabel(get("MEM.Name"));
    252252    profile_name_label.setOpaque(false);
    253253    profile_name_label.setPreferredSize(LABEL_SIZE);
    … …  
    276276    JPanel button_label_pane = new JPanel();
    277277    button_label_pane.setOpaque(false);
    278     JLabel attribute_label = new JLabel(get("Attribute"));
     278    JLabel attribute_label = new JLabel(get("MEM.Attribute"));
    279279    attribute_label.setOpaque(false);
    280280    //attribute_label.setHorizontalAlignment(JLabel.CENTER);
    281281    attribute_label.setPreferredSize(LABEL_SIZE);
    282     JLabel element_label = new JLabel(get("Element"));
     282    JLabel element_label = new JLabel(get("MEM.Element"));
    283283    element_label.setOpaque(false);
    284284    //element_label.setHorizontalAlignment(JLabel.CENTER);
    285285    element_label.setPreferredSize(LABEL_SIZE);
    286     JLabel file_label = new JLabel(get("File"));
     286    JLabel file_label = new JLabel(get("MEM.File"));
    287287    file_label.setOpaque(false);
    288288    //element_label.setHorizontalAlignment(JLabel.CENTER);
    289289    file_label.setPreferredSize(LABEL_SIZE);
    290     JLabel set_label = new JLabel(get("Set"));
     290    JLabel set_label = new JLabel(get("MEM.Set"));
    291291    set_label.setOpaque(false);
    292292    //set_label.setHorizontalAlignment(JLabel.CENTER);
    293293    set_label.setPreferredSize(LABEL_SIZE);
    294     JLabel value_label = new JLabel(get("Value"));
     294    JLabel value_label = new JLabel(get("MEM.Value"));
    295295    value_label.setOpaque(false);
    296296    //value_label.setHorizontalAlignment(JLabel.CENTER);
    … …  
    299299    JPanel inner_button_pane = new JPanel();
    300300    inner_button_pane.setOpaque(false);
    301     add_attribute = new JButton(get("Add"));
    302     add_element = new JButton(get("Add"));
    303     add_file = new JButton(get("Add"));
    304     add_set = new JButton(get("Add"));
    305     add_value = new JButton(get("Add"));
    306     edit_attribute = new JButton(get("Edit"));
    307     edit_value = new JButton(get("Edit"));
    308     remove_attribute = new JButton(get("Remove"));
    309     remove_element = new JButton(get("Remove"));
    310     remove_file = new JButton(get("Remove"));
    311     remove_set = new JButton(get("Remove"));
    312     remove_value = new JButton(get("Remove"));
     301    add_attribute = new JButton(get("MEM.Add"));
     302    add_element = new JButton(get("MEM.Add"));
     303    add_file = new JButton(get("MEM.Add"));
     304    add_set = new JButton(get("MEM.Add"));
     305    add_value = new JButton(get("MEM.Add"));
     306    edit_attribute = new JButton(get("MEM.Edit"));
     307    edit_value = new JButton(get("MEM.Edit"));
     308    remove_attribute = new JButton(get("MEM.Remove"));
     309    remove_element = new JButton(get("MEM.Remove"));
     310    remove_file = new JButton(get("MEM.Remove"));
     311    remove_set = new JButton(get("MEM.Remove"));
     312    remove_value = new JButton(get("MEM.Remove"));
    313313    setControls(false, false, false, false, false, false, false, false, false, false, false, false);
    314314
    … …  
    360360    set_attributes_scroll.setViewportView(set_attributes);
    361361
    362     set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     362    set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
    363363    set_attributes_pane.setLayout(new BorderLayout());
    364364    set_attributes_pane.add(set_attributes_scroll, BorderLayout.CENTER);
    365365       
    366     set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     366    set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
    367367    set_details_pane.setLayout(new BorderLayout());
    368368    //set_details_pane.add(set_name_pane, BorderLayout.NORTH);
    … …  
    375375    element_attributes_scroll.setViewportView(element_attributes);
    376376
    377     element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     377    element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
    378378    element_attributes_pane.setLayout(new BorderLayout());
    379379    element_attributes_pane.add(element_attributes_scroll, BorderLayout.CENTER);
    380380         
    381     element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
     381    element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
    382382    //element_values_pane.setLayout(new BorderLayout());
    383383    //element_values_pane.add(new JScrollPane(element_values), BorderLayout.CENTER);
    … …  
    390390    element_inner_pane.add(element_values_pane);
    391391         
    392     element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     392    element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
    393393    element_details_pane.setLayout(new BorderLayout());
    394394    //element_details_pane.add(element_name_pane, BorderLayout.NORTH);
    … …  
    401401    profile_attributes_scroll.setViewportView(profile_attributes);
    402402
    403     profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
     403    profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
    404404    profile_attributes_pane.setLayout(new BorderLayout());
    405405    profile_attributes_pane.add(profile_attributes_scroll, BorderLayout.CENTER);
    406406       
    407     profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     407    profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(get("MEM.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
    408408    profile_details_pane.setLayout(new BorderLayout());
    409409    //profile_details_pane.add(profile_name_pane, BorderLayout.NORTH);
    … …  
    561561        JPanel target_pane = new JPanel();
    562562        target_pane.setOpaque(false);
    563         JLabel target_label = new JLabel(get("Target"));
     563        JLabel target_label = new JLabel(get("MEM.Target"));
    564564        target_label.setOpaque(false);
    565565        target_label.setPreferredSize(LABEL_SIZE);
    … …  
    570570        JPanel name_pane = new JPanel();
    571571        name_pane.setOpaque(false);
    572         JLabel name_label = new JLabel(get("Name"));
     572        JLabel name_label = new JLabel(get("MEM.Name"));
    573573        name_label.setOpaque(false);
    574574        name_label.setPreferredSize(LABEL_SIZE);
    … …  
    578578        JPanel language_pane = new JPanel();
    579579        language_pane.setOpaque(false);
    580         JLabel language_label = new JLabel(get("Language"));
     580        JLabel language_label = new JLabel(get("MEM.Language"));
    581581        language_label.setOpaque(false);
    582582        language_label.setPreferredSize(LABEL_SIZE);
    … …  
    586586        JPanel center_pane = new JPanel();
    587587        center_pane.setOpaque(false);
    588         value = new ComboArea(get("Values"), LABEL_SIZE);
     588        value = new ComboArea(get("MEM.Values"), LABEL_SIZE);
    589589        value.setOpaque(false);
    590590        JTextArea v_text_area = (JTextArea) value.getTextComponent();
    … …  
    783783        if(source == add_attribute) {
    784784            add_type = true;
    785             setTitle(get("AddAttribute"));
     785            setTitle(get("MEM.AddAttribute"));
    786786            if(current_collection_file != null) {
    787787            // Name is empty in this one, however values must be the current elements in the collection.   
    … …  
    808808            }
    809809            add_type = false;
    810             setTitle(get("EditAttribute"));
     810            setTitle(get("MEM.EditAttribute"));
    811811            String name_str = (String) model.getValueAt(current_attribute, 0);
    812812            String value_str = (String) model.getValueAt(current_attribute, model.getColumnCount() - 1);
    … …  
    863863        else {
    864864        cont = false;
    865         JOptionPane.showMessageDialog(self, get("Attribute_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
     865        JOptionPane.showMessageDialog(self, get("MEM.Attribute_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
    866866        }
    867867
    … …  
    895895        else {
    896896        cont = false;
    897         JOptionPane.showMessageDialog(self, get("Attribute_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
     897        JOptionPane.showMessageDialog(self, get("MEM.Attribute_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
    898898        }
    899899
    … …  
    964964        JPanel set_pane = new JPanel();
    965965        set_pane.setOpaque(false);
    966         JLabel set_label = new JLabel(get("Set"));
     966        JLabel set_label = new JLabel(get("MEM.Set"));
    967967        set_label.setOpaque(false);
    968968        set_label.setPreferredSize(LABEL_SIZE);
    … …  
    971971        JPanel name_pane = new JPanel();
    972972        name_pane.setOpaque(false);
    973         JLabel name_label = new JLabel(get("Name"));
     973        JLabel name_label = new JLabel(get("MEM.Name"));
    974974        name_label.setOpaque(false);
    975975        name_label.setPreferredSize(LABEL_SIZE);
    … …  
    10381038        // Otherwise show an error message and do not proceed.
    10391039        else {
    1040             JOptionPane.showMessageDialog(self, get("Element_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
     1040            JOptionPane.showMessageDialog(self, get("MEM.Element_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
    10411041        }
    10421042        name_str = null;
    … …  
    10581058            // Warn the user that they can't do that dave.
    10591059            else {
    1060             JOptionPane.showMessageDialog(self, get("Cannot_Add_Elements_To_Greenstone_MDS"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
     1060            JOptionPane.showMessageDialog(self, get("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
    10611061            }
    10621062        }
    … …  
    10921092        JPanel profile_pane = new JPanel();
    10931093        profile_pane.setOpaque(false);
    1094         JLabel profile_label = new JLabel(get("Profile"));
     1094        JLabel profile_label = new JLabel(get("MEM.Profile"));
    10951095        profile_label.setOpaque(false);
    10961096        profile_label.setPreferredSize(LABEL_SIZE);
    10971097        JPanel name_pane = new JPanel();
    10981098        name_pane.setOpaque(false);
    1099         JLabel name_label = new JLabel(get("Name"));
     1099        JLabel name_label = new JLabel(get("MEM.Name"));
    11001100        name_label.setOpaque(false);
    11011101        name_label.setPreferredSize(LABEL_SIZE);
    … …  
    11561156        // Otherwise warn the user and don't hide the prompt.
    11571157        else {
    1158             JOptionPane.showMessageDialog(self, get("File_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
     1158            JOptionPane.showMessageDialog(self, get("MEM.File_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
    11591159        }
    11601160        name_str = null;
    … …  
    11911191        setModal(true);
    11921192        setSize(ADD_SET_SIZE);
    1193         setTitle(get("AddSet"));
     1193        setTitle(get("MEM.AddSet"));
    11941194                // Creation
    11951195        JPanel content_pane = (JPanel) getContentPane();
    … …  
    12001200        JPanel namespace_pane = new JPanel();
    12011201        namespace_pane.setOpaque(false);
    1202         JLabel namespace_label = new JLabel(get("Namespace"));
     1202        JLabel namespace_label = new JLabel(get("MEM.Namespace"));
    12031203        namespace_label.setOpaque(false);
    12041204        namespace_label.setPreferredSize(LABEL_SIZE);
    … …  
    12111211        JPanel name_pane = new JPanel();
    12121212        name_pane.setOpaque(false);
    1213         JLabel name_label = new JLabel(get("Name"));
     1213        JLabel name_label = new JLabel(get("MEM.Name"));
    12141214        name_label.setOpaque(false);
    12151215        name_label.setPreferredSize(LABEL_SIZE);
    … …  
    12761276        // Otherwise show a warning.
    12771277        else {
    1278             JOptionPane.showMessageDialog(self, get("Set_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
     1278            JOptionPane.showMessageDialog(self, get("MEM.Set_Already_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
    12791279        }
    12801280        name_str = null;
    … …  
    13251325        JPanel subject_tree_pane = new JPanel();
    13261326        subject_tree_pane.setOpaque(false);
    1327         JLabel subject_tree_label = new JLabel(get("Subject"));
     1327        JLabel subject_tree_label = new JLabel(get("MEM.Subject"));
    13281328        subject_tree_label.setOpaque(false);
    13291329        subject_tree = new SmarterTree();
    … …  
    13341334        JPanel value_pane = new JPanel();
    13351335        value_pane.setOpaque(false);
    1336         JLabel value_label = new JLabel(get("Value"));
     1336        JLabel value_label = new JLabel(get("MEM.Value"));
    13371337        value_label.setOpaque(false);
    13381338        value = new JTextArea();
    … …  
    13431343        JPanel alias_pane = new JPanel();
    13441344        alias_pane.setOpaque(false);
    1345         JLabel alias_label = new JLabel(get("Alias"));
     1345        JLabel alias_label = new JLabel(get("MEM.Alias"));
    13461346        alias_label.setOpaque(false);
    13471347        alias_label.setPreferredSize(LABEL_SIZE);
    … …  
    14841484            value.setText("");
    14851485            alias.setText("");
    1486             setTitle(get("AddValue"));
     1486            setTitle(get("MEM.AddValue"));
    14871487        }
    14881488        else {
    … …  
    14961496            value.setText(current_value_node.toString());
    14971497            alias.setText(current_value_node.getAlias());
    1498             setTitle(get("EditValue"));
     1498            setTitle(get("MEM.EditValue"));
    14991499        }
    15001500        model = null;
    … …  
    15851585    public void actionPerformed(ActionEvent event) {
    15861586        if(current_attribute != -1) {
    1587         int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("Attribute")), get("Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1587        int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("MEM.Attribute")), get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
    15881588        // Remove this attribute
    15891589        if(result == 0) {
    … …  
    16331633    public void actionPerformed(ActionEvent event) {
    16341634        if(current_element != null) {
    1635         int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("Element")), get("Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1635        int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("MEM.Element")), get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
    16361636        // Remove this attribute
    16371637        if(result == 0) {
    … …  
    16611661    public void actionPerformed(ActionEvent event) {
    16621662        if(current_collection_file != null) {
    1663         int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("File")), get("Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1663        int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("MEM.File")), get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
    16641664        // Remove the current collection file profile from the profiler.
    16651665        if(result == 0) {
    … …  
    16861686    public void actionPerformed(ActionEvent event) {
    16871687        if(current_set != null) {
    1688         int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("Set")), get("Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1688        int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("MEM.Set")), get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
    16891689        // Remove the currently selected set
    16901690        if(result == 0) {
    … …  
    17111711    public void actionPerformed(ActionEvent event) {
    17121712        if(current_value_node != null) {                 
    1713         int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("Value")), get("Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
     1713        int result = JOptionPane.showOptionDialog(self, get("MEM.Confirm_Removal", get("MEM.Value")), get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
    17141714        // Remove the current selected value
    17151715        if(result == 0) {
    … …  
    18421842                String action = Gatherer.c_man.msm.profiler.getAction(current_collection_file, source);
    18431843                if(action == null) {
    1844                 action = get("Ignore");
     1844                action = get("MEM.Ignore");
    18451845                }
    18461846                attributes.add(new Attribute(source, action));
    18471847            }
    1848             atm = new AttributeTableModel(attributes, get("Source"), get("Target"), get("Ignore"));
     1848            atm = new AttributeTableModel(attributes, get("MEM.Source"), get("MEM.Target"), get("MEM.Ignore"));
    18491849            //current_node.setModel(atm);
    18501850            }
    … …  
    18601860            atm = current_node.getModel();
    18611861            if(atm == null) {
    1862             atm = new AttributeTableModel(current_element.getAttributes(), get("Name"), get("Language_Code"), get("Value"), "");
     1862            atm = new AttributeTableModel(current_element.getAttributes(), get("MEM.Name"), get("MEM.Language_Code"), get("MEM.Value"), "");
    18631863            //current_node.setModel(atm);
    18641864            }
    … …  
    18981898                attribute = null;
    18991899            }
    1900             atm = new AttributeTableModel(attributes, get("Name"), get("Value"), "");
     1900            atm = new AttributeTableModel(attributes, get("MEM.Name"), get("MEM.Value"), "");
    19011901            //current_node.setModel(atm);
    19021902            temp = null;

  • trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

    r5288 r5349  
    9393    // Create components
    9494
    95     add = new JButton(get("Add"));
     95    add = new JButton(get("MSMPrompt.Add"));
    9696    add.addActionListener(this);
    9797    add.setEnabled(false);
    … …  
    9999         
    100100
    101     cancel = new JButton(get("Cancel"));
     101    cancel = new JButton(get("MSMPrompt.Cancel"));
    102102    cancel.addActionListener(this);
    103103    cancel.setEnabled(true);
    104104    cancel.setMnemonic(KeyEvent.VK_C);
    105105
    106     current_details = new JTextArea(get("No_Details"));
    107 
    108     current_details_label = new JLabel(get("Current_Details"));
    109 
    110     merge = new JButton(get("Merge"));
     106    current_details = new JTextArea(get("MSMPrompt.No_Details"));
     107
     108    current_details_label = new JLabel(get("MSMPrompt.Current_Details"));
     109
     110    merge = new JButton(get("MSMPrompt.Merge"));
    111111    merge.addActionListener(this);
    112112    merge.setEnabled(true);
    113113    merge.setMnemonic(KeyEvent.VK_M);
    114114
    115     new_details = new JTextArea(get("No_Details"));
    116 
    117     new_details_label = new JLabel(get("New_Details"));
     115    new_details = new JTextArea(get("MSMPrompt.No_Details"));
     116
     117    new_details_label = new JLabel(get("MSMPrompt.New_Details"));
    118118
    119119    progress = new JProgressBar();
    120120    progress.setStringPainted(true);
    121121
    122     progress_label = new JLabel(get("Progress"));
    123 
    124     rename = new JButton(get("Rename"));
     122    progress_label = new JLabel(get("MSMPrompt.Progress"));
     123
     124    rename = new JButton(get("MSMPrompt.Rename"));
    125125    rename.addActionListener(this);
    126126    rename.setEnabled(false);
    127127    rename.setMnemonic(KeyEvent.VK_N);
    128128
    129     replace = new JButton(get("Replace"));
     129    replace = new JButton(get("MSMPrompt.Replace"));
    130130    replace.addActionListener(this);
    131131    replace.setEnabled(false);
    132132    replace.setMnemonic(KeyEvent.VK_R);
    133133
    134     skip = new JButton(get("Skip"));
     134    skip = new JButton(get("MSMPrompt.Skip"));
    135135    skip.addActionListener(this);
    136136    skip.setEnabled(true);
    … …  
    148148    args[0] = mde_new.getAttribute("name");
    149149    args[1] = get(reason, null);
    150     JOptionPane.showMessageDialog(Gatherer.g_man, get("Add_Failed", args), get("Add_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
     150    JOptionPane.showMessageDialog(Gatherer.g_man, get("MSMPrompt.Add_Failed", args), get("MSMPrompt.Add_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
    151151    }
    152152
    … …  
    201201    dialog.setModal(true);
    202202    dialog.setSize(MDE_SIZE);
    203     dialog.setTitle(get("Merge_MDE"));
     203    dialog.setTitle(get("MSMPrompt.Merge_MDE"));
    204204    dialog.setJMenuBar(new SimpleMenuBar("6.8"));
    205205    JPanel content_pane = (JPanel)dialog.getContentPane();
    206206
    207     JLabel element_name_label = new JLabel(get("Element_Name"));
     207    JLabel element_name_label = new JLabel(get("MSMPrompt.Element_Name"));
    208208    JLabel element_name = new JLabel(MSMUtils.getFullName(mde_cur));
    209209   
    210     JLabel attribute_name_label = new JLabel(get("Attribute"));
     210    JLabel attribute_name_label = new JLabel(get("MSMPrompt.Attribute"));
    211211    JLabel attribute_name = new JLabel(att_new.getAttribute("name"));
    212212
    … …  
    231231    JPanel current_pane = new JPanel();
    232232    current_pane.setLayout(new BorderLayout());
    233     current_pane.setBorder(BorderFactory.createTitledBorder(get("Current_Values")));
     233    current_pane.setBorder(BorderFactory.createTitledBorder(get("MSMPrompt.Current_Values")));
    234234    JScrollPane scroll = new JScrollPane(cur_values);
    235235    current_pane.add(scroll, BorderLayout.CENTER);
    236236
    237237    JPanel new_pane = new JPanel();
    238     new_pane.setBorder(BorderFactory.createTitledBorder(get("New_Value")));
     238    new_pane.setBorder(BorderFactory.createTitledBorder(get("MSMPrompt.New_Value")));
    239239    new_pane.setLayout(new BorderLayout());
    240240    JLabel new_att = new JLabel(MSMUtils.getValue(att_new));
    … …  
    304304    dialog.setModal(true);
    305305    dialog.setSize(MDS_SIZE);
    306     dialog.setTitle(get("Merge_MDS"));
     306    dialog.setTitle(get("MSMPrompt.Merge_MDS"));
    307307    dialog.setJMenuBar(new SimpleMenuBar("6.8"));
    308308    JPanel content_pane = (JPanel)dialog.getContentPane();
    … …  
    318318        String opt_cur[] = MSMUtils.getOptionListDetails(mde_cur);
    319319        String ass_cur[] = MSMUtils.getAssignedValuesDetails(mds_cur, mde_cur);
    320         String details_cur = get("Structural", str_cur);
     320        String details_cur = get("MSMPrompt.Structural", str_cur);
    321321        if(opt_cur != null) {
    322         details_cur = details_cur + "\n" + get("OptionList", opt_cur);
     322        details_cur = details_cur + "\n" + get("MSMPrompt.OptionList", opt_cur);
    323323        }
    324324        if(ass_cur != null) {
    325         details_cur = details_cur + "\n" + get("AssignedValues", ass_cur);
     325        details_cur = details_cur + "\n" + get("MSMPrompt.AssignedValues", ass_cur);
    326326        }
    327327        current_details.setText(details_cur);
    … …  
    338338        replace.setEnabled(false);
    339339        skip.setEnabled(true);
    340         current_details.setText(get("No_Element"));
     340        current_details.setText(get("MSMPrompt.No_Element"));
    341341    }
    342342    // New details.
    … …  
    344344    String opt_new[] = MSMUtils.getOptionListDetails(mde_new);
    345345    String ass_new[] = MSMUtils.getAssignedValuesDetails(mds_new, mde_new);
    346     String details_new = get("Structural", str_new);
     346    String details_new = get("MSMPrompt.Structural", str_new);
    347347    if(opt_new != null) {
    348         details_new = details_new + "\n" + get("OptionList", opt_new);
     348        details_new = details_new + "\n" + get("MSMPrompt.OptionList", opt_new);
    349349    }
    350350    if(ass_new != null) {
    351         details_new = details_new + "\n" + get("AssignedValues", ass_new);
     351        details_new = details_new + "\n" + get("MSMPrompt.AssignedValues", ass_new);
    352352    }
    353353    new_details.setText(details_new);
    … …  
    439439    dialog.setModal(true);
    440440    dialog.setSize(RENAME_SIZE);
    441     dialog.setTitle(get("Rename"));
     441    dialog.setTitle(get("MSMPrompt.Rename"));
    442442    dialog.setJMenuBar(new SimpleMenuBar("6.8"));
    443     JLabel old_name_label = new JLabel(get("Old_Name"));
     443    JLabel old_name_label = new JLabel(get("MSMPrompt.Old_Name"));
    444444    old_name_label.setPreferredSize(RENAME_LABEL_SIZE);
    445445
    … …  
    448448    old_name.setOpaque(true);
    449449
    450     JLabel new_name_label = new JLabel(get("New_Name"));
     450    JLabel new_name_label = new JLabel(get("MSMPrompt.New_Name"));
    451451    new_name_label.setPreferredSize(RENAME_LABEL_SIZE);
    452452         
    … …  
    524524    args[0] = mde_cur.getAttribute("name");
    525525    args[1] = get(reason, null);
    526     JOptionPane.showMessageDialog(Gatherer.g_man, get("Remove_Failed", args), get("Remove_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
     526    JOptionPane.showMessageDialog(Gatherer.g_man, get("MSMPrompt.Remove_Failed", args), get("MSMPrompt.Remove_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
    527527    }
    528528
    … …  
    537537    args[1] = new_name;
    538538    args[2] = get(reason, null);
    539     JOptionPane.showMessageDialog(Gatherer.g_man, get("Rename_Failed", args), get("Rename_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
     539    JOptionPane.showMessageDialog(Gatherer.g_man, get("MSMPrompt.Rename_Failed", args), get("MSMPrompt.Rename_Failed_Title", null), JOptionPane.ERROR_MESSAGE);
    540540    }
    541541
    … …  
    550550    dialog.setModal(true);
    551551    dialog.setSize(SELECT_SIZE);
    552     dialog.setTitle(get("Select"));
     552    dialog.setTitle(get("MSMPrompt.Select"));
    553553    dialog.setJMenuBar(new SimpleMenuBar("6.8"));
    554554
    … …  
    626626    dialog.setModal(true);
    627627    dialog.setSize(SELECT_ELEMENT_SIZE);
    628     dialog.setTitle(get("Select_Element_Title"));
     628    dialog.setTitle(get("MSMPrompt.Select_Element_Title"));
    629629    dialog.setJMenuBar(new SimpleMenuBar("6.8"));
    630630    JPanel content_pane = (JPanel) dialog.getContentPane();
    631631    JPanel control_pane = new JPanel();
    632     JTextArea instructions = new JTextArea(get("Select_Element_Instructions", args));
     632    JTextArea instructions = new JTextArea(get("MSMPrompt.Select_Element_Instructions", args));
    633633    instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    634634    instructions.setEditable(false);
    … …  
    637637    instructions.setWrapStyleWord(true);
    638638    JPanel original_pane = new JPanel();
    639     JLabel original_label = new JLabel(get("Select_Element_Original"));
     639    JLabel original_label = new JLabel(get("MSMPrompt.Select_Element_Original"));
    640640    original_label.setPreferredSize(SELECT_LABEL_SIZE);
    641641    JTextField original = new JTextField(name);
    … …  
    643643    original.setEditable(false);
    644644    JPanel element_pane = new JPanel();
    645     JLabel element_label = new JLabel(get("Select_Element_Element"));
     645    JLabel element_label = new JLabel(get("MSMPrompt.Select_Element_Element"));
    646646    element_label.setPreferredSize(SELECT_LABEL_SIZE);
    647647    JComboBox element = new JComboBox();
    648     JButton add_button = new JButton(get("Select_Element_Add"));
     648    JButton add_button = new JButton(get("MSMPrompt.Select_Element_Add"));
    649649    add_button.setEnabled(false);
    650650    add_button.setMnemonic(KeyEvent.VK_A);
    651651    JButton cancel_button = new JButton(get("General.Cancel"));
    652652    cancel_button.setMnemonic(KeyEvent.VK_C);
    653     JButton merge_button = new JButton(get("Select_Element_Merge"));
     653    JButton merge_button = new JButton(get("MSMPrompt.Select_Element_Merge"));
    654654    merge_button.setEnabled(false);
    655655    merge_button.setMnemonic(KeyEvent.VK_M);
    656     JButton ignore_button = new JButton(get("Select_Element_Ignore"));
     656    JButton ignore_button = new JButton(get("MSMPrompt.Select_Element_Ignore"));
    657657    ignore_button.setMnemonic(KeyEvent.VK_I);
    658658    JPanel set_pane = new JPanel();
    659     JLabel set_label = new JLabel(get("Select_Element_Set"));
     659    JLabel set_label = new JLabel(get("MSMPrompt.Select_Element_Set"));
    660660    set_label.setPreferredSize(SELECT_LABEL_SIZE);
    661661    JComboBox set = new JComboBox(manager.getSets(false)); // Don't include the greenstone metadata set.
    … …  
    811811    dialog.setModal(true);
    812812    dialog.setSize(SELECT_SET_SIZE);
    813     dialog.setTitle(get("Select_Set_Title"));
     813    dialog.setTitle(get("MSMPrompt.Select_Set_Title"));
    814814    dialog.setJMenuBar(new SimpleMenuBar("6.8"));
    815815    JPanel content_pane = (JPanel) dialog.getContentPane();
    816816    JPanel control_pane = new JPanel();
    817     JTextArea instructions = new JTextArea(get("Select_Set_Instructions", args));
     817    JTextArea instructions = new JTextArea(get("MSMPrompt.Select_Set_Instructions", args));
    818818    instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
    819819    instructions.setEditable(false);
    … …  
    823823    JComboBox set = new JComboBox();
    824824    set.setBackground(Color.white);
    825     set.addItem(get("Select_Set_None"));
     825    set.addItem(get("MSMPrompt.Select_Set_None"));
    826826    Vector sets = manager.getSets();
    827827    for(int i = sets.size() - 1; i >= 0; i--) {
    … …  
    10861086    } 
    10871087    }
    1088 
    10891088}

  • trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

    r5152 r5349  
    150150        }
    151151        ///ystem.err.println("Command: " + command);
    152         fireMessage(type, get("Command") + ": " + command, status);
     152        fireMessage(type, get("GShell.Command") + ": " + command, status);
    153153               
    154154        Runtime rt = Runtime.getRuntime();
    … …  
    188188        if(prcs.exitValue() == 0) {
    189189            status = OK;
    190             fireMessage(type, typeAsString(type) + "> " + get("Success"), status);
     190            fireMessage(type, typeAsString(type) + "> " + get("GShell.Success"), status);
    191191           
    192192        } else {
    193193            status = ERROR;
    194             fireMessage(type, typeAsString(type) + "> " + get("Failure"), status);
     194            fireMessage(type, typeAsString(type) + "> " + get("GShell.Failure"), status);
    195195           
    196196        }
    … …  
    211211    // If no error occured, and this was an import process we now extract any new metadata from the archive directory.
    212212    if(status == OK && type == IMPORT) {
    213         fireMessage(type, typeAsString(type) + "> " + get("Parsing_Metadata_Start"), status);
     213        fireMessage(type, typeAsString(type) + "> " + get("GShell.Parsing_Metadata_Start"), status);
    214214        new GreenstoneArchiveParser(progress, this);
    215         fireMessage(type, typeAsString(type) + "> " + get("Parsing_Metadata_Complete"), status);
     215        fireMessage(type, typeAsString(type) + "> " + get("GShell.Parsing_Metadata_Complete"), status);
    216216    }
    217217    // Tidy up.
    … …  
    302302    switch(type) {
    303303    case BUILD:
    304         name = get("Build");
     304        name = get("GShell.Build");
    305305        break;
    306306    case IMPORT:
    307         name = get("Import");
     307        name = get("GShell.Import");
    308308        break;
    309309    case NEW:
    310         name = get("New");
     310        name = get("GShell.New");
    311311        break;
    312312    default:
    313         name = get("Other");
     313        name = get("GShell.Other");
    314314    }
    315315    return name;
Note: See TracChangeset for help on using the changeset viewer.