# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461092974 -7200
# Node ID 0d8cf4785b666439013c135ab3d1c3995cd98981
# Parent  a0043845de02c1de0d3e2874750809839d620941# Parent  e21b475d90f7c9a5a0fc78bab968e2621290a6e7
Merged changes from the default branch.

diff -r a0043845de02 -r 0d8cf4785b66 imipweb/profile.py
--- a/imipweb/profile.py	Tue Apr 19 20:57:33 2016 +0200
+++ b/imipweb/profile.py	Tue Apr 19 21:09:34 2016 +0200
@@ -3,7 +3,7 @@
 """
 A Web interface to the user profile.
 
-Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
+Copyright (C) 2015, 2016 Paul Boddie <paul@boddie.org.uk>
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
@@ -135,7 +135,7 @@
         page.table(class_="profile", cellspacing=5, cellpadding=5)
         page.thead()
         page.tr()
-        page.th("Preferences", class_="mainheading", colspan=2)
+        page.th(_("Preferences"), class_="mainheading", colspan=2)
         page.tr.close()
         page.thead.close()
         page.tbody()
diff -r a0043845de02 -r 0d8cf4785b66 messages/en_GB.imip-agent.po
--- a/messages/en_GB.imip-agent.po	Tue Apr 19 20:57:33 2016 +0200
+++ b/messages/en_GB.imip-agent.po	Tue Apr 19 21:09:34 2016 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 4bc73eb1e076+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-18 21:06+0200\n"
+"POT-Creation-Date: 2016-04-18 21:21+0200\n"
 "PO-Revision-Date: 2016-04-18 21:02+0200\n"
 "Last-Translator: Paul Boddie <paul@boddie.org.uk>\n"
 "Language-Team: English\n"
@@ -484,6 +484,10 @@
 msgid "Recognise whom as a new organiser of an event?"
 msgstr ""
 
+#: imipweb/profile.py:138
+msgid "Preferences"
+msgstr ""
+
 #: imipweb/profile.py:182
 msgid "Save"
 msgstr ""
diff -r a0043845de02 -r 0d8cf4785b66 messages/nb_NO.imip-agent.po
--- a/messages/nb_NO.imip-agent.po	Tue Apr 19 20:57:33 2016 +0200
+++ b/messages/nb_NO.imip-agent.po	Tue Apr 19 21:09:34 2016 +0200
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bfa410ae3d63+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-18 21:06+0200\n"
+"POT-Creation-Date: 2016-04-18 21:21+0200\n"
 "PO-Revision-Date: 2016-04-08 21:21+0200\n"
 "Last-Translator: Paul Boddie <paul@boddie.org.uk>\n"
 "Language-Team: Norwegian Bokmål\n"
@@ -491,6 +491,10 @@
 msgid "Recognise whom as a new organiser of an event?"
 msgstr "Hvem får bli ny arrangør for en hendelse?"
 
+#: imipweb/profile.py:138
+msgid "Preferences"
+msgstr "Innstillinger"
+
 #: imipweb/profile.py:182
 msgid "Save"
 msgstr "Lagre"
diff -r a0043845de02 -r 0d8cf4785b66 tools/install.sh
--- a/tools/install.sh	Tue Apr 19 20:57:33 2016 +0200
+++ b/tools/install.sh	Tue Apr 19 21:09:34 2016 +0200
@@ -61,39 +61,39 @@
 fi
 
 # Install the config module in a more appropriate location.
+# Create new versions of configuration files instead of overwriting.
 
 if [ ! -e "$CONFIG_DIR" ]; then
     mkdir -p "$CONFIG_DIR"
 fi
 
 if [ -e "$CONFIG_DIR/config.py" ]; then
-    if [ ! -e "$CONFIG_DIR/config.py.backup" ]; then
-        mv "$CONFIG_DIR/config.py" "$CONFIG_DIR/config.py.backup"
-    fi
+    mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py.new"
+else
+    mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/config.py"
 fi
 
 if [ -e "$CONFIG_DIR/config.sh" ]; then
-    if [ ! -e "$CONFIG_DIR/config.sh.backup" ]; then
-        mv "$CONFIG_DIR/config.sh" "$CONFIG_DIR/config.sh.backup"
-    fi
+    cp "tools/config.sh" "$CONFIG_DIR/config.sh.new"
+else
+    cp "tools/config.sh" "$CONFIG_DIR/config.sh"
 fi
 
 # Replace the config module with a symbolic link.
 
-mv "$INSTALL_DIR/imiptools/config.py" "$CONFIG_DIR/"
 ln -s "$CONFIG_DIR/config.py" "$INSTALL_DIR/imiptools/config.py"
 
-# Copy the config script.
-
-cp tools/config.sh "$CONFIG_DIR/"
-
 # Copy related configuration files.
 
 if [ ! -e "$CONFIG_DIR/postgresql" ]; then
     mkdir -p "$CONFIG_DIR/postgresql"
 fi
 
-cp conf/postgresql/schema.sql "$CONFIG_DIR/postgresql/"
+if [ -e "$CONFIG_DIR/postgresql/schema.sql" ]; then
+    cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql.new"
+else
+    cp "conf/postgresql/schema.sql" "$CONFIG_DIR/postgresql/schema.sql"
+fi
 
 # Tools