From: Peter Eisentraut <peter_e@gmx.net>
Date: Sat, 21 Apr 2018 23:17:11 +0000 (-0400)
Subject: Branch off 10/11
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=8271aa5f8f09b1159e4e1f54124a929cc5ae68be;p=pgtranslation%2Fadmin.git

Branch off 10/11

master is now version 11, and version 10 has its own branch.
---

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index 6acdd34..d82dba4 100644
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-10-branch		master
+messages-master			master
+messages-10-branch		REL_10_STABLE
 messages-9.6-branch		REL9_6_STABLE
 messages-9.5-branch		REL9_5_STABLE
 messages-9.4-branch		REL9_4_STABLE
diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index a09ef39..7892ea3 100755
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -84,6 +84,7 @@ my %branch_status = (
     '9.5-branch' => 'maintenance',
     '9.6-branch' => 'maintenance',
     '10-branch' => 'translate this now',
+    'master' => 'future',
 );
 
 my @branches = reverse sort {
diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index 26779da..2bd5a5a 100644
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-master	master
 postgresql-10-branch	REL_10_STABLE
 postgresql-9.6-branch	REL9_6_STABLE
 postgresql-9.5-branch	REL9_5_STABLE
diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index ac71d20..e624eb6 100755
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
 	esac
 done
 
-active_branches="10-branch 9.6-branch 9.5-branch 9.4-branch 9.3-branch"
+active_branches="master 10-branch 9.6-branch 9.5-branch 9.4-branch 9.3-branch"
 
 if [ -n "$1" ]; then
 	active_branches=$1