Changeset 5347

Timestamp:

2003-08-29T10:52:44+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:

• collection/CollectionManager.java (modified) (8 diffs)
• collection/DeleteCollectionPrompt.java (modified) (6 diffs)
• file/FileQueue.java (modified) (12 diffs)
• gui/BrowsingPane.java (modified) (4 diffs)
• gui/CreatePane.java (modified) (7 diffs)
• gui/FileAssociationDialog.java (modified) (6 diffs)
• gui/PreviewPane.java (modified) (8 diffs)
• gui/metaaudit/AutofilterDialog.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -223 +223 @@
     try {
         // Create a progress monitor.
-        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("Creating_New"), "mkcol.pl", 0, 7);
+        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("CollectionManager.Creating_New"), "mkcol.pl", 0, 7);
         // Create the new collection.
         makeCollection(description, email, name, title);
@@ -235 +235 @@
         gcache_dir.mkdirs();
         if(progress != null) {
-        progress.setNote(get("Gcache_Created"));
+        progress.setNote(get("CollectionManager.Gcache_Created"));
         }
 
@@ -243 +243 @@
         log_dir.mkdirs();
         if(progress != null) {
-        progress.setNote(get("Log_Created"));
+        progress.setNote(get("CollectionManager.Log_Created"));
         }
 
@@ -395 +395 @@
         String args[] = new String[1];
         args[0] = name;
-        progress.setNote(get("Session_Ready", args));
+        progress.setNote(get("CollectionManager.Session_Ready", args));
         progress.close();
     }
@@ -783 +783 @@
                 collection.gdm = new GDMManager();
                 // Tell everyone that it worked.
-                Gatherer.println(get("Loading_Successful", name));
+                Gatherer.println(get("CollectionManager.Loading_Successful", name));
                 // Now we need to hook up classes that depend on messages from the metadata set manager to keep their content fresh.
                 collection.msm.addMSMListener(this);
@@ -796 +796 @@
                 // There is obviously no existing collection present.
                 Gatherer.printStackTrace(error);
-                JOptionPane.showMessageDialog(Gatherer.g_man, get("Cannot_Open", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Cannot_Open", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             }
@@ -808 +808 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("Not_Col_File", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Not_Col_File", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
         Gatherer.println("Not a Gatherer Collection.");
     }
@@ -929 +929 @@
         workspace_model = null;
         Gatherer.g_man.collectionChanged(ready());
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready"), get("Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Preview_Ready"), get("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
     }
     else if(event.getStatus() == GShell.ERROR) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready_Failed"), get("Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Preview_Ready_Failed"), get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
         Gatherer.g_man.collectionChanged(ready()); 
     }

trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java

@@ -91 +91 @@
     super(Gatherer.g_man);
     this.close_button = new JButton(get("General.Close", null));
-    this.confirmation = new JCheckBox(get("Confirm_Delete", null));
+    this.confirmation = new JCheckBox(get("DeleteCollectionPrompt.Confirm_Delete", null));
     this.details = new JTextArea();
-    this.details_label = new JLabel(get("Collection_Details", null));
+    this.details_label = new JLabel(get("DeleteCollectionPrompt.Collection_Details", null));
     this.list = new JList();
-    this.list_label = new JLabel(get("Collection_List", null));
+    this.list_label = new JLabel(get("DeleteCollectionPrompt.Collection_List", null));
     this.list_model = new DefaultListModel();
     this.ok_button = new JButton(get("General.OK", null));
@@ -101 +101 @@
     this.setModal(true);
     this.setSize(SIZE);
-    this.setTitle(get("Title", null));
+    this.setTitle(get("DeleteCollectionPrompt.Title", null));
     this.setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     close_button.addActionListener(new CloseButtonListener());
@@ -108 +108 @@
     confirmation.setSelected(false);
     details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
-    details.setText(get("No_Collection", null));
+    details.setText(get("DeleteCollectionPrompt.No_Collection", null));
     list.addListSelectionListener(new CollectionListListener());
     list.clearSelection();
