Changeset 955 for XmlTools2/trunk

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:

• optionsparser.cpp (modified) (1 diff)
• utilxmltools.cpp (modified) (1 diff)
• xmlpatch.cpp (modified) (7 diffs)

XmlTools2/trunk/optionsparser.cpp

@@ -274 +274 @@
     }
     else{
-        UtilXmlTools::displayErrorMessage("Parameter Parsing","One operation is required to XmlTools continue. Possible operations are:\n"+
+        UtilXmlTools::displayErrorMessage("Parameter Parsing","XmlTools needs an operation to perform. Possible operations are:\n"+
                                           Util::toQString("--patch-files\n--add-values\n--remove-values\n--replace-value\n--replace-all-values\n--update-elements\n--invert-elements"));
     }

XmlTools2/trunk/utilxmltools.cpp

@@ -46 +46 @@
     if(!QFile::exists(file+".bak")){
         if(!Util::backupFile(file)){
-            std::cerr << "Couldn't backup file '" << file.toUtf8().constData() << "'. Aborting." << std::endl;
+            std::cerr << "Couldn't back up file '" << file.toUtf8().constData() << "'. Aborting." << std::endl;
             exit(1);
         }

XmlTools2/trunk/xmlpatch.cpp

@@ -82 +82 @@
 
             if(xPathExpression.isEmpty()){
-                errMessage = "It wasn't found any node with a ElementName: '" + filters.getElementName() + "'";
+                errMessage = "No node was found with an ElementName: '" + filters.getElementName() + "'";
                 if(filters.getParentElementName()!=""){
                     errMessage += " and a ParentElementName: '" + filters.getParentElementName() + "'";
@@ -91 +91 @@
             }
             else{
-                errMessage = "It wasn't found any node with a XPathExpression: '" + xPathExpression + "'";
+                errMessage = "No node was found with an XPathExpression: '" + xPathExpression + "'";
             }
 
@@ -143 +143 @@
 
             if(xPathExpression.isEmpty()){
-                errMessage = "It wasn't found any node with a ElementName: '" + filters.getElementName() + "'";
+                errMessage = "No node was found with an ElementName: '" + filters.getElementName() + "'";
                 if(filters.getParentElementName()!=""){
                     errMessage += " and a ParentElementName: '" + filters.getParentElementName() + "'";
@@ -152 +152 @@
             }
             else{
-                errMessage = "It wasn't found any node with a XPathExpression: '" + xPathExpression + "'";
+                errMessage = "No node was found with an XPathExpression: '" + xPathExpression + "'";
             }
 
@@ -371 +371 @@
             }
             else if(!xPathExpression.isEmpty() && !filters.getElementName().isEmpty()){
-                UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option and XPathExpression options cannot be used simultaneously.");
+                UtilXmlTools::displayErrorMessage("@ADD_INSIDE_NODES","ElementName option and XPathExpression option cannot be used simultaneously.");
             }
             if(filters.getAttributeName()!="" && filters.getAttributeValue()==""){
@@ -416 +416 @@
             }
             else if(!xPathExpression.isEmpty() && !filters.getElementName().isEmpty()){
-                UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option and XPathExpression options cannot be used simultaneously.");
+                UtilXmlTools::displayErrorMessage("@REMOVE_NODES","ElementName option and XPathExpression option cannot be used simultaneously.");
             }
 
@@ -499 +499 @@
         parameter.remove(" "); // just remove the space added so it doesn't look weird when outputted to the user
 
-        UtilXmlTools::displayErrorMessage("Read patch file parameter","Couldn't retreive '" + parameter + "' parameter.");
+        UtilXmlTools::displayErrorMessage("Read patch file parameter","Couldn't retrieve '" + parameter + "' parameter.");
     }