Changeset 29034

Show
Ignore:
Timestamp:
05.05.2014 15:29:33 (5 years ago)
Author:
ak19
Message:

Minor changes and corrections.

Location:
main/trunk/gli
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/classes/dictionary.properties

    r29011 r29034  
    941941# 
    942942#***** FormatConversionDialog ***** 
    943 FormatConversionDialog.Title:Convert Greenstone2 format statements to Greenstone3 
     943FormatConversionDialog.Accept_All:Accept All 
     944FormatConversionDialog.Accept_All_Tooltip:Closes this dialog, accepting the default Greenstone3 format statements that have been automatically produced for the current and any subsequent Greenstone2 format statements. 
     945FormatConversionDialog.Cancel_Or_Accept_All:One or more Greenstone3 format statements contains invalid XML.\nEither press Cancel to correct the XML.\nOr press OK to store the Greenstone3 format statements as-is, albeit inactive.\nYou can later use the Format tab to revisit the format statements if you want to update their syntax. 
     946FormatConversionDialog.Cancel_Or_Continue_Next:Either press Cancel to go back and re-edit the XML.\nOr press OK to store the current XML as-is, albeit inactive, and continue on to the next statement.\nYou can later use the Format tab to revisit this format statement if you want to update its syntax. 
     947FormatConversionDialog.Cancel_Tooltip:Cancels out of opening the collection and closes this dialog, discarding any changes made in the dialog. 
     948FormatConversionDialog.Error_GS3_Format:Error in Greenstone3 format statement. 
     949FormatConversionDialog.GS2_Text_Tooltip:Greenstone2 format statement. 
     950FormatConversionDialog.GS3_Text_Tooltip:Greenstone3 format statement, must be XML to be active in Greenstone. 
     951FormatConversionDialog.Invalid_XML:Invalid XML. 
     952FormatConversionDialog.Invalid_XML_Warning_Title:Cancel or Continue? 
     953FormatConversionDialog.Next:Next 
     954FormatConversionDialog.Next_Tooltip:Inspect the next Greenstone3 format statement that has been automatically converted from a Greenstone2 format statement. 
    944955FormatConversionDialog.Reconvert:Reconvert 
    945956FormatConversionDialog.Reconvert_Tooltip:Converts the text that is currently in the Greenstone2 format text area into a Greenstone3 format statement. 
     957FormatConversionDialog.Tidy_Done:Tidy done. 
     958FormatConversionDialog.Tidy_Failed:Tidy failed. 
     959FormatConversionDialog.Title:Convert Greenstone2 format statements to Greenstone3 
    946960FormatConversionDialog.XHTML_Tidy:XHTML Tidy 
    947961FormatConversionDialog.XHTML_Tidy_Tooltip:Will run HTML Tidy over the Greenstone3 format statement to try to fix up obvious XHTML errors. 
    948 FormatConversionDialog.Next:Next 
    949 FormatConversionDialog.Next_Tooltip:Inspect the next Greenstone3 format statement that has been automatically converted from a Greenstone2 format statement. 
    950 FormatConversionDialog.Accept_All:Accept All 
    951 FormatConversionDialog.Accept_All_Tooltip:Closes this dialog, accepting the default Greenstone3 format statements that have been automatically produced for the current and any subsequent Greenstone2 format statements. 
    952 FormatConversionDialog.Cancel_Tooltip:Cancels out of opening the collection and closes this dialog, discarding any changes made in the dialog. 
    953 FormatConversionDialog.GS2_Text_Tooltip:Greenstone2 format statement. 
    954 FormatConversionDialog.GS3_Text_Tooltip:Greenstone3 format statement, must be XML to be active in Greenstone. 
    955 FormatConversionDialog.Tidy_Failed:Tidy failed. 
    956 FormatConversionDialog.Tidy_Done:Tidy done. 
    957962FormatConversionDialog.XML_Still_Invalid:XML is still invalid. 
    958 FormatConversionDialog.Error_GS3_Format:Error in Greenstone3 format statement. 
    959 FormatConversionDialog.Invalid_XML:Invalid XML. 
    960 FormatConversionDialog.Invalid_XML_Warning_Title:Cancel or Continue? 
    961 FormatConversionDialog.Cancel_Or_Continue_Next:Either press Cancel to go back and re-edit the XML.\nOr press OK to store the current XML as-is, albeit inactive, and continue on to the next statement.\nYou can later use the Format tab to revisit this format statement if you want to update its syntax. 
    962 FormatConversionDialog.Cancel_Or_Accept_All:One or more Greenstone3 format statements contains invalid XML.\nEither press Cancel to correct the XML.\nOr press OK to store the Greenstone3 format statements as-is, albeit inactive.\nYou can later use the Format tab to revisit the format statements if you want to update their syntax. 
    963963 
    964964#********************** 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

    r29031 r29034  
    110110    this.setComponentOrientation(Dictionary.getOrientation()); 
    111111    setSize(SIZE); 
    112     setTitle(Dictionary.get(Dictionary.get("FormatConversionDialog.Title"))); 
     112    setTitle(Dictionary.get("FormatConversionDialog.Title")); 
    113113    this.addWindowListener(new WindowClosingListener()); // the dialog's top right close button should behave as a Cancel press 
    114114    setDefaultCloseOperation(DISPOSE_ON_CLOSE); 
     
    393393    if(!validationMsg.startsWith(XMLTools.WELLFORMED)) { 
    394394        // Run Html Tidy in XML mode 
    395         System.err.println("*** Needing to run HTML Tidy on: "); 
    396         System.err.println(gs3formatstr_notags);         
     395        //System.err.println("*** Needing to run HTML Tidy on: "); 
     396        //System.err.println(gs3formatstr_notags);       
    397397 
    398398 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/NumberedJTextArea.java

    r29031 r29034  
    9393    setRows(11); 
    9494    setWrapStyleWord(false);     
    95     setToolTipText(Dictionary.get("FormatConversionDialog.GS2_Text_Tooltip")); 
     95    setToolTipText(tooltip); 
    9696    } 
    9797