From: Anas Nashif <anas.nashif@intel.com>
Date: Fri, 16 Dec 2011 23:48:27 +0000 (+0000)
Subject: fixed wording
X-Git-Tag: v0.1~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adeca2f9bd51396c15c5ad6a2fcfd8c42240ed6a;p=tools%2Fgbs.git

fixed wording
---

diff --git a/data/build.sh b/data/build.sh
index 8bb4a65..76ec76d 100644
--- a/data/build.sh
+++ b/data/build.sh
@@ -34,9 +34,9 @@ do
     shift
 done
 
-git branch -a|sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'|grep "release" > /dev/null 2>&1 || die "Please run this command under release branch"
+git branch -a|sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'|grep "release" > /dev/null 2>&1 || die "Please run this command under the release branch"
 
-git status|grep "modified">/dev/null 2>&1 &&echo "Warning: You local changes doesn't commit yet."
+git status|grep "modified">/dev/null 2>&1 &&echo "Warning: Uncommited local changes found. Please commit local changes before running this command."
 
 # Get project name from git url
 git_url=`git config remote.origin.url`
@@ -123,7 +123,7 @@ if [  x$result != xSUCCESS ]; then
     curl -L -k -u$user:$passwd "$HUDSON_SERVER/job/build/$build_id/consoleText" -G
     die 'Remote Server Exception'
 else
-    echo "Your local changes has been submitted to build server."
+    echo "Your local changes have been submitted to the build server."
 fi
 
 rm package.tar.bz2
diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 2898668..29ab6bb 100644
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -33,10 +33,10 @@ from conf import configmgr
 def do(opts, args):
 
     if not os.path.isdir('.git'):
-        msger.error('must run this command under a git tree')
+        msger.error('You must run this command under a git tree')
 
     if git.branch(all=False, current=True)[0] != 'release':
-        msger.error('must run this command under release branch')
+        msger.error('You must run this command under the release branch')
 
     gitsts = git.status()
     if 'M ' in gitsts or ' M' in gitsts:
@@ -65,7 +65,7 @@ def do(opts, args):
     params['parameter'].append({"name": tarfp,
                                 "file": "file0"})
 
-    msger.info("Submiting your changes to build server ...")
+    msger.info("Submiting your changes to the build server...")
     ss.build_trigger(params, tarfp)
 
     time.sleep(0.5)
@@ -75,5 +75,5 @@ def do(opts, args):
         msger.error('remote server exception')
 
     os.remove(tarfp)
-    msger.info('your local changes has been submitted to build server.')
+    msger.info('Your local changes have been submitted to the build server.')
 
diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py
index 70aa420..45345ae 100644
--- a/gitbuildsys/cmd_import.py
+++ b/gitbuildsys/cmd_import.py
@@ -48,7 +48,7 @@ def do(opts, args):
                 {"name": "pkg", "value": tarname}
              ]}
 
-    msger.info('uploading tarball %s to src server ...' % tarfp)
+    msger.info('Uploading tarball %s to the source server...' % tarfp)
     ss.upload(params, tarfp)
     # TODO need to check the result and get the md5sum
     # TODO update sources automatically?