From 5abe3350a38b3cdfc28ac2839860d28b88f2306a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 24 Jun 2013 14:02:54 -0400 Subject: [PATCH] Improve time filter language and handling of daysBack parameter --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index 1b8583e..bca0dc0 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -257,7 +257,7 @@ gb.canNotLoadRepository = Can not load repository gb.commitIsNull = Commit is null gb.unauthorizedAccessForRepository = Unauthorized access for repository -gb.failedToFindCommit = Failed to find commit \"{0}\" in {1} for {2} page! +gb.failedToFindCommit = Failed to find commit \"{0}\" in {1}! gb.couldNotFindFederationProposal = Could not find federation proposal! gb.invalidUsernameOrPassword = Invalid username or password! gb.OneProposalToReview = There is 1 federation proposal awaiting review. @@ -452,7 +452,7 @@ gb.externalPermissions = {0} access permissions are externally maintained gb.viewAccess = You do not have Gitblit read or write access gb.overview = overview -gb.home = home +gb.dashboard = dashboard gb.monthlyActivity = monthly activity gb.myProfile = my profile gb.compare = compare @@ -460,17 +460,44 @@ gb.from = from gb.to = to gb.at = at -gb.morePushes = all pushes... -gb.pushes = pushes +gb.of = of +gb.in = in +gb.moreChanges = all changes... gb.pushedNCommitsTo = pushed {0} commits to gb.pushedOneCommitTo = pushed 1 commit to +gb.commitsTo = {0} commits to +gb.oneCommitTo = 1 commit to +gb.byNAuthors = by {0} authors +gb.byOneAuthor = by {0} gb.viewComparison = view comparison of these {0} commits \u00bb gb.nMoreCommits = {0} more commits \u00bb gb.oneMoreCommit = 1 more commit \u00bb gb.pushedNewTag = pushed new tag +gb.createdNewTag = created new tag gb.deletedTag = deleted tag gb.pushedNewBranch = pushed new branch +gb.createdNewBranch = created new branch gb.deletedBranch = deleted branch +gb.createdNewPullRequest = created pull request +gb.mergedPullRequest = merged pull request gb.rewind = REWIND gb.star = star -gb.unstar = unstar \ No newline at end of file +gb.unstar = unstar +gb.stargazers = stargazers +gb.starredRepositories = starred repositories +gb.failedToUpdateUser = Failed to update user account! +gb.myRepositories = my repositories +gb.noActivity = there has been no activity in the last {0} days +gb.findSomeRepositories = find some repositories +gb.metricAuthorExclusions = author metric exclusions +gb.myDashboard = my dashboard +gb.failedToFindAccount = failed to find user account ''{0}'' +gb.reflog = reflog +gb.active = active +gb.starred = starred +gb.owned = owned +gb.starredAndOwned = starred & owned +gb.reviewPatchset = review {0} patchset {1} +gb.todaysActivityStats = today / {1} commits by {2} authors +gb.todaysActivityNone = today / none +gb.noActivityToday = there has been no activity today \ No newline at end of file -- Gitblit v1.9.1