@@ -184 +184 @@
     args[0] = collection.getName();
     if(success) {
-        JOptionPane.showMessageDialog(prompt,get("Successful_Delete", args),get("Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(prompt,get("DeleteCollectionPrompt.Successful_Delete", args),get("DeleteCollectionPrompt.Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
     }
     else {
-        JOptionPane.showMessageDialog(prompt,get("Failed_Delete", args),get("Failed_Title", null),JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(prompt,get("DeleteCollectionPrompt.Failed_Delete", args),get("DeleteCollectionPrompt.Failed_Title", null),JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -264 +264 @@
         args[3] = collection.getMaintainer();
         args[4] = collection.getDescription();
-        details.setText(get("Details", args));
+        details.setText(get("DeleteCollectionPrompt.Details", args));
         details.setCaretPosition(0);
         }
         else {
         confirmation.setEnabled(false);
-        details.setText(get("No_Collection", null));
+        details.setText(get("DeleteCollectionPrompt.No_Collection", null));
         }
     }
@@ -314 +314 @@
         resultPrompt(true);
         list_model.removeElement(collection);
-        details.setText(get("No_Collection", null));
+        details.setText(get("DeleteCollectionPrompt.No_Collection", null));
         confirmation.setEnabled(false);
         confirmation.setSelected(false);

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -86 +86 @@
     args[0] = "0";
     args[1] = "0";
-    file_status = new JLabel(get("Selected", args)); //new SmudgyLabel(get("Selected", args));
+    file_status = new JLabel(get("FileActions.Selected", args)); //new SmudgyLabel(get("Selected", args));
     //job_status = new JLabel(get("No_Activity"));
     progress = new LongProgressBar();
     progress.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     progress.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    progress.setString(get("No_Activity"));
+    progress.setString(get("FileActions.No_Activity"));
     progress.setStringPainted(true);
     args = null;
@@ -155 +155 @@
         }
     }
-    progress.setString(get("No_Activity"));
+    progress.setString(get("FileActions.No_Activity"));
     progress.setIndeterminate(false);
     // Now we return if calculation was cancelled so that the FileManagers Task can skip the addJob phase correctly.
@@ -240 +240 @@
                 ///atherer.println("Opps! This filename already exists. Give the user some options.");
                 Object[] options = { get("General.Yes"), get("Yes_To_All"), get("General.No"), get("General.Cancel") };
-                int result = JOptionPane.showOptionDialog(Gatherer.g_man, get("File_Exists", target_file.getName()), get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+                int result = JOptionPane.showOptionDialog(Gatherer.g_man, get("FileActions.File_Exists", target_file.getName()), get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
                 switch(result) {
                 case 1: // Yes To All
@@ -274 +274 @@
                 if(job.type == FileJob.COPY) {
                 args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(get("Copying", args));
+                file_status.setText(get("FileActions.Copying", args));
                 }
                 else {
                 args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(get("Moving", args));
+                file_status.setText(get("FileActions.Moving", args));
                 }
                 args = null;
@@ -293 +293 @@
                     cancel_action = true;
                     // Show warning.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Not_Found_Message", source_file.getName()), get("File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("FileActions.File_Not_Found_Message", source_file.getName()), get("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
                     // Force refresh of source folder.
                     source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
@@ -301 +301 @@
                     cancel_action = true;
                     // Show warning.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Already_Exists_Message", target_file.getName()), get("File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("FileActions.File_Already_Exists_Message", target_file.getName()), get("FileActions.File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else can be done by the Gatherer.
                 }
@@ -308 +308 @@
                     cancel_action = true;
                     // Show warning. The message body of the expection explains how much more space is required for this file copy.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, get("Insufficient_Space_Message", is_exception.getMessage()), get("Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("FileActions.Insufficient_Space_Message", is_exception.getMessage()), get("FileActions.Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
                 }
@@ -315 +315 @@
                     cancel_action = true;
                     // Show warning
-                    JOptionPane.showMessageDialog(Gatherer.g_man, get("Unknown_File_Error_Message"), get("Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("FileActions.Unknown_File_Error_Message"), get("FileActions.Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else we can do.
                 }
@@ -322 +322 @@
                     cancel_action = true;
                     // Show warning
-                    JOptionPane.showMessageDialog(Gatherer.g_man, get("Write_Not_Permitted_Message", target_file.getAbsolutePath()), get("Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, get("FileActions.Write_Not_Permitted_Message", target_file.getAbsolutePath()), get("FileActions.Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else we can do.
                 }
@@ -401 +401 @@
                 cancel_action = true;
                 // Show warning.
-                JOptionPane.showMessageDialog(Gatherer.g_man, get("File_Not_Found_Message", source_file.getName()), get("File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Gatherer.g_man, get("FileActions.File_Not_Found_Message", source_file.getName()), get("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
                 // Force refresh of source folder.
                 source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
@@ -459 +459 @@
                 //job_status.setText(get("Jobs", args));
                 args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(get("Deleting", args));
+                file_status.setText(get("FileActions.Deleting", args));
                 args = null;
                 //file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
@@ -594 +594 @@
             // Reset status area
             //job_status.setText(get("No_Selection"));
-            file_status.setText(get("No_Activity"));
+            file_status.setText(get("FileActions.No_Activity"));
             progress.reset();
-            progress.setString(get("No_Activity"));
+            progress.setString(get("FileActions.No_Activity"));
             yes_to_all = false;
             completed_folder_mappings.clear();

trunk/gli/src/org/greenstone/gatherer/gui/BrowsingPane.java

@@ -85 +85 @@
     back_button = new JButton("", Utility.getImage("back.gif"));
     back_button.setEnabled(false);
-    back_button.setToolTipText(get("Back"));
+    back_button.setToolTipText(get("Browser.Back"));
     refresh_button = new JButton("", Utility.getImage("reload.gif"));
     refresh_button.setEnabled(false);
-    refresh_button.setToolTipText(get("Reload"));
+    refresh_button.setToolTipText(get("Browser.Reload"));
     bookmarks_button = new JButton("", Utility.getImage("bookmark.gif"));
     bookmarks_button.setEnabled(false);
-    bookmarks_button.setToolTipText(get("Bookmarks"));
+    bookmarks_button.setToolTipText(get("Browser.Bookmarks"));
     home_button = new JButton("", Utility.getImage("home.gif"));
-    home_button.setToolTipText(get("Home"));
+    home_button.setToolTipText(get("Browser.Home"));
     JPanel address_pane = new JPanel();
     address_field = new JTextField(Gatherer.config.getString("general.home_page", false));
     JPanel right_button_pane = new JPanel();
     go_button = new JButton("", Utility.getImage("go.gif"));
-    go_button.setToolTipText(get("Go"));
+    go_button.setToolTipText(get("Browser.Go"));
     stop_button = new JButton("", Utility.getImage("stop.gif"));
     stop_button.setEnabled(false);
-    stop_button.setToolTipText(get("Stop"));
+    stop_button.setToolTipText(get("Browser.Stop"));
     forward_button = new JButton("", Utility.getImage("forward.gif"));
     forward_button.setEnabled(false);
-    forward_button.setToolTipText(get("Forward"));
+    forward_button.setToolTipText(get("Browser.Forward"));
     //   Calpa Pane stuff
     view_pane = new CalHTMLPane(preferences, observer, "VIEW_PANE");
     //   Status bar
-    status_label = new JLabel(get("Ready"));
+    status_label = new JLabel(get("Browser.Ready"));
     // Connection
     address_field.addActionListener(new AddressFieldListener());
@@ -357 +357 @@
         args = new String[1];
         args[0] = url.toString();
-        status_label.setText(get("Follow"));
+        status_label.setText(get("Browser.Follow"));
         args = null;
     }
@@ -377 +377 @@
         args = new String[1];
         args[0] = url.toString();
-        status_label.setText(get("Loading", args));
+        status_label.setText(get("Browser.Loading", args));
         args = null;
         break;
@@ -398 +398 @@
         stop_button.setEnabled(false);
         // Rendering complete.
-        status_label.setText(get("Ready"));
+        status_label.setText(get("Browser.Ready"));
         go_button.setEnabled(true);
         stop_button.setEnabled(false);

trunk/gli/src/org/greenstone/gatherer/gui/CreatePane.java

@@ -158 +158 @@
     args = new String[1];
     args[0] = "0";
-    document_count = new JLabel(get("Document_Count", args));
+    document_count = new JLabel(get("CreatePane.Document_Count", args));
     tree = new OptionTree();
     // Progress Pane
     progress_pane = new JPanel();
 
-    progress_copy_label = new JLabel(get("Copy_Progress"));
+    progress_copy_label = new JLabel(get("CreatePane.Copy_Progress"));
     progress_copy_label.setForeground(Color.black);
     progress_copy_label.setHorizontalAlignment(JLabel.LEFT);
@@ -173 +173 @@
     Gatherer.c_man.registerCopyMonitor(copy_monitor);
 
-    progress_import_label = new JLabel(get("Import_Progress"));
+    progress_import_label = new JLabel(get("CreatePane.Import_Progress"));
     progress_import_label.setForeground(Color.black);
     progress_import_label.setHorizontalAlignment(JLabel.LEFT);
@@ -183 +183 @@
     Gatherer.c_man.registerImportMonitor(import_monitor);
 
-    progress_build_label = new JLabel(get("Build_Progress"));
+    progress_build_label = new JLabel(get("CreatePane.Build_Progress"));
     progress_build_label.setForeground(Color.black);
     progress_build_label.setHorizontalAlignment(JLabel.LEFT);
@@ -194 +194 @@
 
     // Buttons.
-    build_button = new JButton(get("Build_Collection"));
+    build_button = new JButton(get("CreatePane.Build_Collection"));
     build_button.addActionListener(new BuildButtonListener());
     build_button.setPreferredSize(BUTTON_SIZE);
-    cancel_button = new JButton(get("Cancel_Build"));
+    cancel_button = new JButton(get("CreatePane.Cancel_Build"));
     cancel_button.addActionListener(new CancelButtonListener());
     cancel_button.setEnabled(false);
@@ -228 +228 @@
     // Build control_pane
     JPanel stats_area = new JPanel();
-    stats_area.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createTitledBorder(get("Statistics_Title"))));
+    stats_area.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createTitledBorder(get("CreatePane.Statistics_Title"))));
     stats_area.setLayout(new GridLayout(1,1));
     stats_area.add(document_count);
@@ -242 +242 @@
 
     JPanel options_area = new JPanel();
-    options_area.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createTitledBorder(get("Options_Title"))));
+    options_area.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createTitledBorder(get("CreatePane.Options_Title"))));
     options_area.setLayout(new BorderLayout());
     options_area.add(left, BorderLayout.WEST);
