mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 23:48:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'tagSupport' Pull Request #137 Issue #134

Browse source 
Conflicts:
	src/js/git/index.js
This commit is contained in:
Peter Cottle 2013-10-27 12:37:48 -07:00
commit ebfd5e84d2
10 changed files with 647 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/js/intl/strings.js
View file

@ -288,6 +288,11 @@ exports.strings = {
'fr_FR': 'Ce nom de branche "{branch}" n\'est pas autorisé'
},
///////////////////////////////////////////////////////////////////////////
'bad-tag-name': {
'__desc__': 'When the user enters a tag name thats not ok',
'en_US': 'That tag name "{tag}" is not allowed!'
},
///////////////////////////////////////////////////////////////////////////
'option-not-supported': {
'__desc__': 'When the user specifies an option that is not supported by our demo',
'en_US': 'The option "{option}" is not supported!',