From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 8 Jul 2017 20:26:29 +0000 (+0200)
Subject: Move XML declarations to the start of .ui files.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22b0595b354a0cf111e4ea8b14494be25d8c29ee;p=pspp

Move XML declarations to the start of .ui files.

Apparently xgettext complains if comments start the file.
---

diff --git a/src/ui/gui/aggregate.ui b/src/ui/gui/aggregate.ui
index f9a8a69cfe..850ef0161e 100644
--- a/src/ui/gui/aggregate.ui
+++ b/src/ui/gui/aggregate.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/autorecode.ui b/src/ui/gui/autorecode.ui
index 98474a5552..cf6d095cda 100644
--- a/src/ui/gui/autorecode.ui
+++ b/src/ui/gui/autorecode.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/barchart.ui b/src/ui/gui/barchart.ui
index 677f221f46..2ffac33ced 100644
--- a/src/ui/gui/barchart.ui
+++ b/src/ui/gui/barchart.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/binomial.ui b/src/ui/gui/binomial.ui
index 81f97e1247..40e972be7f 100644
--- a/src/ui/gui/binomial.ui
+++ b/src/ui/gui/binomial.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/chi-square.ui b/src/ui/gui/chi-square.ui
index a9a4fb7210..f57db45a49 100644
--- a/src/ui/gui/chi-square.ui
+++ b/src/ui/gui/chi-square.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/comments.ui b/src/ui/gui/comments.ui
index 5309d4ad71..95aec4e924 100644
--- a/src/ui/gui/comments.ui
+++ b/src/ui/gui/comments.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/compute.ui b/src/ui/gui/compute.ui
index 7c99d59207..18bd8ff119 100644
--- a/src/ui/gui/compute.ui
+++ b/src/ui/gui/compute.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/correlation.ui b/src/ui/gui/correlation.ui
index 4b8836dee2..37161b5517 100644
--- a/src/ui/gui/correlation.ui
+++ b/src/ui/gui/correlation.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/count.ui b/src/ui/gui/count.ui
index c8becc157e..70189e5ebe 100644
--- a/src/ui/gui/count.ui
+++ b/src/ui/gui/count.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/crosstabs.ui b/src/ui/gui/crosstabs.ui
index 7b14dbe515..233657a6c1 100644
--- a/src/ui/gui/crosstabs.ui
+++ b/src/ui/gui/crosstabs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index c922d371ba..214af79738 100644
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0"?>
 <interface>
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
diff --git a/src/ui/gui/descriptives.ui b/src/ui/gui/descriptives.ui
index 69f4fb755d..c63aa4cf86 100644
--- a/src/ui/gui/descriptives.ui
+++ b/src/ui/gui/descriptives.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/entry-dialog.ui b/src/ui/gui/entry-dialog.ui
index 84734177a9..e914ce1a11 100644
--- a/src/ui/gui/entry-dialog.ui
+++ b/src/ui/gui/entry-dialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/examine.ui b/src/ui/gui/examine.ui
index 6ee81a9336..5c7824371c 100644
--- a/src/ui/gui/examine.ui
+++ b/src/ui/gui/examine.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/factor.ui b/src/ui/gui/factor.ui
index 284f14b2aa..445d5b2039 100644
--- a/src/ui/gui/factor.ui
+++ b/src/ui/gui/factor.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/find.ui b/src/ui/gui/find.ui
index 02fa7b8ffc..ac05b5961d 100644
--- a/src/ui/gui/find.ui
+++ b/src/ui/gui/find.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/frequencies.ui b/src/ui/gui/frequencies.ui
index 1e7fdd457c..03dabe55a6 100644
--- a/src/ui/gui/frequencies.ui
+++ b/src/ui/gui/frequencies.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/goto-case.ui b/src/ui/gui/goto-case.ui
index 9cb6789887..79490b7a0c 100644
--- a/src/ui/gui/goto-case.ui
+++ b/src/ui/gui/goto-case.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/histogram.ui b/src/ui/gui/histogram.ui
index c714fdc8fe..e4c0313b3d 100644
--- a/src/ui/gui/histogram.ui
+++ b/src/ui/gui/histogram.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/indep-samples.ui b/src/ui/gui/indep-samples.ui
index ee3b8f0c22..f42973e172 100644
--- a/src/ui/gui/indep-samples.ui
+++ b/src/ui/gui/indep-samples.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/k-independent.ui b/src/ui/gui/k-independent.ui
index a5619e7548..8b1ffb2836 100644
--- a/src/ui/gui/k-independent.ui
+++ b/src/ui/gui/k-independent.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/k-means.ui b/src/ui/gui/k-means.ui
index 091607ae0b..838199228b 100644
--- a/src/ui/gui/k-means.ui
+++ b/src/ui/gui/k-means.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/k-related.ui b/src/ui/gui/k-related.ui
index 82432b7deb..3c9ad814e1 100644
--- a/src/ui/gui/k-related.ui
+++ b/src/ui/gui/k-related.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/ks-one-sample.ui b/src/ui/gui/ks-one-sample.ui
index 3f3ac235a4..9b5a1dc6cd 100644
--- a/src/ui/gui/ks-one-sample.ui
+++ b/src/ui/gui/ks-one-sample.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/logistic.ui b/src/ui/gui/logistic.ui
index e7a99015c0..94f7449bc3 100644
--- a/src/ui/gui/logistic.ui
+++ b/src/ui/gui/logistic.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/means.ui b/src/ui/gui/means.ui
index be2a4b2ca2..e277e43579 100644
--- a/src/ui/gui/means.ui
+++ b/src/ui/gui/means.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/missing-val-dialog.ui b/src/ui/gui/missing-val-dialog.ui
index 79ab29be65..09db6398e3 100644
--- a/src/ui/gui/missing-val-dialog.ui
+++ b/src/ui/gui/missing-val-dialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/oneway.ui b/src/ui/gui/oneway.ui
index 831ebe3a80..615ba2f380 100644
--- a/src/ui/gui/oneway.ui
+++ b/src/ui/gui/oneway.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/options.ui b/src/ui/gui/options.ui
index 87ca037102..3a15821edd 100644
--- a/src/ui/gui/options.ui
+++ b/src/ui/gui/options.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/output-window.ui b/src/ui/gui/output-window.ui
index 4b167714ab..f23dfd68b6 100644
--- a/src/ui/gui/output-window.ui
+++ b/src/ui/gui/output-window.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
diff --git a/src/ui/gui/paired-samples.ui b/src/ui/gui/paired-samples.ui
index 145446d816..cf59479fd3 100644
--- a/src/ui/gui/paired-samples.ui
+++ b/src/ui/gui/paired-samples.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/rank.ui b/src/ui/gui/rank.ui
index 950cbe2030..5c18d592f9 100644
--- a/src/ui/gui/rank.ui
+++ b/src/ui/gui/rank.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/recode.ui b/src/ui/gui/recode.ui
index 6e53c1d7d5..77f101c4bb 100644
--- a/src/ui/gui/recode.ui
+++ b/src/ui/gui/recode.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/regression.ui b/src/ui/gui/regression.ui
index b216a79bdb..00b552e00c 100644
--- a/src/ui/gui/regression.ui
+++ b/src/ui/gui/regression.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/reliability.ui b/src/ui/gui/reliability.ui
index e53fd853d8..4d739749c8 100644
--- a/src/ui/gui/reliability.ui
+++ b/src/ui/gui/reliability.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/roc.ui b/src/ui/gui/roc.ui
index 2e35c4acf8..92258c64f9 100644
--- a/src/ui/gui/roc.ui
+++ b/src/ui/gui/roc.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/runs.ui b/src/ui/gui/runs.ui
index 0d5d73e85a..3300bf653a 100644
--- a/src/ui/gui/runs.ui
+++ b/src/ui/gui/runs.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/scatterplot.ui b/src/ui/gui/scatterplot.ui
index 2890226f63..f460a1c01d 100644
--- a/src/ui/gui/scatterplot.ui
+++ b/src/ui/gui/scatterplot.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/select-cases.ui b/src/ui/gui/select-cases.ui
index 3359837b0a..518ec4a6c1 100644
--- a/src/ui/gui/select-cases.ui
+++ b/src/ui/gui/select-cases.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/sort.ui b/src/ui/gui/sort.ui
index eea998eb9f..37f6885937 100644
--- a/src/ui/gui/sort.ui
+++ b/src/ui/gui/sort.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/split-file.ui b/src/ui/gui/split-file.ui
index ab0fb42132..c59700c34b 100644
--- a/src/ui/gui/split-file.ui
+++ b/src/ui/gui/split-file.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/syntax-editor.ui b/src/ui/gui/syntax-editor.ui
index 16b2cf4bb5..56423ea70b 100644
--- a/src/ui/gui/syntax-editor.ui
+++ b/src/ui/gui/syntax-editor.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
   <menu id="syntax-window-menu">