@@ -482 +482 @@
         setToggleClickCount(1);
                 // Create tree.
-        building = new OptionTreeNode(get("Build"));
-        importing = new OptionTreeNode(get("Import"));
-        log = new OptionTreeNode(get("Log"));
-        options = new OptionTreeNode(get("Options"));
+        building = new OptionTreeNode(get("CreatePane.Build"));
+        importing = new OptionTreeNode(get("CreatePane.Import"));
+        log = new OptionTreeNode(get("CreatePane.Log"));
+        options = new OptionTreeNode(get("CreatePane.Options"));
 
         model = new DefaultTreeModel(options);

trunk/gli/src/org/greenstone/gatherer/gui/FileAssociationDialog.java

@@ -95 +95 @@
     setModal(true);
     setSize(SIZE);
-    setTitle(get("Title"));
+    setTitle(get("FileAssociationDialog.Title"));
     setJMenuBar(new SimpleMenuBar("0"));// need to find an appropriate help page
     JPanel content_pane = (JPanel) getContentPane();
     content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
     JPanel control_pane = new JPanel();
-    JTextArea instructions_area = new JTextArea(get("Instructions"));
+    JTextArea instructions_area = new JTextArea(get("FileAssociationDialog.Instructions"));
     instructions_area.setEditable(false);
     instructions_area.setLineWrap(true);
