From 4f3e5c267e418b4085bf149a0208a6fc3e93a494 Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 17 Jul 2013 12:22:41 -0400 Subject: [PATCH 1/2] Prepare Dutch resource for translation --- .../wicket/GitBlitWebApp_nl.properties | 61 ++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties index f1281e149..e7f16b7e8 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties @@ -441,5 +441,64 @@ gb.validity = geldigheid gb.siteName = site naam gb.siteNameDescription = korte, verduidelijkende naam van deze server gb.excludeFromActivity = sluit uit van activiteitspagina +gb.isSparkleshared = repository is Sparkleshared +gb.owners = owners gb.sessionEnded = Sessie is afgesloten -gb.closeBrowser = Sluit de browser af om de sessie helemaal te beeindigen. \ No newline at end of file +gb.closeBrowser = Sluit de browser af om de sessie helemaal te beeindigen. +gb.doesNotExistInTree = {0} does not exist in tree {1} +gb.enableIncrementalPushTags = enable incremental push tags +gb.useIncrementalPushTagsDescription = on push, automatically tag each branch tip with an incremental revision number +gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push +gb.externalPermissions = {0} access permissions are externally maintained +gb.viewAccess = You do not have Gitblit read or write access +gb.overview = overview +gb.dashboard = dashboard +gb.monthlyActivity = monthly activity +gb.myProfile = my profile +gb.compare = compare +gb.manual = manual +gb.from = from +gb.to = to +gb.at = at +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 +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 +gb.anonymousUser= anonymous \ No newline at end of file From 515b6d443e024a569af23ad9f7410dec9927f08f Mon Sep 17 00:00:00 2001 From: James Moger Date: Wed, 17 Jul 2013 12:23:38 -0400 Subject: [PATCH 2/2] Documentation --- releases.moxie | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/releases.moxie b/releases.moxie index 2e3daf58a..f2952c64b 100644 --- a/releases.moxie +++ b/releases.moxie @@ -5,7 +5,9 @@ r18: { title: ${project.name} ${project.version} released id: ${project.version} date: ${project.buildDate} - note: ~ + note: '' + If you have forked repositories and your are upgrading from 1.2.x to 1.3.x, please DO NOT RELOCATE your repositories folder when running 1.3.x the first time. Gitblit will update forked repository configs on the first execution and it is critical that ${git.repositoriesFolder} points to the same location used by 1.2.x. + '' html: ~ text: ~ security: ~