diff --git a/src/ui/gui/t-test.ui b/src/ui/gui/t-test.ui
index 3d926f3355..8f29347dba 100644
--- a/src/ui/gui/t-test.ui
+++ b/src/ui/gui/t-test.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/text-data-import.ui b/src/ui/gui/text-data-import.ui
index 14c2bed0ed..0b40468ef1 100644
--- a/src/ui/gui/text-data-import.ui
+++ b/src/ui/gui/text-data-import.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/transpose.ui b/src/ui/gui/transpose.ui
index 49f3b2aca8..09a76d1e0b 100644
--- a/src/ui/gui/transpose.ui
+++ b/src/ui/gui/transpose.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/univariate.ui b/src/ui/gui/univariate.ui
index 4b4ac91f1e..031a776ded 100644
--- a/src/ui/gui/univariate.ui
+++ b/src/ui/gui/univariate.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
diff --git a/src/ui/gui/val-labs-dialog.ui b/src/ui/gui/val-labs-dialog.ui
index 6ef745c987..12767198c4 100644
--- a/src/ui/gui/val-labs-dialog.ui
+++ b/src/ui/gui/val-labs-dialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/var-type-dialog.ui b/src/ui/gui/var-type-dialog.ui
index b9234756dd..c47f623118 100644
--- a/src/ui/gui/var-type-dialog.ui
+++ b/src/ui/gui/var-type-dialog.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/variable-info.ui b/src/ui/gui/variable-info.ui
index 974638b3b7..3135c1d026 100644
--- a/src/ui/gui/variable-info.ui
+++ b/src/ui/gui/variable-info.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>
diff --git a/src/ui/gui/weight.ui b/src/ui/gui/weight.ui
index 01ebafb200..6f2faa7eba 100644
--- a/src/ui/gui/weight.ui
+++ b/src/ui/gui/weight.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- PSPP - a program for statistical analysis. -->
 <!-- Copyright (C) 2017 Free Software Foundation, Inc. -->
 
@@ -14,7 +15,6 @@
 <!-- You should have received a copy of the GNU General Public License -->
 <!-- along with this program.  If not, see <http://www.gnu.org/licenses/>. -->
 
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4.2"/>