@@ -107 +107 @@
     JPanel extension_pane = new JPanel();
     extension_pane.setOpaque(false);
-    JLabel extension_label = new JLabel(get("Extension"));
+    JLabel extension_label = new JLabel(get("FileAssociationDialog.Extension"));
     extension_label.setPreferredSize(LABEL_SIZE);
     extension = new GComboBox();
@@ -117 +117 @@
     JPanel command_pane = new JPanel();
     command_pane.setOpaque(false);
-    JLabel command_label = new JLabel(get("Command"));
+    JLabel command_label = new JLabel(get("FileAssociationDialog.Command"));
     command_label.setPreferredSize(LABEL_SIZE);
     JPanel inner_pane = new JPanel();
@@ -128 +128 @@
         command.setText(manager.getCommandString((String)extension.get(0)));
     }
-    browse = new JButton(get("Browse"));
+    browse = new JButton(get("FileAssociationDialog.Browse"));
     browse.setBackground(Gatherer.config.getColor("coloring.button_background", false));
     browse.setPreferredSize(LABEL_SIZE);
@@ -191 +191 @@
     public String display(String new_extension) {
     if(new_extension != null) {
-        ok.setText(get("Add"));
+        ok.setText(get("FileAssociationDialog.Add"));
         int index = extension.add(new_extension);
         extension.setSelectedIndex(index);
@@ -242 +242 @@
     public void actionPerformed(ActionEvent event) {
         JFileChooser chooser = new JFileChooser(new File(Utility.BASE_DIR));
-        chooser.setDialogTitle(get("Browse_Title"));
-        chooser.setFileFilter(new ExtensionFileFilter(".bat", get("Batch_File")));
-        chooser.setFileFilter(new ExtensionFileFilter(".com", get("Command_File")));
-        chooser.setFileFilter(new ExtensionFileFilter(".exe", get("Executable_File")));
+        chooser.setDialogTitle(get("FileAssociationDialog.Browse_Title"));
+        chooser.setFileFilter(new ExtensionFileFilter(".bat", get("FileAssociationDialog.Batch_File")));
+        chooser.setFileFilter(new ExtensionFileFilter(".com", get("FileAssociationDialog.Command_File")));
+        chooser.setFileFilter(new ExtensionFileFilter(".exe", get("FileAssociationDialog.Executable_File")));
         chooser.setAcceptAllFileFilterUsed(true);
         int return_val = chooser.showOpenDialog(null);

trunk/gli/src/org/greenstone/gatherer/gui/PreviewPane.java

@@ -67 +67 @@
 
     // Create components
-    back = new JButton(get("Back"), Utility.getImage("back.gif"));
+    back = new JButton(get("Browser.Back"), Utility.getImage("back.gif"));
     back.addActionListener(new BackListener());
     back.setEnabled(false);
 
-    home = new JButton(get("Home"), Utility.getImage("home.gif"));
+    home = new JButton(get("Browser.Home"), Utility.getImage("home.gif"));
     home.addActionListener(new HomeListener());
     home.setEnabled(false);
 
-    forward = new JButton(get("Forward"), Utility.getImage("forward.gif"));
+    forward = new JButton(get("Browser.Forward"), Utility.getImage("forward.gif"));
     forward.addActionListener(new ForwardListener());
     forward.setEnabled(false);
 
-    reload = new JButton(get("Reload"), Utility.getImage("reload.gif"));
+    reload = new JButton(get("Browser.Reload"), Utility.getImage("reload.gif"));
     reload.addActionListener(new ReloadListener());
     reload.setEnabled(false);
@@ -87 +87 @@
     view = new CalHTMLPane(prefs, observer, "Default");
 
-    status = new JLabel(get("Ready"));
+    status = new JLabel(get("Browser.Ready"));
     }
 
@@ -102 +102 @@
         homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
         ///atherer.println("Loading " + url);
-        status.setText(get("Loading", homepage.toString()));
+        status.setText(get("Browser.Loading", homepage.toString()));
         view.showHTMLDocument(homepage, null, true);
         }
@@ -140 +140 @@
             homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
             ///atherer.println("Loading " + url);
-            status.setText(get("Loading", homepage.toString()));
+            status.setText(get("Browser.Loading", homepage.toString()));
             view.showHTMLDocument(homepage);
         }
