# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461006354 -7200
# Node ID 97b5330fa753a3e3d10912ddea4b5d12e7f2c1a7
# Parent  f8478a58346101d0e5cad70718725e18362d77c6# Parent  f6d0ae7cd43bea58c61ed384993b69cbaf8b06f0
Merged changes from the default branch.

diff -r f8478a583461 -r 97b5330fa753 messages/en_GB.imip-agent.po
--- a/messages/en_GB.imip-agent.po	Mon Apr 18 19:39:05 2016 +0200
+++ b/messages/en_GB.imip-agent.po	Mon Apr 18 21:05:54 2016 +0200
@@ -1,19 +1,19 @@
 # Translations for imip-agent.
-# Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
+# Copyright (C) 2015, 2016 Paul Boddie <paul@boddie.org.uk>
 # This file is distributed under the same license as the imip-agent package.
-# Paul Boddie <paul@boddie.org.uk>, 2015.
+# Paul Boddie <paul@boddie.org.uk>, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 4bc73eb1e076+\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-05 23:53+0100\n"
-"PO-Revision-Date: 2015-11-05 22:50+0100\n"
+"PO-Revision-Date: 2016-04-18 21:02+0200\n"
 "Last-Translator: Paul Boddie <paul@boddie.org.uk>\n"
 "Language-Team: English\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: imiptools/handlers/__init__.py:77
diff -r f8478a583461 -r 97b5330fa753 tools/i18n_messages.sh
--- a/tools/i18n_messages.sh	Mon Apr 18 19:39:05 2016 +0200
+++ b/tools/i18n_messages.sh	Mon Apr 18 21:05:54 2016 +0200
@@ -9,7 +9,7 @@
 
 # Set the default charset.
 
-  sed "s/CHARSET/iso-8859-1/" imip-agent.po \
+  sed "s/CHARSET/UTF-8/" imip-agent.po \
 > imip-agent.pot
 
 # Remove the original file.