Merge branch 'master' of http://code.vtiger.com/vtiger/vtigercrm

README.md

+Vtiger CRM
+==========
+
+Vtiger is a PHP based web application that helps businesses manage their sales and marketing processes.
+
+Development on vtiger is done at http://code.vtiger.com which is a gitlab server.
+
+To register for an account, please contact info @ vtiger.com, you will need this to file issues and/or fix the code
+Once you have an account, you can [browse the code](http://code.vtiger.com/vtiger/vtigercrm/tree/master),
+[see if your issue is already reported](http://code.vtiger.com/vtiger/vtigercrm/issues) and if you have a new problem
+to report you can [create an issue](http://code.vtiger.com/vtiger/vtigercrm/issues/new?issue)
+
+If you then want to fix the issue (or another issue) you can create your own fork of vtiger to work on using the
+fork button on the vtiger project, this will create a new git repository for you at
+    
+    http://code.vtiger.com/yourname/vtigercrm.git
+
+on your computer you will need a git client installed and you need to tell git who you are:
+
+    git config --global user.name "YOUR NAME"
+    git config --global user.email "YOUR EMAIL ADDRESS"
+
+now clone your fork of vtiger
+
+    git clone http://code.vtiger.com/yourname/vtigercrm.git
+
+this will pull down from the server your copy of the vtiger code and all the history.
+
+You will make a new branch for your changes, you can give it a descriptive name, once the branch is created
+you will switch to that branch using the checkout command
+
+    git branch fix_projects_on_calendar
+    git checkout fix_projects_on_calendar
+
+Now you can make your changes and commit all changed files with
+
+    git commit -a
+
+Do reference the issue number in your commit message, e.g. "fix #2 display projects on the calendar" the number will
+allow the system to link the commit to the issue.
+
+Now you can push your branch to the server, this creates the branch on the server end and populates it
+
+    git push --set-upstream origin fix_projects_on_calendar
+
+look at the branch on code.vtiger.com and create a merge request from your branch
+to the upstream master, this will be reviewed to see if it fixes the 
+issue and if all is good will be merged into the upstream code.
+You can then switch back to your master branch with
+
+    git checkout master
+
+And you can create additional feature branches from there to fix different things.
+
+If there have been other changes to the central vtiger code that you want in your work area then you can add the central
+repository as an upstream remote (only need to do this bit once), then you can fetch changes and merge them
+
+    git remote add upstream http://code.vtiger.com/vtiger/vtigercrm.git
+    git fetch upstream
+    git merge upstream/master
+

layouts/vlayout/modules/Settings/Leads/LeadMappingEdit.tpl

@@ -18,7 +18,7 @@
 				<span class="span4">
 					<span class="pull-right">
 						<button type="submit" class="btn btn-success"><strong>{vtranslate('LBL_SAVE', $QUALIFIED_MODULE)}</strong></button>
-						<a class="cancelLink" type="reset" onclick="javascript:window.history.back();">Cancel</a>
+						<a class="cancelLink" type="reset" onclick="javascript:window.history.back();">{vtranslate('LBL_CANCEL', $QUALIFIED_MODULE)}</a>
 					</span>
 				</span>
 			</div><hr>
@@ -173,7 +173,7 @@
 				<span class="span8">
 					<span class="pull-right">
 						<button type="submit" class="btn btn-success"><strong>{vtranslate('LBL_SAVE', $QUALIFIED_MODULE)}</strong></button>
-						<a class="cancelLink" type="reset" onclick="javascript:window.history.back();">Cancel</a>
+						<a class="cancelLink" type="reset" onclick="javascript:window.history.back();">{vtranslate('LBL_CANCEL', $QUALIFIED_MODULE)}</a>
 					</span>
 				</span>
 			</div>

layouts/vlayout/modules/Settings/Profiles/DeleteTransferForm.tpl

@@ -41,7 +41,7 @@
 			</div>
 			<div class="modal-footer">
 				<div class=" pull-right cancelLinkContainer">
-					<a class="cancelLink" data-dismiss="modal" type="reset">Cancel</a>
+					<a class="cancelLink" data-dismiss="modal" type="reset">{vtranslate('LBL_CANCEL', $MODULE)}</a>
 				</div>
 				<button class="btn btn-success pull-right" type="submit">{vtranslate('LBL_SAVE', $MODULE)}</button>
 			</div>

layouts/vlayout/modules/Settings/Profiles/EditView.tpl

@@ -234,7 +234,7 @@
         <br>
 		<div class="pull-right">
 			<button class="btn btn-success" type="submit"><strong>{vtranslate('LBL_SAVE',$MODULE)}</strong></button>
-			<a class="cancelLink" onclick="javascript:window.history.back();" type="reset">Cancel</a>
+			<a class="cancelLink" onclick="javascript:window.history.back();" type="reset">{vtranslate('LBL_CANCEL',$MODULE)}</a>
 			<br><br>
 		</div>
 	</form>

layouts/vlayout/modules/Settings/Profiles/EditViewContents.tpl

@@ -203,7 +203,7 @@
 										{else}
 											style="border-right: 1px solid #DDD !important;"
 										{/if}>
-									<input type="checkbox" class="alignTop"  name="permissions[{$TABID}][actions][{$ACTIONID}]" {if $RECORD_MODEL->hasModuleActionPermission($PROFILE_MODULE, $ACTIONID)}checked="true" {elseif empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} checked="true" {/if}> {$ACTION_MODEL->getName()}</td>
+									<input type="checkbox" class="alignTop"  name="permissions[{$TABID}][actions][{$ACTIONID}]" {if $RECORD_MODEL->hasModuleActionPermission($PROFILE_MODULE, $ACTIONID)}checked="true" {elseif empty($RECORD_ID) && empty($IS_DUPLICATE_RECORD)} checked="true" {/if}> {vtranslate($ACTION_MODEL->getName(),$QUALIFIED_MODULE)}</td>
 									{if $smarty.foreach.actions.last OR ($smarty.foreach.actions.index+1) % 3 == 0}
 										</div>
 									{/if}

layouts/vlayout/modules/Settings/Roles/DeleteTransferForm.tpl

@@ -42,7 +42,7 @@
 
 			<div class="modal-footer">
 				<div class=" pull-right cancelLinkContainer">
-					<a class="cancelLink" data-dismiss="modal" type="reset">Cancel</a>
+					<a class="cancelLink" data-dismiss="modal" type="reset">{vtranslate('LBL_CANCEL', $QUALIFIED_MODULE)}</a>
 				</div>
 				<button class="btn btn-success pull-right" type="submit">{vtranslate('LBL_SAVE', $QUALIFIED_MODULE)}</button>
 			</div>

layouts/vlayout/modules/Settings/Roles/EditView.tpl

@@ -86,7 +86,7 @@
 
 			<div class="textAlignCenter">
 				<button class="btn btn-success" type="submit">{vtranslate('LBL_SAVE',$MODULE)}</button>
-				<a class="cancelLink" onclick="javascript:window.history.back();" type="reset">Cancel</a>
+				<a class="cancelLink" onclick="javascript:window.history.back();" type="reset">{vtranslate('LBL_CANCEL',$MODULE)}</a>
 			</div>
 			<br>
 		</form>