[girl] Merge

[Ole Aamot <ole src gnome org>]

commit bd01458e09eb7ace515ac1a3a5f1716c2e5b142f
Author: Ole Aamot <oka oka no>
Date:   Wed Jan 6 00:07:02 2016 +0100

    Merge

 ChangeLog      |   37 +++++++++++++++++++++++++++++++++++++
 po/POTFILES.in |    1 +
 src/girl.xml   |    2 +-
 3 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7a6ff9e..6f1356e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+commit d66a6f89bc102826084ad51a606d9d8d56759646
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 5 23:38:57 2016 +0100
+
+    GIRL version information in DNS TXT record
+
+ VERSION | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit 7c02a39e597c8e38b3672624b40b7df3c928bf92
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 5 23:32:48 2016 +0100
+
+    Add GIRL 7.0 DTD
+
+ src/girl-7.0.dtd | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+commit 5402359306b6e5df977e9994e66dc5e4fbbcd046
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 5 23:31:34 2016 +0100
+
+    Add girl.desktop.in
+
+ ChangeLog            | 69 ++++++++++++++++++++++++++--------------------------
+ data/girl.desktop.in | 18 ++++++++++++++
+ 2 files changed, 52 insertions(+), 35 deletions(-)
+
+commit d4ed3e4525ce5c44e406ce36f00fbccfcc087592
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 5 23:24:06 2016 +0100
+
+    Rebase 7.0 tree
+
+ help/Makefile | 620 ----------------------------------------------------------
+ 1 file changed, 620 deletions(-)
+
 commit 72c6449205724fea9d4c38ee03796a8a653cec5d
 Author: Ole Aamot <oka oka no>
 Date:   Tue Jan 5 21:54:10 2016 +0100
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 786b225..c0b01fd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,6 +2,7 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 data/girl.appdata.xml.in
+data/girl.desktop.in
 data/girl.desktop.in.in
 src/girl-gui.c
 src/girl-listener.c
diff --git a/src/girl.xml b/src/girl.xml
index 0ae19da..c4afe45 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://people.gnome.org/~ole/girl/girl.xsl"; ?>
+<?xml-stylesheet type="text/xsl" href="girl.xsl" ?>
 <!DOCTYPE girl SYSTEM "girl-7.0.dtd">
 <girl version="7.0">
   <station band="94.1FM" id="narvikstudentradio" lang="nb" name="Narvik Studentradio" rank="1.0" type="edu">