From 609a16e10fb705e146e7fd4b0fe48c744d40a2e0 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 03 Nov 2011 17:11:47 -0400 Subject: [PATCH] Revised branch rendering. Added ref rendering to message column. --- src/com/gitblit/wicket/GitBlitWebApp.properties | 122 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 108 insertions(+), 14 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index f2fe232..3ab1b7a 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -38,13 +38,12 @@ gb.pageFirst = first gb.pagePrevious prev gb.pageNext = next -gb.parent = parent gb.head = HEAD gb.blame = blame -gb.login = Login -gb.logout = Logout -gb.username = Username -gb.password = Password +gb.login = login +gb.logout = logout +gb.username = username +gb.password = password gb.tagger = tagger gb.moreHistory = more history... gb.difftocurrent = diff to current @@ -55,6 +54,7 @@ gb.modification = modification gb.deletion = deletion gb.rename = rename +gb.metrics = metrics gb.stats = stats gb.markdown = markdown gb.changedFiles = changed files @@ -66,23 +66,117 @@ gb.missingUsername = Missing Username gb.edit = edit gb.searchTypeTooltip = Select Search Type -gb.searchTooltip = Search Git:Blit -gb.rename = rename +gb.searchTooltip = Search {0} gb.delete = delete gb.docs = docs gb.accessRestriction = access restriction gb.name = name -gb.description = description gb.enableTickets = enable tickets gb.enableDocs = enable docs gb.save = save gb.showRemoteBranches = show remote branches gb.editUsers = edit users -gb.password = password gb.confirmPassword = confirm password -gb.repositories = repositories +gb.restrictedRepositories = restricted repositories gb.canAdmin can admin -gb.notRestricted = open repository -gb.cloneRestricted = clone-restricted repository -gb.pushRestricted = push-restricted repository -gb.viewRestricted = view-restricted repository \ No newline at end of file +gb.notRestricted = anonymous view, clone, & push +gb.pushRestricted = authenticated push +gb.cloneRestricted = authenticated clone & push +gb.viewRestricted = authenticated view, clone, & push +gb.useTicketsDescription = distributed Ticgit issues +gb.useDocsDescription = enumerates Markdown documentation in repository +gb.showRemoteBranchesDescription = show remote branches +gb.canAdminDescription = can administer Gitblit server +gb.permittedUsers = permitted users +gb.isFrozen = is frozen +gb.isFrozenDescription = deny push operations +gb.zip = zip +gb.showReadme = show readme +gb.showReadmeDescription = show a \"readme\" Markdown file on the summary page +gb.nameDescription = use '/' to group repositories. e.g. libraries/mycoollib.git +gb.ownerDescription = the owner may edit repository settings +gb.blob = blob +gb.commitActivityTrend = commit activity trend +gb.commitActivityDOW = commit activity by day of week +gb.commitActivityAuthors = primary authors by commit activity +gb.feed = feed +gb.cancel = cancel +gb.changePassword = change password +gb.isFederated = is federated +gb.federateThis = federate this repository +gb.federateOrigin = federate the origin +gb.excludeFromFederation = exclude from federation +gb.excludeFromFederationDescription = block federated Gitblit instances from pulling this account +gb.tokens = federation tokens +gb.tokenAllDescription = all repositories, users, & settings +gb.tokenUnrDescription = all repositories & users +gb.tokenJurDescription = all repositories +gb.federatedRepositoryDefinitions = repository definitions +gb.federatedUserDefinitions = user definitions +gb.federatedSettingDefinitions = setting definitions +gb.proposals = federation proposals +gb.received = received +gb.type = type +gb.token = token +gb.repositories = repositories +gb.proposal = proposal +gb.frequency = frequency +gb.folder = folder +gb.lastPull = last pull +gb.nextPull = next pull +gb.inclusions = inclusions +gb.exclusions = exclusions +gb.registration = registration +gb.registrations = federation registrations +gb.sendProposal propose +gb.status = status +gb.origin = origin +gb.federationStrategy = federation strategy +gb.federationRegistration = federation registration +gb.federationResults = federation pull results +gb.federationSets = federation sets +gb.message = message +gb.myUrlDescription = the publicly accessible url for your Gitblit instance +gb.destinationUrl = send to +gb.destinationUrlDescription = the url of the Gitblit instance to send your proposal +gb.users = users +gb.federation = federation +gb.error = error +gb.refresh = refresh +gb.browse = browse +gb.clone = clone +gb.filter = filter +gb.create = create +gb.servers = servers +gb.recent = recent +gb.available = available +gb.selected = selected +gb.size = size +gb.downloading = downloading +gb.loading = loading +gb.starting = starting +gb.general = general +gb.settings = settings +gb.manage = manage +gb.lastLogin = last login +gb.skipSizeCalculation = skip size calculation +gb.skipSizeCalculationDescription = do not calculate the repository size (reduces page load time) +gb.skipSummaryMetrics = skip summary metrics +gb.skipSummaryMetricsDescription = do not calculate metrics on the summary page (reduces page load time) +gb.accessLevel = access level +gb.default = default +gb.setDefault = set default +gb.since = since +gb.status = status +gb.bootDate = boot date +gb.servletContainer = servlet container +gb.heapMaximum = maximum heap +gb.heapAllocated = allocated heap +gb.heapUsed = used heap +gb.free = free +gb.version = version +gb.releaseDate = release date +gb.date = date +gb.activity = activity +gb.subscribe = subscribe +gb.branch = branch \ No newline at end of file -- Gitblit v1.9.1