Add header to all .pot files consistently

modules/po/adminlog.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: adminlog.cpp:29
 msgid "Show the logging target"
 msgstr ""

modules/po/alias.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: alias.cpp:141
 msgid "missing required parameter: {1}"
 msgstr ""

modules/po/autoattach.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: autoattach.cpp:94
 msgid "Added to list"
 msgstr ""

modules/po/autocycle.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: autocycle.cpp:27 autocycle.cpp:30
 msgid "[!]<#chan>"
 msgstr ""

modules/po/autoop.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: autoop.cpp:154
 msgid "List all users"
 msgstr ""

modules/po/autoreply.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: autoreply.cpp:25
 msgid "<reply>"
 msgstr ""

modules/po/autovoice.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: autovoice.cpp:120
 msgid "List all users"
 msgstr ""

modules/po/awaystore.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: awaystore.cpp:67
 msgid "You have been marked as away"
 msgstr ""

modules/po/block_motd.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: block_motd.cpp:26
 msgid "[<server>]"
 msgstr ""

modules/po/bouncedcc.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: bouncedcc.cpp:101 bouncedcc.cpp:119 bouncedcc.cpp:121
 msgctxt "list"
 msgid "Type"

modules/po/buffextras.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: buffextras.cpp:45
 msgid "Server"
 msgstr ""

modules/po/chansaver.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: chansaver.cpp:91
 msgid "Keeps config up-to-date when user joins/parts."
 msgstr ""

modules/po/clearbufferonmsg.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: clearbufferonmsg.cpp:160
 msgid "Clears all channel and query buffers whenever the user does something"
 msgstr ""

modules/po/clientnotify.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: clientnotify.cpp:47
 msgid "<message|notice|off>"
 msgstr ""

modules/po/controlpanel.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: controlpanel.cpp:51 controlpanel.cpp:63
 msgctxt "helptable"
 msgid "Type"

modules/po/crypt.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: crypt.cpp:198
 msgid "<#chan|Nick>"
 msgstr ""

modules/po/ctcpflood.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: ctcpflood.cpp:25 ctcpflood.cpp:27
 msgid "<limit>"
 msgstr ""

modules/po/cyrusauth.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: cyrusauth.cpp:42
 msgid "Shows current settings"
 msgstr ""

modules/po/dcc.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: dcc.cpp:88
 msgid "<nick> <file>"
 msgstr ""

modules/po/disconkick.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: disconkick.cpp:32
 msgid "You have been disconnected from the IRC server"
 msgstr ""

modules/po/fail2ban.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: fail2ban.cpp:25
 msgid "[minutes]"
 msgstr ""

modules/po/flooddetach.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: flooddetach.cpp:30
 msgid "Show current limits"
 msgstr ""

modules/po/identfile.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: identfile.cpp:30
 msgid "Show file name"
 msgstr ""

modules/po/imapauth.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: imapauth.cpp:168
 msgid "[ server [+]port [ UserFormatString ] ]"
 msgstr ""

modules/po/keepnick.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: keepnick.cpp:39
 msgid "Try to get your primary nick"
 msgstr ""

modules/po/kickrejoin.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: kickrejoin.cpp:56
 msgid "<secs>"
 msgstr ""

modules/po/log.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: log.cpp:59
 msgid "<rules>"
 msgstr ""

modules/po/missingmotd.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: missingmotd.cpp:36
 msgid "Sends 422 to clients when they login"
 msgstr ""

modules/po/modperl.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: modperl.cpp:382
 msgid "Loads perl scripts as ZNC modules"
 msgstr ""

modules/po/modpython.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: modpython.cpp:512
 msgid "Loads python scripts as ZNC modules"
 msgstr ""

modules/po/modules_online.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: modules_online.cpp:117
 msgid "Makes ZNC's *modules to be \"online\"."
 msgstr ""

modules/po/nickserv.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: nickserv.cpp:31
 msgid "Password set"
 msgstr ""

modules/po/notify_connect.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: notify_connect.cpp:24
 msgid "attached"
 msgstr ""

modules/po/partyline.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: partyline.cpp:60
 msgid "There are no open channels."
 msgstr ""

modules/po/perleval.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: perleval.pm:23
 msgid "Evaluates perl code"
 msgstr ""

modules/po/pyeval.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: pyeval.py:49
 msgid "You must have admin privileges to load this module."
 msgstr ""

modules/po/raw.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: raw.cpp:43
 msgid "View all of the raw traffic"
 msgstr ""

modules/po/route_replies.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: route_replies.cpp:209
 msgid "[yes|no]"
 msgstr ""

modules/po/sample.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: sample.cpp:31
 msgid "Sample job cancelled"
 msgstr ""

modules/po/samplewebapi.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: samplewebapi.cpp:59
 msgid "Sample Web API module."
 msgstr ""

modules/po/savebuff.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: savebuff.cpp:65
 msgid "<password>"
 msgstr ""

modules/po/shell.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: shell.cpp:37
 msgid "Failed to execute: {1}"
 msgstr ""

modules/po/simple_away.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: simple_away.cpp:56
 msgid "[<text>]"
 msgstr ""

modules/po/stripcontrols.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: stripcontrols.cpp:63
 msgid ""
 "Strips control codes (Colors, Bold, ..) from channel and private messages."

modules/po/watch.pot

@@ -1,3 +1,8 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: watch.cpp:334
 msgid "All entries cleared."
 msgstr ""

translation_pot.py

@@ -55,17 +55,20 @@ for tmpl_dir in args.tmpl_dirs:
                     else:
                         tmpl.append('msgstr ""')
                     tmpl.append('')
-if tmpl:
-    with open(tmpl_pot, 'wt', encoding='utf8') as f:
-        print('msgid ""', file=f)
-        print('msgstr ""', file=f)
-        print(r'"Content-Type: text/plain; charset=UTF-8\n"', file=f)
-        print(r'"Content-Transfer-Encoding: 8bit\n"', file=f)
-        print(file=f)
-        for line in tmpl:
-            print(line, file=f)
-    subprocess.check_call(['msguniq', '-o', tmpl_uniq_pot, tmpl_pot])
-    pot_list.append(tmpl_uniq_pot)
+
+# Bundle header to .tmpl, even if there were no .tmpl files.
+# Some .tmpl files contain non-ASCII characters, and the header is needed
+# anyway, because it's omitted from xgettext call below.
+with open(tmpl_pot, 'wt', encoding='utf8') as f:
+    print('msgid ""', file=f)
+    print('msgstr ""', file=f)
+    print(r'"Content-Type: text/plain; charset=UTF-8\n"', file=f)
+    print(r'"Content-Transfer-Encoding: 8bit\n"', file=f)
+    print(file=f)
+    for line in tmpl:
+        print(line, file=f)
+subprocess.check_call(['msguniq', '--force-po', '-o', tmpl_uniq_pot, tmpl_pot])
+pot_list.append(tmpl_uniq_pot)
 
 # .cpp
 main_pot = args.tmp_prefix + '_main.pot'