From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 24 Feb 2025 10:18:06 +0000 (+0100)
Subject: Branch off 17/18
X-Git-Url: http://git.postgresql.org/gitweb/queryCache.php?a=commitdiff_plain;p=pgtranslation%2Fadmin.git

Branch off 17/18

master is now version 18, and version 17 has its own branch.
---

diff --git a/wwwtools/messages-branches.txt b/wwwtools/messages-branches.txt
index b793a12..7897ed5 100644
--- a/wwwtools/messages-branches.txt
+++ b/wwwtools/messages-branches.txt
@@ -1,4 +1,5 @@
-messages-17-branch		master
+messages-18-branch		master
+messages-17-branch		REL_17_STABLE
 messages-16-branch		REL_16_STABLE
 messages-15-branch		REL_15_STABLE
 messages-14-branch		REL_14_STABLE
diff --git a/wwwtools/nls-status-page b/wwwtools/nls-status-page
index 6c45082..e3f2a06 100755
--- a/wwwtools/nls-status-page
+++ b/wwwtools/nls-status-page
@@ -83,7 +83,8 @@ my %branch_status = (
     '14-branch' => 'maintenance',
     '15-branch' => 'maintenance',
     '16-branch' => 'maintenance',
-    '17-branch' => 'complete this now',
+    '17-branch' => 'maintenance',
+    '18-branch' => 'complete this now',
 );
 
 my @branches = reverse sort {
diff --git a/wwwtools/postgresql-branches.txt b/wwwtools/postgresql-branches.txt
index 74bdde6..ec0549e 100644
--- a/wwwtools/postgresql-branches.txt
+++ b/wwwtools/postgresql-branches.txt
@@ -1,3 +1,4 @@
+postgresql-18-branch	master
 postgresql-17-branch	REL_17_STABLE
 postgresql-16-branch	REL_16_STABLE
 postgresql-15-branch	REL_15_STABLE
diff --git a/wwwtools/update-nls-www b/wwwtools/update-nls-www
index 5d1611e..c9b9060 100755
--- a/wwwtools/update-nls-www
+++ b/wwwtools/update-nls-www
@@ -30,7 +30,7 @@ while true; do
 	esac
 done
 
-active_branches="17-branch 16-branch 15-branch 14-branch 13-branch"
+active_branches="18-branch 17-branch 16-branch 15-branch 14-branch 13-branch"
 
 if [ -n "$1" ]; then
 	active_branches=$1