Merge branch 'master' of github.com:easysoft/zentaopms

module/action/lang/en.php

@@ -46,11 +46,11 @@ $lang->action->history->diff   = 'Diff';
 $lang->action->dynamic = new stdclass();
 $lang->action->dynamic->today      = 'Today';
 $lang->action->dynamic->yesterday  = 'Yesterday';
-$lang->action->dynamic->twoDaysAgo = '2DaysAgo';
-$lang->action->dynamic->thisWeek   = 'ThisWeek';
-$lang->action->dynamic->lastWeek   = 'LastWeek';
-$lang->action->dynamic->thisMonth  = 'ThisMonth';
-$lang->action->dynamic->lastMonth  = 'LastMonth';
+$lang->action->dynamic->twoDaysAgo = '2 Days Ago';
+$lang->action->dynamic->thisWeek   = 'This Week';
+$lang->action->dynamic->lastWeek   = 'Last Week';
+$lang->action->dynamic->thisMonth  = 'This Month';
+$lang->action->dynamic->lastMonth  = 'Last Month';
 $lang->action->dynamic->all        = 'All';
 $lang->action->dynamic->hidden     = 'Hidden';
 $lang->action->dynamic->search     = 'Search';

module/bug/lang/en.php

@@ -103,10 +103,10 @@ $lang->bug->copy               = 'Copy';
 $lang->bug->search             = 'Search';
 
 /* 查询条件列表。*/
-$lang->bug->assignToMe         = 'AssignedToMe';
-$lang->bug->openedByMe         = 'CreatedByMe';
-$lang->bug->resolvedByMe       = 'ResolvedByMe';
-$lang->bug->closedByMe         = 'ClosedByMe';
+$lang->bug->assignToMe         = 'Assigned To Me';
+$lang->bug->openedByMe         = 'Created By Me';
+$lang->bug->resolvedByMe       = 'Resolved By Me';
+$lang->bug->closedByMe         = 'Closed By Me';
 $lang->bug->assignToNull       = 'Unassigned';
 $lang->bug->unResolved         = 'Unresolved';
 $lang->bug->toClosed           = 'Unclosed';

module/my/lang/en.php

@@ -26,16 +26,16 @@ $lang->my->noTodo         = 'No todos. ';
 
 $lang->my->taskMenu = new stdclass();
 $lang->my->taskMenu->assignedToMe = 'Assigned To Me';
-$lang->my->taskMenu->openedByMe   = 'CreatedByMe';
-$lang->my->taskMenu->finishedByMe = 'FinishedByMe';
-$lang->my->taskMenu->closedByMe   = 'ClosedByMe';
-$lang->my->taskMenu->canceledByMe = 'CancelledByMe';
+$lang->my->taskMenu->openedByMe   = 'Created By Me';
+$lang->my->taskMenu->finishedByMe = 'Finished By Me';
+$lang->my->taskMenu->closedByMe   = 'Closed By Me';
+$lang->my->taskMenu->canceledByMe = 'Cancelled By Me';
 
 $lang->my->storyMenu = new stdclass();
-$lang->my->storyMenu->assignedToMe = 'AssignedToMe';
-$lang->my->storyMenu->openedByMe   = 'CreatedByMe';
-$lang->my->storyMenu->reviewedByMe = 'ReviewedByMe';
-$lang->my->storyMenu->closedByMe   = 'ClosedByMe';
+$lang->my->storyMenu->assignedToMe = 'Assigned To Me';
+$lang->my->storyMenu->openedByMe   = 'Created By Me';
+$lang->my->storyMenu->reviewedByMe = 'Reviewed By Me';
+$lang->my->storyMenu->closedByMe   = 'Closed By Me';
 
 $lang->my->home = new stdclass();
 $lang->my->home->latest        = 'Dynamic';

module/product/lang/en.php

@@ -79,10 +79,10 @@ $lang->product->iterationInfo = '%s Iterations';
 $lang->product->iterationView = 'Details';
 
 $lang->product->searchStory  = 'Search';
-$lang->product->assignedToMe = 'AssignedToMe';
-$lang->product->openedByMe   = 'CreatedByMe';
-$lang->product->reviewedByMe = 'ReviewedByMe';
-$lang->product->closedByMe   = 'ClosedByMe';
+$lang->product->assignedToMe = 'Assigned To Me';
+$lang->product->openedByMe   = 'Created By Me';
+$lang->product->reviewedByMe = 'Reviewed By Me';
+$lang->product->closedByMe   = 'Closed By Me';
 $lang->product->draftStory   = 'Draft';
 $lang->product->activeStory  = 'Activated';
 $lang->product->changedStory = 'Changed';

module/testcase/lang/en.php

@@ -112,11 +112,11 @@ $lang->testcase->deleteStep   = 'Delete';
 $lang->testcase->insertBefore = 'Inserted Before';
 $lang->testcase->insertAfter  = 'Inserted After';
 
-$lang->testcase->assignToMe   = 'AssignedToMe';
-$lang->testcase->openedByMe   = 'CreatedByMe';
+$lang->testcase->assignToMe   = 'Assigned To Me';
+$lang->testcase->openedByMe   = 'Created By Me';
 $lang->testcase->allCases     = 'All';
 $lang->testcase->allTestcases = 'All Cases';
-$lang->testcase->needConfirm  = 'StoryChanged';
+$lang->testcase->needConfirm  = 'Story Changed';
 $lang->testcase->bySearch     = 'Search';
 $lang->testcase->unexecuted   = 'Wait';
 

module/todo/view/batchcreate.html.php

@@ -16,7 +16,7 @@
 <div id="mainContent">
   <div class="main-header">
     <h2><?php echo $lang->todo->batchCreate . $lang->todo->common;?></h2>
-    <div class="input-group pull-left" style='width:255px;'>
+    <div class="input-group pull-left">
       <span class="input-group-addon"><?php echo $lang->todo->date;?></span>
       <input type="text" name="date" value="<?php echo $date;?>" class="form-control form-date" autocomplete="off" />
       <span class="input-group-addon">

module/user/lang/en.php

@@ -100,7 +100,7 @@ $lang->user->weakPassword = "Your password does not meet the complexity requirem
 
 $lang->user->roleList['']       = '';
 $lang->user->roleList['dev']    = 'Developer';
-$lang->user->roleList['qa']     = 'Tester';
+$lang->user->roleList['qa']     = 'QA';
 $lang->user->roleList['pm']     = 'Scrum Master';
 $lang->user->roleList['po']     = 'Product Owner';
 $lang->user->roleList['td']     = 'Technical Manager';