Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
@@ -100,7 +100,7 @@ $lang->repo->split = "Split Mark";
|
||||
|
||||
$lang->repo->objectRule = 'Object Rule';
|
||||
$lang->repo->objectIdRule = 'Object ID Rule';
|
||||
$lang->repo->actionRule = 'Action RUle';
|
||||
$lang->repo->actionRule = 'Action Rule';
|
||||
$lang->repo->manHourRule = 'Man-hour Rule';
|
||||
$lang->repo->ruleUnit = "Unit";
|
||||
$lang->repo->ruleSplit = "Multiple keywords are divided by ';'. For example: task multiple keywords: Task;task";
|
||||
|
||||
@@ -7,9 +7,9 @@ $lang->repo->createAction = 'Create Repo';
|
||||
$lang->repo->edit = 'Edit';
|
||||
$lang->repo->editAction = 'Edit Repo';
|
||||
$lang->repo->delete = 'Delete Repo';
|
||||
$lang->repo->showSyncCommit = 'Display Synchronization';
|
||||
$lang->repo->showSyncCommit = 'Display Sync';
|
||||
$lang->repo->ajaxSyncCommit = 'Interface: Ajax Sync Note';
|
||||
$lang->repo->setRules = 'Set rules';
|
||||
$lang->repo->setRules = 'Set Rules';
|
||||
$lang->repo->download = 'Download File';
|
||||
$lang->repo->downloadDiff = 'Download Diff';
|
||||
$lang->repo->diffAction = 'Revision Diff';
|
||||
@@ -90,7 +90,7 @@ $lang->repo->openedDate = 'CreatedDate';
|
||||
$lang->repo->latestRevision = 'Latest Revision';
|
||||
$lang->repo->actionInfo = "Add by %s in %s";
|
||||
$lang->repo->changes = "Change Log";
|
||||
$lang->repo->reviewLocation = "File: %s@%s, line:%s - %s";
|
||||
$lang->repo->reviewLocation = "File: %s@%s, Line: %s - %s";
|
||||
$lang->repo->commentEdit = '<i class="icon-pencil"></i>';
|
||||
$lang->repo->commentDelete = '<i class="icon-remove"></i>';
|
||||
$lang->repo->allChanges = "Other Changes";
|
||||
@@ -100,7 +100,7 @@ $lang->repo->split = "Split Mark";
|
||||
|
||||
$lang->repo->objectRule = 'Object Rule';
|
||||
$lang->repo->objectIdRule = 'Object ID Rule';
|
||||
$lang->repo->actionRule = 'Action RUle';
|
||||
$lang->repo->actionRule = 'Action Rule';
|
||||
$lang->repo->manHourRule = 'Man-hour Rule';
|
||||
$lang->repo->ruleUnit = "Unit";
|
||||
$lang->repo->ruleSplit = "Multiple keywords are divided by ';'. For example: task multiple keywords: Task;task";
|
||||
@@ -119,17 +119,17 @@ $lang->repo->encodingList['utf_8'] = 'UTF-8';
|
||||
$lang->repo->encodingList['gbk'] = 'GBK';
|
||||
|
||||
$lang->repo->scmList['Git'] = 'Git';
|
||||
$lang->repo->scmList['Subversion'] = 'Subversion';
|
||||
$lang->repo->scmList['Subversion'] = 'SVN';
|
||||
|
||||
$lang->repo->notice = new stdclass();
|
||||
$lang->repo->notice->syncing = 'Synchronizing. Please wait ...';
|
||||
$lang->repo->notice->syncComplete = 'Synchronized. Now redirecting ...';
|
||||
$lang->repo->notice->syncedCount = 'The number of records synchronized is ';
|
||||
$lang->repo->notice->delete = 'Are you sure delete this repo?';
|
||||
$lang->repo->notice->delete = 'Do you want to delete this repo?';
|
||||
$lang->repo->notice->successDelete = 'Repository is removed.';
|
||||
$lang->repo->notice->commentContent = 'Comment';
|
||||
$lang->repo->notice->deleteBug = 'Are you sure to delete this bug?';
|
||||
$lang->repo->notice->deleteComment = 'Are you sure to delete this comment?';
|
||||
$lang->repo->notice->deleteBug = 'Do you want to delete this bug?';
|
||||
$lang->repo->notice->deleteComment = 'Do you want to delete this comment?';
|
||||
$lang->repo->notice->lastSyncTime = 'Last Sync:';
|
||||
|
||||
$lang->repo->rules = new stdclass();
|
||||
|
||||
@@ -100,7 +100,7 @@ $lang->repo->split = "Split Mark";
|
||||
|
||||
$lang->repo->objectRule = 'Object Rule';
|
||||
$lang->repo->objectIdRule = 'Object ID Rule';
|
||||
$lang->repo->actionRule = 'Action RUle';
|
||||
$lang->repo->actionRule = 'Action Rule';
|
||||
$lang->repo->manHourRule = 'Man-hour Rule';
|
||||
$lang->repo->ruleUnit = "Unit";
|
||||
$lang->repo->ruleSplit = "Multiple keywords are divided by ';'. For example: task multiple keywords: Task;task";
|
||||
|
||||
Reference in New Issue
Block a user