@@ -233 +233 @@
     public void linkFocusUpdate(CalHTMLPane pane, URL url) {
         ///ystem.err.println("Link in focus " + url.toString());
-        status.setText(get("Follow", url.toString()));
+        status.setText(get("Browser.Follow", url.toString()));
     }
     public void statusUpdate(CalHTMLPane pane, int state, URL url, int value, String message) {
@@ -245 +245 @@
         case CalCons.PARSE_FAILED:
         ///ystem.err.println("Parse Failed: " + state + " - " + message);
-        status.setText(get("CannotConnect", url.toString()));
+        status.setText(get("Browser.CannotConnect", url.toString()));
         break;
         // The Pane has established a connection to the given URL and is receiving any content.
         case CalCons.CONNECTED:
         ///ystem.err.println("Connected: " + state + " - " + message);
-        status.setText(get("Loading", url.toString()));
+        status.setText(get("Browser.Loading", url.toString()));
         break;
         // The size of the content at the given URL is known and is contained in the value argument.
@@ -263 +263 @@
         case CalCons.PARSE_FAILED_POST_CONNECT:
         ///ystem.err.println("Parse Failed Post Connect: " + state + " - " + message);
-        status.setText(get("TimedOut", url.toString()));
+        status.setText(get("Browser.TimedOut", url.toString()));
         break;
         // The document has been parsed but formatting cannot be completed because the document contains images of unspecified size. The parsing thread is waiting for image updates to give it the information it needs to format and display the document.
@@ -272 +272 @@
         case CalCons.DOC_LOADED:
         ///ystem.err.println("Doc Loaded: " + state + " - " + message);
-        status.setText(get("Ready"));
+        status.setText(get("Browser.Ready"));
         break;
         }

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

