summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-01-30 04:57:23 -0800
committerJames Moger <james.moger@gitblit.com>2014-01-30 04:57:23 -0800
commite536e05fd5a71f25595839f097984c9c922530bb (patch)
tree792b303734ebe455c91caa823a55a9a848b6bff9 /src/main
parentec24beaa1a1d1cfcf2252cd39aaba5a76905ed63 (diff)
parent765206d62c6d5210203ee52e7e1f813ec3b5fbc5 (diff)
downloadgitblit-e536e05fd5a71f25595839f097984c9c922530bb.tar.gz
gitblit-e536e05fd5a71f25595839f097984c9c922530bb.zip
Merge pull request #138 from ptemplier/patch-1
Typo on Gitblit in english labels
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/gitblit/wicket/GitBlitWebApp.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 05553316..23cb649c 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -343,7 +343,7 @@ gb.canCreate = can create
gb.canCreateDescription = can create personal repositories
gb.illegalPersonalRepositoryLocation = your personal repository must be located at \"{0}\"
gb.verifyCommitter = verify committer
-gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account
+gb.verifyCommitterDescription = require committer identity to match pushing Gitblit user account
gb.verifyCommitterNote = all merges require "--no-ff" to enforce committer identity
gb.repositoryPermissions = repository permissions
gb.userPermissions = user permissions
@@ -508,4 +508,4 @@ gb.diffStat = {0} insertions & {1} deletions
gb.home = home
gb.isMirror = this repository is a mirror
gb.mirrorOf = mirror of {0}
-gb.mirrorWarning = this repository is a mirror and can not receive pushes \ No newline at end of file
+gb.mirrorWarning = this repository is a mirror and can not receive pushes