Changeset 955 for XmlTools2


Ignore:
Timestamp:
Feb 11, 2014, 6:08:41 PM (11 years ago)
Author:
iritscen
Message:

Just a few language corrections to some strings.

Location:
XmlTools2/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • XmlTools2/trunk/optionsparser.cpp

    r944 r955  
    274274    }
    275275    else{
    276         UtilXmlTools::displayErrorMessage("Parameter Parsing","One operation is required to XmlTools continue. Possible operations are:\n"+
     276        UtilXmlTools::displayErrorMessage("Parameter Parsing","XmlTools needs an operation to perform. Possible operations are:\n"+
    277277                                          Util::toQString("--patch-files\n--add-values\n--remove-values\n--replace-value\n--replace-all-values\n--update-elements\n--invert-elements"));
    278278    }
  • XmlTools2/trunk/utilxmltools.cpp

    r935 r955  
    4646    if(!QFile::exists(file+".bak")){
    4747        if(!Util::backupFile(file)){
    48             std::cerr << "Couldn't backup file '" << file.toUtf8().constData() << "'. Aborting." << std::endl;
     48            std::cerr << "Couldn't back up file '" << file.toUtf8().constData() << "'. Aborting." << std::endl;
    4949            exit(1);
    5050        }
  • XmlTools2/trunk/xmlpatch.cpp

    r953 r955  
    8282
    8383            if(xPathExpression.isEmpty()){
    84                 errMessage = "It wasn't found any node with a ElementName: '" + filters.getElementName() + "'";
     84                errMessage = "No node was found with an ElementName: '" + filters.getElementName() + "'";
    8585                if(filters.getParentElementName()!=""){
    8686                    errMessage += " and a ParentElementName: '" + filters.getParentElementName() + "'";
     
    9191            }
    9292            else{
    93                 errMessage = "It wasn't found any node with a XPathExpression: '" + xPathExpression + "'";
     93                errMessage = "No node was found with an XPathExpression: '" + xPathExpression + "'";
    9494            }
    9595
     
    143143
    144144            if(xPathExpression.isEmpty()){
    145                 errMessage = "It wasn't found any node with a ElementName: '" + filters.getElementName() + "'";
     145                errMessage = "No node was found with an ElementName: '" + filters.getElementName() + "'";
    146146                if(filters.getParentElementName()!=""){
    147147                    errMessage += " and a ParentElementName: '" + filters.getParentElementName() + "'";
     
    152152            }
    153153            else{
    154                 errMessage = "It wasn't found any node with a XPathExpression: '" + xPathExpression + "'";
     154                errMessage = "No node was found with an XPathExpression: '" + xPathExpression + "'";
    155155            }
    156156
     
    371371            }
    372372            else if(!xPathExpression.isEmpty() && !filters.getElementName().isEmpty()){
    373                 UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option and XPathExpression options cannot be used simultaneously.");
     373                UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option and XPathExpression option cannot be used simultaneously.");
    374374            }
    375375            if(filters.getAttributeName()!="" && filters.getAttributeValue()==""){
     
    416416            }
    417417            else if(!xPathExpression.isEmpty() && !filters.getElementName().isEmpty()){
    418                 UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option and XPathExpression options cannot be used simultaneously.");
     418                UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option and XPathExpression option cannot be used simultaneously.");
    419419            }
    420420
     
    499499        parameter.remove(" "); // just remove the space added so it doesn't look weird when outputted to the user
    500500
    501         UtilXmlTools::displayErrorMessage("Read patch file parameter","Couldn't retreive '" + parameter + "' parameter.");
     501        UtilXmlTools::displayErrorMessage("Read patch file parameter","Couldn't retrieve '" + parameter + "' parameter.");
    502502    }
    503503
Note: See TracChangeset for help on using the changeset viewer.