@@ -105 +105 @@
     setModal(true);
     setSize(SIZE);
-    setTitle(get("Title"));
+    setTitle(get("AutoFilter.Title"));
     setJMenuBar(new SimpleMenuBar("6.7")); 
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
     JPanel name_pane = new JPanel();
-    JLabel name_label = new JLabel(get("Name"));
+    JLabel name_label = new JLabel(get("AutoFilter.Name"));
     JTextField name_template = new JTextField();
     name = new JLabel();
@@ -117 +117 @@
     JPanel value_pane = new JPanel();
     JPanel inner_value_pane = new JPanel();
-    JLabel value_label = new JLabel(get("eqeq"));
+    JLabel value_label = new JLabel(get("AutoFilter.eqeq"));
     value = new JComboBox();
     value.setEditable(false);
@@ -127 +127 @@
     first_value.addItem("");
     first_value.setSelectedItem("");
-    first_case = new JCheckBox(get("Case_Sensitive"));
+    first_case = new JCheckBox(get("AutoFilter.Case_Sensitive"));
     JPanel operator_pane = new JPanel();
-    JLabel operator_label = new JLabel(get("Operator"));
+    JLabel operator_label = new JLabel(get("AutoFilter.Operator"));
     ButtonGroup operator_group = new ButtonGroup();
-    and_check = new JCheckBox(get("AND"));
-    none_check = new JCheckBox(get("None"));
-    or_check = new JCheckBox(get("OR"));
+    and_check = new JCheckBox(get("AutoFilter.AND"));
+    none_check = new JCheckBox(get("AutoFilter.None"));
+    or_check = new JCheckBox(get("AutoFilter.OR"));
     none_check.setSelected(true);
     operator_group.add(none_check);
@@ -146 +146 @@
     second_value.addItem("");
     second_value.setSelectedItem("");
-    second_case = new JCheckBox(get("Case_Sensitive"));
+    second_case = new JCheckBox(get("AutoFilter.Case_Sensitive"));
     JPanel lower_pane = new JPanel();
     JPanel order_pane = new JPanel();
-    JLabel order_label = new JLabel(get("Order"));
+    JLabel order_label = new JLabel(get("AutoFilter.Order"));
     order = new JComboBox();
-    order.addItem(get("Ascending"));
-    order.addItem(get("Descending"));
+    order.addItem(get("AutoFilter.Ascending"));
+    order.addItem(get("AutoFilter.Descending"));
     // Assign values to method comboboxes.
     for(int i = 0; i < Autofilter.METHOD_LIST.length; i++) {
@@ -159 +159 @@
     }
     JPanel button_pane = new JPanel();
-    cancel_button = new JButton(get("Clear"));
+    cancel_button = new JButton(get("AutoFilter.Clear"));
     cancel_button.setMnemonic(KeyEvent.VK_C);
-    ok_button = new JButton(get("Set"));
+    ok_button = new JButton(get("AutoFilter.Set"));
     ok_button.setMnemonic(KeyEvent.VK_S);
     // Connection
@@ -214 +214 @@
     custom_pane.add(second_pane);
           
-    control.add(get("Filter_By_Value"), value_pane);
-    control.add(get("Custom_Filter"), custom_pane);
+    control.add(get("AutoFilter.Filter_By_Value"), value_pane);
+    control.add(get("AutoFilter.Custom_Filter"), custom_pane);
 
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));