[girl] GIRL 2.0.0



commit b1732c1310cc4d878328dfc1c3672071310a81fd
Author: Ole Aamot <oka oka no>
Date:   Sun Mar 29 00:10:52 2015 +0100

    GIRL 2.0.0

 ChangeLog                      | 1640 ++++++++++++++++++++++++++++++++++------
 Makefile.am                    |   27 +-
 NEWS                           |   16 +
 README                         |    9 +
 THANKS                         |    1 +
 configure                      |  337 ++++++++-
 configure.ac                   |    5 +-
 data/Makefile.in               |    8 +-
 data/icons/16x16/Makefile.in   |    8 +-
 data/icons/22x22/Makefile.in   |    8 +-
 data/icons/24x24/Makefile.in   |    8 +-
 data/icons/256x256/Makefile.in |    8 +-
 data/icons/32x32/Makefile.in   |    8 +-
 data/icons/48x48/Makefile.in   |    8 +-
 data/icons/Makefile.in         |    8 +-
 data/pixmaps/Makefile.in       |    8 +-
 data/screenshot.png            |  Bin 165520 -> 251842 bytes
 girl.spec.in                   |    4 +
 src/Makefile.am                |    4 +-
 src/Makefile.in                |   12 +-
 src/girl-gui.c                 |   11 +-
 src/girl-station.c             |    2 +-
 src/girl-station.h             |    2 +
 src/girl.c                     |   39 +-
 src/girl.h                     |    6 +-
 src/girl.xml                   |  149 +++--
 26 files changed, 1979 insertions(+), 357 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4d4fa43..9f39b00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,321 +1,1507 @@
-2015-03-21  Ole Aamot  <ole src gnome org>
+commit c24031433d2b13b817ec9df7413f4e26e6ad9220
+Author: Balázs Úr <urbalazs gmail com>
+Date:   Mon Mar 23 16:40:10 2015 +0000
+
+    Updated Hungarian translation
 
-       * AUTHORS: Add Enrico Nicoletto (Brazilian Portuguese translation)
-       * NEWS: girl version 1.9.0 release
-       * THANKS: Add Enrico Nicoletto (Brazilian Portuguese translation)
-       * po/cs.po: Updated Czech translation by Marek Černocký
-       * po/pl.po: Updated Polish translation by Piotr Drąg
-       * po/pt_BR.po: Updated Brazilian Portuguese by Enrico Nicoletto
-       * src/girl.xml: Add CFRC (cfrc.ca)
-       * src/girl.xml: Add CHUO (chuo.fm)
+ po/hu.po | 398 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 347 insertions(+), 51 deletions(-)
+
+commit 06ed0847c30f27453fc9360f77a300346002722b
+Author: Ole Aamot <oka oka no>
+Date:   Sat Mar 21 20:37:57 2015 +0100
+
+    GIRL 1.9.0
+
+ AUTHORS      |  1 +
+ ChangeLog    | 13 ++++++++-
+ Makefile.am  |  1 +
+ NEWS         | 15 +++++++++++
+ THANKS       |  3 ++-
+ configure    | 20 +++++++-------
+ configure.ac |  2 +-
+ girl.spec.in |  3 +++
+ src/girl.xml | 86 +++++++++++++++++++++++++++++++++++++++++-------------------
+ 9 files changed, 104 insertions(+), 40 deletions(-)
+
+commit 176c6942fe0bf7ae5cfc7641bada74cbdb061cb5
+Author: Ole Aamot <oka oka no>
+Date:   Sun Mar 15 10:23:12 2015 +0100
+
+    Update screenshot.
+
+ NEWS                |  16 +++-------------
+ data/screenshot.png | Bin 162426 -> 165520 bytes
+ 2 files changed, 3 insertions(+), 13 deletions(-)
+
+commit d74604f5b11f96688ab1229b011101cf0caa3367
+Author: Marek Černocký <marek manet cz>
+Date:   Mon Mar 16 15:23:36 2015 +0100
+
+    Updated Czech translation
+
+ po/cs.po | 82 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 41 insertions(+), 41 deletions(-)
+
+commit e1d06e9679dcde2af566c5f9f1bdfb6bac2f983c
+Author: Enrico Nicoletto <liverig gmail com>
+Date:   Sun Mar 15 22:57:44 2015 +0000
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 83 ++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 43 insertions(+), 40 deletions(-)
+
+commit e7a89a7b1d89dc59b21d5217d560880df814aa81
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sun Mar 15 22:47:37 2015 +0100
+
+    Updated Polish translation
+
+ po/pl.po | 76 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 38 insertions(+), 38 deletions(-)
+
+commit d062e7e38d9b9e0e94b1603067c32a6dac6d1ca0
+Author: Ole Aamot <oka oka no>
+Date:   Sat Mar 14 17:46:06 2015 +0100
+
+    GNOME Internet Radio Locator 1.8.0
+
+ AUTHORS                        |   1 +
+ ChangeLog                      |  10 +
+ Makefile.am                    |   2 +
+ NEWS                           |  26 +++
+ THANKS                         |   1 +
+ configure                      | 449 ++++++++++++++++++++++++++++++++++++++++-
+ configure.ac                   |   7 +-
+ data/Makefile.in               |   7 +
+ data/icons/16x16/Makefile.in   |   7 +
+ data/icons/22x22/Makefile.in   |   7 +
+ data/icons/24x24/Makefile.in   |   7 +
+ data/icons/256x256/Makefile.in |   7 +
+ data/icons/32x32/Makefile.in   |   7 +
+ data/icons/48x48/Makefile.in   |   7 +
+ data/icons/Makefile.in         |   7 +
+ data/pixmaps/Makefile.in       |   7 +
+ girl.spec.in                   |   9 +-
+ src/Makefile.in                |   7 +
+ src/girl.c                     |   5 +-
+ 19 files changed, 563 insertions(+), 17 deletions(-)
+
+commit 7c6bc8e9ac6d98a97ef2a89fdcfe9f2d4d6d35d4
+Author: Samir Ribic <samir ribic etf unsa ba>
+Date:   Fri Mar 13 23:33:42 2015 +0000
+
+    Added Bosnian translation
+
+ po/LINGUAS |   1 +
+ po/bs.po   | 406 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 407 insertions(+)
+
+commit d8f0d977732b30362b4aa26540b2142b4ad828f1
+Author: Ole Aamot <oka oka no>
+Date:   Sun Mar 8 01:28:22 2015 +0100
+
+    GIRL 1.7.0
+
+ configure           |  20 ++++++++++----------
+ configure.ac        |   2 +-
+ data/screenshot.png | Bin 172304 -> 162426 bytes
+ girl.spec.in        |   3 +++
+ src/girl.c          |  17 ++++++++---------
+ src/girl.xml        |  11 +++++++++++
+ 6 files changed, 33 insertions(+), 20 deletions(-)
+
+commit b220f225d8c1b3064b61970f72fcd530bd6eafc1
+Author: Ole Aamot <oka oka no>
+Date:   Sat Mar 7 03:40:07 2015 +0100
+
+    GIRL version 1.6.0
+
+ ChangeLog           |   8 +++
+ Makefile.am         |   2 +
+ NEWS                |  11 ++++
+ configure           |  20 +++----
+ configure.ac        |   2 +-
+ debian/changelog    |   4 +-
+ girl.spec.in        |  54 +++++++++++--------
+ src/Makefile.am     |   4 +-
+ src/Makefile.in     |   4 +-
+ src/girl-gui.c      |  64 +++++++++++-----------
+ src/girl-listener.c |   4 +-
+ src/girl-listener.h |   2 +-
+ src/girl-program.c  |   4 +-
+ src/girl-program.h  |   2 +-
+ src/girl-station.c  |  17 ++++--
+ src/girl-station.h  |   4 +-
+ src/girl.c          | 151 +++++++++++++++++++++++++++++++++++-----------------
+ src/girl.h          |   6 +--
+ src/girl.xml        | 122 +++++++++++++++++++++++-------------------
+ 19 files changed, 297 insertions(+), 188 deletions(-)
+
+commit 3a8e5f2e5177c12f4d99ff470c0bb95c21d2c936
+Author: Ole Aamot <oka oka no>
+Date:   Sun Mar 1 19:55:23 2015 +0100
+
+    GIRL version 1.5.0
+
+ AUTHORS             |   3 +
+ ChangeLog           |   8 ++
+ Makefile.am         |   1 +
+ NEWS                |  14 +++
+ README              |   8 ++
+ THANKS              |   3 +
+ configure           |  20 +--
+ configure.ac        |   2 +-
+ data/screenshot.png | Bin 159247 -> 172304 bytes
+ debian/changelog    |   6 +
+ girl.spec.in        |   3 +
+ src/girl.xml        |  46 ++++++-
+ src/stations.xml    | 356 +---------------------------------------------------
+ 13 files changed, 103 insertions(+), 367 deletions(-)
+
+commit 9ae7994eae53daf4204382bf034f14fdc47dde23
+Author: Rafael Ferreira <rafael f f1 gmail com>
+Date:   Tue Mar 3 14:52:05 2015 +0000
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 87 +++++++++++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 70 insertions(+), 17 deletions(-)
+
+commit f4fba2a0fed3fc9530428b560ddebedd00d77306
+Author: Matej Urbančič <mateju svn gnome org>
+Date:   Sat Feb 28 21:57:44 2015 +0100
+
+    Added sl for Slovenian translation
+
+ po/LINGUAS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit a40a202471787b91177c80902de548abd83c9dcd
+Author: Matej Urbančič <mateju svn gnome org>
+Date:   Sat Feb 28 21:57:25 2015 +0100
+
+    Added Slovenian translation
+
+ po/sl.po | 377 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 377 insertions(+)
+
+commit 885842704380635cb22c3bf5030283ed182e9807
+Author: Γιάννης Κουτσούκος <giankoyt gmail com>
+Date:   Mon Feb 23 23:00:09 2015 +0000
 
-2015-03-14  Ole Aamot  <ole src gnome org>
+    Added Greek translation
+
+ po/LINGUAS |   1 +
+ po/el.po   | 409 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 410 insertions(+)
+
+commit ee05ba5af77bafc928237a5e91da2c46ef999650
+Author: Ole Aamot <oka oka no>
+Date:   Sun Feb 22 00:08:44 2015 +0100
+
+    Add NEWS for 1.4.0
+
+ NEWS-1.4 | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 335 insertions(+)
+
+commit 1a87c07e03e4dd0448fffd0d061c72a75625c68d
+Author: Ole Aamot <oka oka no>
+Date:   Sun Feb 22 00:07:44 2015 +0100
+
+    GNOME Internet Radio Locator version 1.4.0
+
+ ChangeLog    | 15 +++++++++++++++
+ Makefile.am  |  1 +
+ NEWS         | 18 ++++++++++++++++++
+ TODO         |  1 +
+ configure    | 20 ++++++++++----------
+ configure.ac |  2 +-
+ girl.spec.in |  6 ++++++
+ src/girl.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 8 files changed, 100 insertions(+), 11 deletions(-)
+
+commit e063d4045a1334d5afee8454e77457216664faa7
+Author: Muhammet Kara <muhammetk gmail com>
+Date:   Tue Feb 17 10:06:09 2015 +0000
+
+    Updated Turkish translation
+
+ po/tr.po | 349 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 309 insertions(+), 40 deletions(-)
+
+commit 13bd3253b974a8fe9da9a3e11441b386146539f2
+Author: Ole Aamot <oka oka no>
+Date:   Sat Feb 14 00:34:29 2015 +0100
 
-       * NEWS: girl version 1.8.0 release on π day.
-       * po/bo.po: New Bosnian translation by Samir Ribić
+    GIRL version 1.3.0
 
-2015-03-07  Ole Aamot  <ole src gnome org>
+ ChangeLog           |   5 +++++
+ HACKING             |   4 ++--
+ Makefile.am         |   1 +
+ NEWS                |   9 +++++++++
+ configure           |  20 ++++++++++----------
+ configure.ac        |   2 +-
+ data/screenshot.png | Bin 175001 -> 159247 bytes
+ 7 files changed, 28 insertions(+), 13 deletions(-)
 
-       * NEWS: girl version 1.7.0 release
-       * src/girl.xml: Add radiOrakel (radiorakel.no)
+commit 8060d0c5967d76c4db03fcc31e0cc53b8bcf2974
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sun Feb 1 14:48:04 2015 +0100
 
-2015-03-07  Ole Aamot  <ole src gnome org>
+    Updated Polish translation
 
-       * NEWS: girl version 1.6.0 release
-       * src/girl.xml: Add KXSC (kxsc.org)
-       * src/girl.xml: Add KASC (blazeradioonline.com)
-       * src/girl.xml: Add WPTS (wptsradio.org)
-       * src/girl.xml: Add WTBU (wtburadio.org)
+ po/pl.po | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 72 insertions(+), 15 deletions(-)
 
-2015-02-28  Ole Aamot  <ole src gnome org>
+commit d3b6abcd32f5f0bcbd905a8ffb9a7f1635a9b524
+Author: Marek Černocký <marek manet cz>
+Date:   Mon Jan 26 23:31:50 2015 +0100
 
-       * NEWS: girl version 1.5.0 release
-       * po/el.po: New Greek translation by Γιάννης Κουτσούκος/Efstathios Iosifidis
-       * po/sl.po: New Slovenian translation by Matej Urbančič
-       * src/girl.xml: Add Radio NRJ Bern (Bugzilla #745087)
-       * src/girl.xml: Add SoundFM (soundfm.ca)
+    Updated Czech translation
 
-2015-02-21  Ole Aamot  <ole src gnome org>
+ po/cs.po | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 70 insertions(+), 16 deletions(-)
 
-       * NEWS: girl version 1.4.0 release
-       * po/tr.po: Updated Turkish translation by Muhammet Kara
-       * src/girl.xml: Add KCSN (kcsn.org)
-       * src/girl.xml: Add KSUB (ksubseattle.org)
-       * src/girl.xml: Add KVRX (kvrx.org)
-       * src/girl.xml: Add WHPK (whpk.org)
-       * src/girl.xml: Add WRVU (wrvu.org)
-       * src/girl.xml: Add WVAU (wvau.org)
+commit 985c3c49a0aa1bfe8c53b094c5cdc2e1939b663a
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sat Jan 24 21:05:31 2015 +0100
 
-2015-02-14  Ole Aamot  <ole src gnome org>
+    Fix Polish translation
+    
+    Please never change strings without marking them as fuzzy!
+    We don't want ungrammatical translations, after all.
 
-       * NEWS: girl version 1.3.0 release
+ po/pl.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-2015-02-08  Ole Aamot  <ole src gnome org>
+commit 5d8480de04fa498e0eb25e494fa43cf587df92b4
+Author: Ole Aamot <oka oka no>
+Date:   Sat Jan 24 17:23:48 2015 +0100
 
-       * po/cs.po: Updated Czech translation by Marek Černocký
-       * po/pl.po: Updated Polish translation by Piotr Drąg
+    Add NEWS for girl release
 
-2015-01-23  Ole Aamot  <ole src gnome org>
+ NEWS-1.2 | 308 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 308 insertions(+)
 
-       * NEWS: girl version 1.2.0 release
-       * configure.ac: Patch by Dominique Leuenberger (Bugzilla #743340)
-       * po/es.po: New Spanish translation by Daniel Mustieles
-       * src/Makefile.am: Patch by Dominique Leuenberger (Bugzilla #743340)
+commit 404a2161bacaad4a522f4af855ef4f936f40eaac
+Author: Ole Aamot <oka oka no>
+Date:   Sat Jan 24 17:23:17 2015 +0100
 
-2015-01-22  Ole Aamot  <ole src gnome-org>
+    GIRL 1.2.0
 
-       * po/cs.po: Updated Czech translation by Marek Černocký
+ AUTHORS             |  11 +-
+ ChangeLog           |  27 +++-
+ Makefile.am         |   2 +
+ NEWS                | 353 ++++++++++++++++++++++++++++++++++-----------------
+ THANKS              |   2 +
+ configure           |  42 +++----
+ configure.ac        |   8 +-
+ data/screenshot.png | Bin 161045 -> 175001 bytes
+ debian/changelog    |   8 +-
+ debian/control      |   2 +-
+ debian/rules        |   2 +-
+ girl.spec.in        |  39 +++---
+ po/pl.po            |   2 +-
+ src/Makefile.am     |  23 +++-
+ src/Makefile.in     | 170 ++++++++++++++++++++++---
+ src/girl.c          |  31 +++--
+ src/girl.xml        |  10 +-
+ src/stations.xml    | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 18 files changed, 874 insertions(+), 214 deletions(-)
 
-2015-01-17  Ole Aamot  <ole src gnome org>
+commit e937a18c43af55792937e2acaf6966c6d4f8d356
+Author: Daniel Mustieles <daniel mustieles gmail com>
+Date:   Fri Jan 23 10:44:05 2015 +0100
 
-       * NEWS: girl version 1.1.0 release
-       * po/cs.po: Updated Czech translation by Marek Černocký
-       * po/id.po: New Indonesian translation by Andika Triwidada
-       * po/pl.po: Updated Polish translation by Piotr Drąg
-       * po/pt_BR.po: Updated Brazilian Portuguese translation by Rafael Ferreira
+    Updated Spanish Translation
 
-2015-01-06  Ole Aamot  <ole src gnome org>
+ po/es.po | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
 
-       * BROADCAST: Add link to jwz's page on webcasting
+commit 4d6c3ab013fba78dbad21cf8b641c40710640769
+Author: Daniel Mustieles <daniel mustieles gmail com>
+Date:   Fri Jan 23 10:38:39 2015 +0100
 
-2015-01-06  Ole Aamot  <ole src gnome org>
+    Updated Spanish Translation
 
-       * src/girl-gui.c: Add i18n support
-       * src/girl.c: Add i18n support
+ po/LINGUAS |   1 +
+ po/es.po   | 328 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 329 insertions(+)
 
-2015-01-06  Ole Aamot  <ole src gnome org>
+commit a1ef9067ee9f9e4cbe7c9dd320d5c2801c9db408
+Author: Marek Černocký <marek manet cz>
+Date:   Sun Jan 18 18:45:56 2015 +0100
 
-       * AUTHORS: Add Andika Triwidada
-       * THANKS: Add Andika Triwidada
-       * src/girl.xml: Fix Brno location.
+    Updated Czech translation
 
-2015-01-03  Ole Aamot  <ole src gnome org>
+ po/cs.po | 50 +++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 31 insertions(+), 19 deletions(-)
 
-       * NEWS: girl version 1.0.0 "Fenchurch" release
+commit 46b13c2b34422eb2b07a00601581fa9644083b5e
+Author: Ole Aamot <oka oka no>
+Date:   Sat Jan 17 22:50:46 2015 +0100
 
-2015-01-01  Ole Aamot  <ole src gnome org>
+    GIRL version 1.1.0
 
-       * src/girl.xml: Rename src/stations.xml
-       * src/girl.xml: Add WNYO (wnyo889.org)
-       * src/girl.xml: Add WUSB (wusb.fm)
+ NEWS-1.1 | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 287 insertions(+)
 
-2014-12-28  Ole Aamot  <oka oka no>
+commit 56a154309597d9ac422752718d119a4494ee252f
+Author: Rafael Ferreira <rafael f f1 gmail com>
+Date:   Wed Jan 14 17:55:49 2015 +0000
 
-       * src/stations.xml: Add COOG (coogradio.com)
-       * src/stations.xml: Add EPER (eper.elte.hu)
-       * src/stations.xml: Add URY (ury.org.uk)
-       * src/stations.xml: Add WVUA-FM (wvuafm.ua.edu)
+    Updated Brazilian Portuguese translation
 
-2014-12-27  Ole Aamot  <oka oka no>
+ po/pt_BR.po | 42 ++++++++++++++++++++++++++++++------------
+ 1 file changed, 30 insertions(+), 12 deletions(-)
 
-       * NEWS: girl version 0.9.0 "It Girl" release
-       * po/cs.po: Updated Czech translation by Marek Černocký
-       * po/hu.po: Hungarian translation by Balázs Úr
-       * po/sr.po: Updated Serbian translation by Мирослав Николић
-       * po/sr latin po: Updated Serbian translation by Miroslav Nikolić
+commit ae8f8c167cd3ba76d591d501fef81005a8ca36d2
+Author: Мирослав Николић <miroslavnikolic rocketmail com>
+Date:   Mon Jan 12 11:34:19 2015 +0100
 
-2014-12-20  Ole Aamot  <oka oka no>
+    Updated Serbian translation
 
-       * NEWS: girl version 0.8.0 "Cinnamon Girl" release
-       * po/de.po: Updated German translation by Wolfgang Stöggl
-       * po/pt_BR.po: Updated Brazilian Portuguese translation by Rafael Ferreira
-       * src/stations.xml: Add Fuse FM (fusefm.co.uk)
-       * src/stations.xml: Add Burst Radio (burstradio.co.uk)
+ po/sr.po       | 367 ++++++++++++++++++++++++++++++++++++++++++++++-----------
+ po/sr latin po | 367 ++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 592 insertions(+), 142 deletions(-)
 
-2014-12-14  Ole Aamot  <oka oka no>
+commit 5eae51956a516e60829eabc064fe2d412aff90e9
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sun Jan 11 15:05:30 2015 +0100
 
-       * NEWS: girl version 0.7.3 release
-       * src/stations.xml: Add CJSW (cjsw.com)
-       * src/stations.xml: Add Caper Radio (caperradio.ca)
+    Updated Polish translation
 
-2014-12-14  Ole Aamot  <oka oka no>
+ po/pl.po | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 257 insertions(+), 55 deletions(-)
 
-       * NEWS: girl version 0.7.2 "Don't shoot" release
-       * po/pl.po: Updated Polish translation by Piotr Drąg
-       * src/stations.xml: Add WAMU (wamu.org)
-       * src/stations.xml: Add WXOU (wxou.org)
+commit 8e4b0889f641b2e53a7559d5dbade63aa36ae74b
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sun Jan 11 14:49:52 2015 +0100
 
-2014-12-13  Ole Aamot  <oka oka no>
+    Mark strings as translatable in the appdata file
 
-       * AUTHORS: Add Muhammet Kara (Turkish translation)
-       * NEWS: Release girl version 0.7.1
-       * THANKS: Muhammet Kara for Turkish translation
-       * data/girl.appdata.xml.in: Remove old reference to "new GNOME 2.0".
-       * src/girl-0.7.dtd: Add girl 0.7 DTD with station language attribute
-       * src/girl-gui.c: Add Streams and About Stream buttons
-       * src/girl-station.c: Add new function girl_stream_record
-       * src/girl-streams.c: New file
-       * src/girl-streams.h: New file
-       * src/stations.xml: Add 95bFM (95bfm.com)
-       * src/stations.xml: Add KDUP (kdup.up.edu)
-       * src/streams.xml: Add streams file
+ data/girl.appdata.xml.in | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
 
-2014-12-12  Ole Aamot  <oka oka no>
+commit 8628aa808cbd096404ebc481ce38171bc9ae03be
+Author: Rafael Ferreira <rafael f f1 gmail com>
+Date:   Thu Jan 8 07:25:25 2015 +0000
 
-       * AUTHORS: Add Piotr Drąg (Polish translation)
-       * NEWS: Release girl version 0.7.0
-       * THANKS: Piotr Drąg for minor typo fix and Polish translation
-       * girl.spec.in: Update RPM spec file for Fedora 21
-       * po/pl.po: Polish translation by Piotr Drąg
-       * src/girl-gui.c: Add GtkWidget progress
-       * src/girl-runners.c: Modify mutex functions for future usage.
-       * src/girl-runners.h: Modify mutex functions for future usage.
-       * src/girl-station.c: Add asynchronous child process function.
-       * src/girl.h: Rename DEBUG macro GIRL_DEBUG, add progress bar.
-       * src/stations.xml: Add 2NURFM (broadcaster1.newcastle.edu.au)
-       * src/stations.xml: Add Radio Adelaide (radio.adelaide.edu.au)
+    Updated Brazilian Portuguese translation
 
-2014-12-10  Ole Aamot  <oka oka no>
+ po/pt_BR.po | 339 ++++++++++++++++++++++++++++++++++++++++++++++++------------
+ 1 file changed, 272 insertions(+), 67 deletions(-)
 
-       * NEWS: Release girl version 0.6.283185307 in honor of Malala
-       * src/girl-runners.c: Add file for the threads implementation
-       * src/girl-runners.h: Add file for the threads implementation
+commit f203f7f963af39b59995de1da9e3ad1c714dc4dd
+Author: Marek Černocký <marek manet cz>
+Date:   Wed Jan 7 00:48:38 2015 +0100
 
-2014-12-09  Ole Aamot  <oka oka no>
+    Updated Czech translation
 
-       * THANKS: Add Justin Dove
+ po/cs.po | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 197 insertions(+), 14 deletions(-)
 
-2014-12-07  Ole Aamot  <oka oka no>
+commit 4e464be0c6514d274186e79defd7f7f9624a1229
+Author: Ole Aamot <oka oka no>
+Date:   Wed Jan 7 00:00:10 2015 +0100
 
-       * NEWS: Release girl version 0.6.2
-       * src/stations.xml: Add Radio R (radior.cz)
-       * src/stations.xml: Add Radio Radius (radioradius.ch)
+    Add link to jwz's page on webcasting
 
-2014-12-07  Ole Aamot  <oka oka no>
+ BROADCAST   |   3 +-
+ ChangeLog   |   4 +
+ Makefile.in | 836 ------------------------------------------------------------
+ 3 files changed, 6 insertions(+), 837 deletions(-)
 
-       * NEWS: Release girl version 0.6.1
-       * THANKS: Add Ettore Perazzoli and Bernd Homuth.
-       * configure.ac: Check for GIRL_HELPER_PLAYER (totem)
-       * configure.ac: Check for GIRL_HELPER_RECORD (streamripper)
-       * configure.ac: Check for and define HAVE_GIRL_RECORD
-       * src/Makefile.am: Add GIRL_HELPER_PLAYER, GIRL_HELPER_RECORD
-       * src/girl-gui.c: Add menu item if GIRL_HELPER_RECORD is defined
-       * src/girl-program.c: New file with support for programs
-       * src/girl-station.c: Rename girl_launch_helper to girl_helper_run
-       * src/girl-station.h: Remove GirlChannels and GirlStreamType
-       * src/girl.c: Add programs feature
-       * src/girl.h: Add enums GirlChannels, GirlStreamType, GirlHelperType
+commit b81f7351620a2a61f9cd7e73dc49a0157794fe8e
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 6 23:34:59 2015 +0100
+
+    Add better i18n support
+
+ ChangeLog       |   5 +
+ Makefile.in     |   2 +-
+ configure       |  20 +--
+ man/Makefile    | 503 --------------------------------------------------------
+ man/Makefile.in | 503 --------------------------------------------------------
+ src/girl-gui.c  |  68 ++++----
+ src/girl.c      |   8 +-
+ 7 files changed, 54 insertions(+), 1055 deletions(-)
+
+commit 4f821fca43d7791c492cefa4121f74e440e4a8eb
+Author: Marek Černocký <marek manet cz>
+Date:   Tue Jan 6 23:04:27 2015 +0100
+
+    Updated Czech translation
+
+ po/cs.po | 136 ++++++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 74 insertions(+), 62 deletions(-)
+
+commit 347074ad3b17776a392aebbfe6b08393f836418b
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 6 21:32:13 2015 +0100
+
+    New file for stations data
+
+ src/girl.xml | 355 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 355 insertions(+)
+
+commit a235f4786dae7949a1105eed3423c668e7108343
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 6 21:30:23 2015 +0100
+
+    Add 512x512 and 1024x1024 icons
+
+ data/icons/1024x1024/apps/girl.png | Bin 0 -> 91311 bytes
+ data/icons/512x512/apps/girl.png   | Bin 0 -> 39039 bytes
+ 2 files changed, 0 insertions(+), 0 deletions(-)
+
+commit 92b9609198e61c21209eee60730197cd873013a9
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 6 21:28:12 2015 +0100
+
+    Add Makefile.am, bump version and add BROADCAST text
+
+ BROADCAST                        | 33 +++++++++++++++++++++++++++++++++
+ configure.ac                     |  2 +-
+ data/icons/1024x1024/Makefile.am |  7 +++++++
+ data/icons/512x512/Makefile.am   |  7 +++++++
+ 4 files changed, 48 insertions(+), 1 deletion(-)
+
+commit cf33291c031424a6cc148ab2fcf6b17c37f1083f
+Author: Ole Aamot <oka oka no>
+Date:   Tue Jan 6 21:23:09 2015 +0100
+
+    Add Andika Triwidada and fix Brno location.
+
+ AUTHORS                          |   4 +-
+ ChangeLog                        |  16 ++
+ HACKING                          |  23 ++-
+ LETTER                           |   6 +-
+ Makefile.am                      |  12 +-
+ Makefile.in                      |  12 +-
+ NEWS                             |  10 +
+ README                           |  32 +++-
+ THANKS                           |   2 +
+ TODO                             |   2 +-
+ YP-DIRS                          |   2 -
+ configure                        |  73 ++++----
+ configure.ac                     |  32 ++--
+ data/girl.appdata.xml.in         |  26 +--
+ data/icons/16x16/apps/girl.png   | Bin 610 -> 744 bytes
+ data/icons/22x22/apps/girl.png   | Bin 1050 -> 1052 bytes
+ data/icons/24x24/apps/girl.png   | Bin 1097 -> 1087 bytes
+ data/icons/256x256/apps/girl.png | Bin 43992 -> 14492 bytes
+ data/icons/32x32/apps/girl.png   | Bin 1544 -> 1401 bytes
+ data/icons/48x48/apps/girl.png   | Bin 2988 -> 2153 bytes
+ data/icons/Makefile.am           |   2 +-
+ data/icons/Makefile.in           |   2 +-
+ data/screenshot.png              | Bin 113604 -> 161045 bytes
+ debian/control                   |  25 ++-
+ debian/control.in                |   4 +-
+ girl.spec.in                     |  52 +++---
+ man/Makefile                     |  10 +-
+ man/girl.1                       |  13 +-
+ src/Makefile.am                  |   8 +-
+ src/Makefile.in                  |  12 +-
+ src/girl-gui.c                   | 385 +++++++++++++++++++++++++++++++--------
+ src/girl-gui.h                   |   3 +-
+ src/girl-listener.c              |  34 ++--
+ src/girl-program.c               |  42 ++---
+ src/girl-station.c               | 160 ++++++++++++----
+ src/girl-station.h               |  19 +-
+ src/girl-streams.c               |  46 ++---
+ src/girl-streams.h               |   3 +-
+ src/girl.c                       | 341 +++++++++++++++++++---------------
+ src/girl.h                       |  35 ++--
+ src/stations.xml                 | 330 +--------------------------------
+ 41 files changed, 960 insertions(+), 818 deletions(-)
+
+commit 64798f936216fbd7f72017aa04ae6b7fa57b68dc
+Author: Andika Triwidada <andika gmail com>
+Date:   Sun Jan 4 13:25:55 2015 +0000
+
+    Added Indonesian translation
+
+ po/LINGUAS |   1 +
+ po/id.po   | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 144 insertions(+)
+
+commit b68ae879e3a9b6a244d1922215907733a3d26ee8
+Author: Ole Aamot <oka oka no>
+Date:   Sat Jan 3 00:53:52 2015 +0100
+
+    GNOME Internet Radio Locator version 1.0.0
+
+ NEWS-0.8                  | 240 ++++++++++++++++++++++++++++++++++++++++
+ NEWS-0.9                  | 262 +++++++++++++++++++++++++++++++++++++++++++
+ NEWS-1.0                  | 276 ++++++++++++++++++++++++++++++++++++++++++++++
+ debian/Makefile.am        |   2 +
+ debian/changelog          |   5 +
+ debian/compat             |   1 +
+ debian/control            |  16 +++
+ debian/control.in         |  25 +++++
+ debian/copyright          |  16 +++
+ debian/girl.1             |  43 ++++++++
+ debian/girl.install       |   7 ++
+ debian/girl.manpages      |   1 +
+ debian/girl.xpm           | 161 +++++++++++++++++++++++++++
+ debian/menu               |   4 +
+ debian/rules              |  79 +++++++++++++
+ debian/source/Makefile.am |   1 +
+ debian/source/format      |   1 +
+ debian/watch              |   3 +
+ src/girl-0.8.dtd          |  20 ++++
+ src/girl-1.0.dtd          |  21 ++++
+ src/streams.xml           |  57 ++++++++++
+ 21 files changed, 1241 insertions(+)
+
+commit 6ab9303207308946d710700c588ed3ecdcbdca5d
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 28 14:17:41 2014 +0100
+
+    girl version 0.9.0
+
+ AUTHORS                          |   2 ++
+ ChangeLog                        |  15 ++++++++++++++
+ Makefile.am                      |   1 +
+ Makefile.in                      |   1 +
+ NEWS                             |  15 ++++++++++++++
+ README                           |   2 +-
+ THANKS                           |   2 ++
+ configure                        |  20 +++++++++---------
+ configure.ac                     |   2 +-
+ data/icons/16x16/apps/girl.png   | Bin 781 -> 610 bytes
+ data/icons/22x22/apps/girl.png   | Bin 1020 -> 1050 bytes
+ data/icons/24x24/apps/girl.png   | Bin 4109 -> 1097 bytes
+ data/icons/256x256/apps/girl.png | Bin 2803 -> 43992 bytes
+ data/icons/32x32/apps/girl.png   | Bin 4109 -> 1544 bytes
+ data/icons/48x48/apps/girl.png   | Bin 2803 -> 2988 bytes
+ data/screenshot.png              | Bin 100925 -> 113604 bytes
+ girl.spec.in                     |   3 +++
+ man/Makefile                     |   6 +++---
+ src/girl-gui.c                   |  43 +++++++++++++++++++--------------------
+ src/girl.c                       |   8 ++++----
+ src/girl.png                     | Bin 4655 -> 2988 bytes
+ src/stations.xml                 |  37 +++++++++++++++++++++++++++++++--
+ 22 files changed, 114 insertions(+), 43 deletions(-)
+
+commit e4f5bee6c2f1a19abdedfebb1345d0d9f1c444c2
+Author: Marek Černocký <marek manet cz>
+Date:   Sat Dec 27 17:16:35 2014 +0100
+
+    The Czech translation
+
+ po/cs.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 5e1f1d84ba1d9e55ad376b52f7c5c52abd467f8d
+Author: Marek Černocký <marek manet cz>
+Date:   Sat Dec 27 17:15:48 2014 +0100
+
+    The Czech translation
+
+ po/cs.po | 85 ++++++++++++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 61 insertions(+), 24 deletions(-)
+
+commit b96e00e23b8f6972845251ee5e27b77b659b09c9
+Author: Мирослав Николић <miroslavnikolic rocketmail com>
+Date:   Sat Dec 27 13:57:21 2014 +0100
+
+    Updated Serbian translation
+
+ po/sr.po       | 104 ++++++++++++++++++++++++++++++++++++++++++++-------------
+ po/sr latin po | 104 ++++++++++++++++++++++++++++++++++++++++++++-------------
+ 2 files changed, 160 insertions(+), 48 deletions(-)
+
+commit bde155280e2ecb48276b93ab41191a29b7e2f39c
+Author: Balázs Úr <urbalazs src gnome org>
+Date:   Sun Dec 21 17:20:56 2014 +0100
+
+    Initial Hungarian translation
+
+ po/LINGUAS |   1 +
+ po/hu.po   | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 146 insertions(+)
+
+commit 55ecb01abfcde0021861a0b3e364c0da99a2665f
+Author: Ole Aamot <oka oka no>
+Date:   Sat Dec 20 16:18:08 2014 +0100
+
+    girl version 0.8.0
+
+ ChangeLog           |  8 +++++++
+ Makefile.am         |  1 +
+ Makefile.in         |  1 +
+ NEWS                |  8 +++++++
+ configure           | 22 +++++++++----------
+ configure.ac        |  4 ++--
+ girl.spec.in        |  4 ++++
+ man/Makefile        |  6 ++---
+ src/Makefile.am     |  4 ++--
+ src/Makefile.in     |  4 ++--
+ src/girl-0.7.dtd    |  6 +++--
+ src/girl-canvas.c   | 14 ++++++------
+ src/girl-gui.c      | 17 ++++++++-------
+ src/girl-gui.h      |  2 ++
+ src/girl-listener.c | 15 +++++++------
+ src/girl-program.c  | 39 ++++++++++++++++-----------------
+ src/girl-runners.c  | 14 ++++++------
+ src/girl-runners.h  |  4 ++--
+ src/girl-station.c  | 63 ++++++++++++++++++++++++-----------------------------
+ src/girl-streams.c  | 20 +++++++++--------
+ src/girl.c          | 28 ++++++++++++++++--------
+ src/stations.xml    | 19 ++++++++++++++--
+ 22 files changed, 176 insertions(+), 127 deletions(-)
+
+commit 7c04b35b2b7093ebe01e889c79b99d18ac209b9b
+Author: Wolfgang Stöggl <c72578 yahoo de>
+Date:   Thu Dec 18 21:43:42 2014 +0000
+
+    Updated German translation
+
+ po/de.po | 102 +++++++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 67 insertions(+), 35 deletions(-)
+
+commit 536ac667e63eaebd011ac60e1f479476c48a6155
+Author: Rafael Ferreira <rafael f f1 gmail com>
+Date:   Mon Dec 15 00:53:59 2014 +0000
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 88 ++++++++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 64 insertions(+), 24 deletions(-)
+
+commit 06108e15f1be2c0192413f305933cc7470c9ae8d
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 14 18:58:33 2014 +0100
+
+    girl version 0.7.3
+
+ ChangeLog          |  6 ++++++
+ NEWS               |  6 ++++++
+ NEWS-0.7           |  9 +++++++++
+ README             | 25 ++++++++++++++++++-------
+ configure          | 20 ++++++++++----------
+ configure.ac       |  2 +-
+ girl.spec.in       | 12 ++++++++----
+ man/Makefile       | 26 +++++++++++++-------------
+ src/girl-station.c |  5 ++++-
+ src/stations.xml   | 18 ++++++++++++++++++
+ 10 files changed, 93 insertions(+), 36 deletions(-)
+
+commit 0cdbd0230573e8044832efb68e86ffb27d87f388
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 14 14:01:42 2014 +0100
+
+    girl version 0.7.2
+
+ ChangeLog        |  7 +++++++
+ NEWS             |  7 +++++++
+ NEWS-0.7         | 16 ++++++++++++++++
+ configure        | 20 ++++++++++----------
+ configure.ac     |  2 +-
+ girl.spec.in     |  3 +++
+ man/Makefile     | 26 +++++++++++++-------------
+ src/stations.xml | 14 +++++++++++++-
+ 8 files changed, 70 insertions(+), 25 deletions(-)
+
+commit d080abf9a5121021942e14d90f4e63d53a3136fe
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sun Dec 14 12:54:03 2014 +0100
+
+    Updated Polish translation
+
+ po/pl.po | 51 +++++++++++++++++++++++++++++----------------------
+ 1 file changed, 29 insertions(+), 22 deletions(-)
+
+commit 8765ec616cc045afae8a7b09e83f3382db8d811c
+Author: Ole Aamot <oka oka no>
+Date:   Sat Dec 13 22:46:59 2014 +0100
+
+    girl 0.7.1 release
+
+ AUTHORS                  |   2 +
+ ChangeLog                |  30 ++++++++
+ Makefile.am              |   1 +
+ Makefile.in              |   1 +
+ NEWS                     |  31 ++++++++
+ NEWS-0.7                 |  37 +++++++++-
+ THANKS                   |   3 +-
+ TODO                     |   2 -
+ configure                |  20 ++---
+ configure.ac             |   2 +-
+ data/girl.appdata.xml.in |   2 +-
+ data/screenshot.png      | Bin 130805 -> 100925 bytes
+ girl.spec.in             |  14 +++-
+ man/Makefile             |   8 +-
+ src/Makefile.am          |   8 +-
+ src/Makefile.in          |  11 +--
+ src/girl-0.7.dtd         |   2 +-
+ src/girl-gui.c           | 186 ++++++++++++++++++++++++++++++++++++++++++++---
+ src/girl-listener.c      |   6 --
+ src/girl-program.c       |   6 --
+ src/girl-runners.c       |  88 ++++++++++++++++------
+ src/girl-runners.h       |  21 +++---
+ src/girl-station.c       | 163 ++++++++++++++++++++++++++++++++++++++---
+ src/girl-streams.c       |   4 +-
+ src/girl.c               | 130 ++++++++++++++++++++++++++++++---
+ src/girl.h               |  31 ++++++--
+ src/stations.xml         |  91 +++++++++++++++--------
+ 27 files changed, 750 insertions(+), 150 deletions(-)
+
+commit 1927e601229cc467b3d57ddbb2765cf6f3f37b05
+Author: Ole Aamot <oka oka no>
+Date:   Sat Dec 13 22:45:14 2014 +0100
+
+    girl version 0.7.1
+
+ src/girl-streams.c | 250 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/girl-streams.h |  70 +++++++++++++++
+ 2 files changed, 320 insertions(+)
+
+commit 68f763a40689d8e478dad2290a82a3b289fd0511
+Author: Muhammet Kara <muhammetk gmail com>
+Date:   Sat Dec 13 11:36:13 2014 +0000
+
+    Added Turkish translation
+
+ po/LINGUAS |   1 +
+ po/tr.po   | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 139 insertions(+)
+
+commit ad1b68d27482095ead955b88d0e9f781b0d0c3fc
+Author: Ole Aamot <oka oka no>
+Date:   Sat Dec 13 03:13:52 2014 +0100
+
+    girl version 0.7.0
+
+ NEWS-0.7         | 166 ++++++++++++++++++
+ man/Makefile     | 503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/Makefile.am  |   3 +
+ man/Makefile.in  | 503 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ man/girl.1       |  38 +++++
+ src/girl-0.7.dtd |  21 +++
+ 6 files changed, 1234 insertions(+)
+
+commit 3125e8afbf78e4fa0b13e2bedd473a26e1b980df
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Fri Dec 12 18:40:16 2014 +0100
+
+    Added Polish translation
+    
+    I love "the new GNOME 2.0 platform" bit in appdata. :)
+
+ po/LINGUAS |   1 +
+ po/pl.po   | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 145 insertions(+)
+
+commit a8434ab799af95e7dda1eafe8f2bad217686eb8b
+Author: Ole Aamot <oka oka no>
+Date:   Wed Dec 10 18:17:38 2014 +0100
+
+    Update screenshot.
+
+ ChangeLog           |   6 ++++++
+ NEWS                |   6 ++++++
+ NEWS-0.6            |  11 +++++++++++
+ configure           |  20 ++++++++++----------
+ configure.ac        |   2 +-
+ data/screenshot.png | Bin 166375 -> 130805 bytes
+ src/Makefile.am     |   4 ++--
+ src/Makefile.in     |   8 +++++---
+ src/girl.h          |   1 +
+ 9 files changed, 42 insertions(+), 16 deletions(-)
+
+commit cd6b9938a805019cdce06eb87e897a4c85cd5a15
+Author: Ole Aamot <oka oka no>
+Date:   Wed Dec 10 18:07:05 2014 +0100
+
+    girl version 0.6.283185307 ('Malala')
+
+ src/girl-runners.c | 32 ++++++++++++++++++++++++++++++++
+ src/girl-runners.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 85 insertions(+)
+
+commit 6f0fc8f7b4615757109d325a0003bdb491885f57
+Author: Ole Aamot <oka oka no>
+Date:   Tue Dec 9 21:58:37 2014 +0100
+
+    Fix punctuation
+
+ THANKS | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit c4abdffee9deed7d9ded2744bc7fbff187d739c5
+Author: Ole Aamot <oka oka no>
+Date:   Tue Dec 9 21:54:31 2014 +0100
+
+    Add Justin Dove
+
+ ChangeLog           |   4 ++++
+ THANKS              |   1 +
+ data/screenshot.png | Bin 142688 -> 166375 bytes
+ 3 files changed, 5 insertions(+)
+
+commit 19086419f2bd1642174bf8d196bb50a8f9463895
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 19:31:03 2014 +0100
+
+    girl version 0.6.2
+
+ ChangeLog        |  6 ++++++
+ NEWS             |  6 ++++++
+ NEWS-0.6         |  9 +++++++++
+ configure        | 20 ++++++++++----------
+ configure.ac     |  2 +-
+ girl.spec.in     |  3 +++
+ src/stations.xml | 16 ++++++++++++++++
+ 7 files changed, 51 insertions(+), 11 deletions(-)
+
+commit e67e66c8c62f16d2e26f0a3eaf248ea21117cf67
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 17:03:38 2014 +0100
+
+    News for 0.6.1
+
+ NEWS-0.6 | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 130 insertions(+)
+
+commit e2ec94916eeadf28fab23c5109acb41a8e456579
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 17:00:18 2014 +0100
+
+    girl 0.6 DTD
+
+ src/girl-0.6.dtd | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+commit 852eda6b82c1ee684dd54fe3fccb71cf3ac620d0
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 16:59:43 2014 +0100
+
+    Listener 1.1 DTD
+
+ src/listener-1.1.dtd | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+commit e41e6dd94c51ad9516e18ed3d1747fedac5132cd
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 16:58:54 2014 +0100
+
+    New file for radio programs.
+
+ src/girl-program.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ src/girl-program.h |  75 +++++++++++++++++
+ 2 files changed, 317 insertions(+)
+
+commit dcfc75e2b4c25babc2aad00eff93fa8613755649
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 16:57:23 2014 +0100
+
+    New file with a radio program.
+
+ src/programs.xml | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+commit 934fe1d5d5129f6c4ace2967092a707750afbad9
+Author: Ole Aamot <oka oka no>
+Date:   Sun Dec 7 16:56:37 2014 +0100
+
+    girl version 0.6.1
+
+ ChangeLog                      |  19 ++++
+ Makefile.in                    |   4 +-
+ NEWS                           |  15 +++
+ THANKS                         |   3 +-
+ configure                      | 223 +++++++++++++++++++++++++++++++++++------
+ configure.ac                   |  36 ++++++-
+ data/Makefile.in               |   4 +-
+ data/girl.appdata.xml.in       |   2 +-
+ data/icons/16x16/Makefile.in   |   4 +-
+ data/icons/22x22/Makefile.in   |   4 +-
+ data/icons/24x24/Makefile.in   |   4 +-
+ data/icons/256x256/Makefile.in |   4 +-
+ data/icons/32x32/Makefile.in   |   4 +-
+ data/icons/48x48/Makefile.in   |   4 +-
+ data/icons/Makefile.in         |   4 +-
+ data/pixmaps/Makefile.in       |   4 +-
+ data/screenshot.png            | Bin 164831 -> 142688 bytes
+ girl.doap                      |   2 +-
+ girl.spec.in                   |   8 +-
+ src/Makefile.am                |   8 +-
+ src/Makefile.in                |  17 ++--
+ src/girl-gui.c                 | 166 ++++++++++++++++++++++++++++--
+ src/girl-station.c             |  95 +++++++++++++-----
+ src/girl-station.h             |  14 +--
+ src/girl.c                     | 186 ++++++++++++++++++++++++++++------
+ src/girl.h                     |  34 ++++++-
+ src/programs-0.1.dtd           |  17 ++++
+ 27 files changed, 742 insertions(+), 143 deletions(-)
+
+commit 6619beb0aebb3061391b4b384ab1ed21e3d45088
+Author: Ole Aamot <oka oka no>
+Date:   Sat Dec 6 11:32:10 2014 +0100
+
+    girl version 0.6.0
+
+ AUTHORS            |  3 ++-
+ ChangeLog          | 16 ++++++++++++++++
+ Makefile.am        |  1 +
+ Makefile.in        |  1 +
+ NEWS               |  6 ++++++
+ NEWS-0.5           |  2 +-
+ THANKS             |  1 +
+ configure          | 20 ++++++++++----------
+ configure.ac       |  2 +-
+ girl.doap          |  2 +-
+ girl.spec.in       | 28 +++++++++++-----------------
+ src/girl-station.c |  1 +
+ src/stations.xml   | 36 +++++++++++++++++++++++++++++++++---
+ 13 files changed, 85 insertions(+), 34 deletions(-)
+
+commit f88f9b34af5dde0eff5c318970576aeb2dd637da
+Author: Wolfgang Stöggl <c72578 yahoo de>
+Date:   Wed Dec 3 21:56:08 2014 +0000
+
+    Added German translation
+
+ po/LINGUAS |   1 +
+ po/de.po   | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 115 insertions(+)
+
+commit e48a58cd8f2277ad3ec55a01034f89bfe0bcc9d4
+Author: Ole Aamot <oka oka no>
+Date:   Sun Nov 30 21:30:53 2014 +0100
+
+    Update screenshot.
+
+ data/screenshot.png | Bin 119916 -> 164831 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit eedd8803037c777d5c94c298a11aa5b1a6d2b1a8
+Author: Ole Aamot <oka oka no>
+Date:   Sun Nov 30 20:48:03 2014 +0100
+
+    New screenshot for girl version 0.5.2
+
+ data/screenshot.png | Bin 160556 -> 119916 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit 92e97395baf55a863c5853b833d35f228bd6c381
+Author: Ole Aamot <oka oka no>
+Date:   Sun Nov 30 13:39:09 2014 +0100
+
+    girl version 0.5.2
+
+ girl.spec.in        |   2 +
+ src/Makefile.am     |   4 +-
+ src/Makefile.in     |   4 +-
+ src/girl-gui.c      |  56 ++++++++++++++++++++---
+ src/girl-listener.c |   7 +++
+ src/girl-listener.h |   2 +
+ src/girl-station.c  |   5 ++-
+ src/girl-station.h  |   1 +
+ src/girl.c          | 125 +++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/girl.h          |   6 +++
+ src/listeners.xml   |   6 +--
+ src/stations.xml    |  44 +++++++++---------
+ 12 files changed, 217 insertions(+), 45 deletions(-)
+
+commit 9108c6648f05aa533c1283071db0ff50ef5d1136
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 29 19:10:23 2014 +0100
+
+    Add man page, update RPM spec for Fedora 21, prepare version 0.5.2.
+
+ .gitignore   | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ChangeLog    |  6 ++++++
+ Makefile.am  |  2 +-
+ Makefile.in  |  2 +-
+ NEWS         |  6 ++++++
+ configure    | 23 +++++++++++-----------
+ configure.ac |  3 ++-
+ girl.spec.in | 14 +++++++++-----
+ 8 files changed, 99 insertions(+), 19 deletions(-)
+
+commit fa61afd0123fbfe4e6a677f5523b30fe4dc7d8a5
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 29 14:11:33 2014 +0100
+
+    Add NEWS-0.5 file.
+
+ Makefile.am |   1 +
+ Makefile.in |   1 +
+ NEWS        | 128 ++++++++++++++++++++++++------------------------------------
+ NEWS-0.5    | 101 +++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 154 insertions(+), 77 deletions(-)
+
+commit 9933edd29372696008af6cbb8aaee551023d5262
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 29 13:48:36 2014 +0100
+
+    girl version 0.5.1
+
+ ChangeLog           |   1 +
+ NEWS                | 124 +++++++++++++++++++++++++++++++++-------------------
+ configure           |  20 ++++-----
+ configure.ac        |   2 +-
+ src/girl-gui.c      |   4 +-
+ src/girl-listener.c |   5 +++
+ src/girl-station.c  |  10 +++++
+ src/girl-station.h  |   2 +
+ 8 files changed, 110 insertions(+), 58 deletions(-)
+
+commit 3574eac660943537c9cc281e28a023514b260c15
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 29 12:09:48 2014 +0100
+
+    Add Мирослав Николић/Miroslav Nikolić (Serbian translation)
+
+ AUTHORS   | 1 +
+ ChangeLog | 9 ++++++++-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit 2f3131c63ef483e088f799148aaebfef7c1e954a
+Author: Мирослав Николић <miroslavnikolic rocketmail com>
+Date:   Sat Nov 29 10:45:32 2014 +0100
+
+    Added Serbian translation
+
+ po/LINGUAS     |   2 ++
+ po/sr.po       | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sr latin po | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 224 insertions(+)
+
+commit 78ac5babc105c1b4951d290376ebcb420a149f9a
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 29 04:25:44 2014 +0100
+
+    Update screenshot for 0.5.0
+
+ data/screenshot.png | Bin 164998 -> 160556 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit f7b8b6e30fa1f4d7ffd0f9c878e4c69eed5b8fee
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 29 03:46:16 2014 +0100
+
+    girl version 0.5.0
+
+ ChangeLog          | 10 +++++++
+ NEWS               | 10 +++++++
+ configure          | 20 ++++++-------
+ configure.ac       |  2 +-
+ girl.spec.in       |  3 ++
+ src/girl-gui.c     | 22 +++++++++-----
+ src/girl-station.c |  3 ++
+ src/girl-station.h |  1 +
+ src/girl.c         | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++---
+ src/girl.h         |  2 ++
+ src/stations.xml   | 36 ++++++++++++++++++++++
+ 11 files changed, 173 insertions(+), 23 deletions(-)
+
+commit 8386686844364b190b4365946997cb09c4e25b2d
+Author: Ole Aamot <oka oka no>
+Date:   Fri Nov 28 23:16:29 2014 +0100
+
+    Add license boilerplate and fix space
+
+ AUTHORS             |  1 -
+ THANKS              |  2 +-
+ configure           | 20 ++++++++++----------
+ configure.ac        |  2 +-
+ src/girl-listener.h | 23 ++++++++++++++++++++++-
+ 5 files changed, 34 insertions(+), 14 deletions(-)
+
+commit 925ca6b12a395f4fa6834cb9b78a599dce74027f
+Author: Ole Aamot <oka oka no>
+Date:   Fri Nov 28 21:16:52 2014 +0100
+
+    Add Hans Petter Jansson
+
+ THANKS | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit bc8efe8fd777fb308c9e5b0989445ab66087e24a
+Author: Ole Aamot <oka oka no>
+Date:   Thu Nov 27 19:42:28 2014 +0100
+
+    girl release 0.4.1
+
+ ChangeLog      |  1 +
+ girl.spec.in   | 15 ++++++++++-----
+ src/girl-gui.c | 19 ++++++++++---------
+ 3 files changed, 21 insertions(+), 14 deletions(-)
+
+commit a06253dc8f10d305354eadfe28b0584180ff960c
+Author: Ole Aamot <oka oka no>
+Date:   Thu Nov 27 17:39:32 2014 +0100
+
+    Add girl 0.5 DTD, 4 new Internet radio stations and compile script.
 
-2014-12-06  Ole Aamot  <oka oka no>
+ ChangeLog                      |   14 +-
+ INSTALL                        |    4 +-
+ Makefile.in                    |   17 +-
+ NEWS                           |   13 +
+ aclocal.m4                     | 1906 ----------------------------------------
+ compile                        |  347 ++++++++
+ config.h.in                    |   86 --
+ configure                      |  122 ++-
+ configure.ac                   |    2 +-
+ data/Makefile.in               |    2 +-
+ data/icons/16x16/Makefile.in   |    2 +-
+ data/icons/22x22/Makefile.in   |    2 +-
+ data/icons/24x24/Makefile.in   |    2 +-
+ data/icons/256x256/Makefile.in |    2 +-
+ data/icons/32x32/Makefile.in   |    2 +-
+ data/icons/48x48/Makefile.in   |    2 +-
+ data/icons/Makefile.in         |    2 +-
+ data/pixmaps/Makefile.in       |    2 +-
+ depcomp                        |  791 -----------------
+ install-sh                     |  527 -----------
+ missing                        |  215 -----
+ po/Makefile.in.in              |  222 -----
+ src/Makefile.am                |    4 +-
+ src/Makefile.in                |   10 +-
+ src/girl-0.5.dtd               |   17 +
+ src/stations.xml               |   94 +-
+ 26 files changed, 584 insertions(+), 3825 deletions(-)
 
-       * configure.ac: Bump version to 0.6.1.
+commit 7411c70c3df6ca0a67767b27330bb16e61313f66
+Author: Ole Aamot <oka oka no>
+Date:   Thu Nov 27 16:56:43 2014 +0100
 
-2014-12-06  Ole Aamot  <oka oka no>
+    Add Rafael Ferreira (Brazilian Portuguese translation)
 
-       * NEWS: girl 0.6.0 released.
+ AUTHORS | 1 +
+ 1 file changed, 1 insertion(+)
 
-2014-12-04  Ole Aamot  <oka oka no>
+commit 9989f06b631c8e5322001350ab98ec45bd170c80
+Author: Ole Aamot <oka oka no>
+Date:   Thu Nov 27 16:55:02 2014 +0100
 
-       * AUTHORS: Add Wolfgang Stöggl (German translation).
-       * po/de.po: German translation by Wolfgang Stöggl
+    Add Marek Černocký (Czech translation)
 
-2014-12-02  Ole Aamot  <oka oka no>
+ AUTHORS   | 4 +++-
+ ChangeLog | 5 +++++
+ THANKS    | 2 +-
+ 3 files changed, 9 insertions(+), 2 deletions(-)
 
-       * src/stations.xml: Add Leeds University Student Radio FM (lsrfm.com)
-       * src/stations.xml: Add University Radio Nottingham (urn1350.net))
-       * src/stations.xml: Add King's College London Radio (kclradio.co.uk)
-       * src/stations.xml: Add Imperial College Radio (icradio.com)
+commit 32f15f2d8d3c5ae2a2a4b1f215f075abb412550e
+Author: Marek Černocký <marek manet cz>
+Date:   Tue Nov 25 07:50:03 2014 +0100
 
-2014-11-29  Ole Aamot  <oka oka no>
+    Added the Czech language
 
-       * configure.ac: girl version 0.5.2.
-       * girl.spec.in: Update package spec for Fedora 21.
-       * man/girl.1: Add man page.
+ po/LINGUAS | 1 +
+ 1 file changed, 1 insertion(+)
 
-2014-11-29  Ole Aamot  <oka oka no>
+commit 2d3a015580eb9de3e83a57b8372d476d45a5c414
+Author: Marek Černocký <marek manet cz>
+Date:   Tue Nov 25 07:49:41 2014 +0100
 
-       * AUTHORS: Add Мирослав Николић/Miroslav Nikolić (Serbian translation).
-       * NEWS: girl 0.5.1 released.
-       * po/sr.po: Serbian translation by Мирослав Николић
-       * po/sr latin po: Serbian translation by Miroslav Nikolić
-       * src/girl-station.[ch]: Add station rank, type variables
+    Czech translation
 
-2014-11-29  Ole Aamot  <oka oka no>
+ po/cs.po | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 107 insertions(+)
 
-       * NEWS: girl 0.5.0 released.
-       * src/girl.c: Initial Previous Station / Next Station support
-       * src/girl-gui.c: Add Previous Station / Next Station buttons
-       * src/stations.xml: Add Radio Campus Paris (radiocampusparis.org).
-       * src/stations.xml: Add WCSB (wcsb.org).
-       * src/stations.xml: Add Radio Campus de l’Université Libre de Bruxelles (radiocampus.be).
-       * src/stations.xml: Add Coimbra University Radio (ruc.pt).
+commit 952da59a2ebd7ec66ddcecd72df1ddc685490f47
+Author: Rafael Ferreira <rafael f f1 gmail com>
+Date:   Mon Nov 24 20:28:56 2014 +0000
 
-2014-11-27  Ole Aamot  <oka oka no>
+    Added Brazilian Portuguese translation
 
-       * AUTHORS: Add Marek Černocký (Czech translation).
-       * AUTHORS: Add Rafael Ferreira (Brazilian Portuguese translation).
-       * NEWS: girl 0.4.1 released.
-       * configure.ac: Version 0.4.1.
-       * po/cs.po: Czech translation by Marek Černocký.
-       * po/pt_BR.po: Brazilian Portuguese translation by Rafael Ferreira.
-       * src/girl-0.5.dtd: Add station type property.
-       * src/stations.xml: Add Cam FM (www.camfm.co.uk).
-       * src/stations.xml: Add Oxford Student Radio (oxideradio.co.uk).
-       * src/stations.xml: Add Pulse LSE (pulselse.co.uk).
-       * src/stations.xml: Add Radio UNAM (www.radiounam.unam.mx).
+ po/LINGUAS  |   1 +
+ po/pt_BR.po | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 111 insertions(+)
 
-2014-11-22  Ole Aamot  <oka oka no>
+commit 7bc0a07f8ee9e698a291d2e1570a7019152e4bcf
+Author: Ole Aamot <oka oka no>
+Date:   Sun Nov 23 16:27:05 2014 +0100
 
-       * NEWS: girl 0.4.0 released.
-       * src/stations.xml: Add WXYC (wxyc.org)
-       * src/stations.xml: Add KALX (kalx.berkeley.edu)
-       * src/stations.xml: Add WHRB (whrb.org)
-       * src/stations.xml: Add Radio NOVA (radionova.no)
-       * src/girl-0.4.dtd: Add station rank property.
+    Add Piotr Drąg
 
-2014-11-16  Ole Aamot  <oka oka no>
+ THANKS | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
-       * NEWS: girl 0.3.2 released.
-       * src/stations.xml: Add WWNO (wwno.org)
+commit a579a8f39ade35ac01949d97bb366e1e936efa5b
+Author: Piotr Drąg <piotrdrag gmail com>
+Date:   Sat Nov 22 20:34:03 2014 +0100
 
-2014-11-15  Ole Aamot  <oka oka no>
+    Fix minor typos
+
+ src/girl-station.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-       * NEWS: girl 0.3.1 released.
-       * src/stations.xml: Add KTRU (ktru.org)
+commit 2d11fb4e6b535647351a11c57cb9e35a691213b6
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 18:37:05 2014 +0100
 
-2014-11-14  Ole Aamot  <oka oka no>
+    Update URL to Git source code repository.
+
+ HACKING | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6173e7c51fb78dfe62a5786ba7f20f6384c4b779
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 18:13:05 2014 +0100
+
+    Add girl 0.4 DTD.
 
-       * NEWS: girl 0.3.0 released.
-       * src/stations.xml: Add NRK Radio Alltid Nyheter
-       * src/stations.xml: Add BBC World Service
-       * src/stations.xml: Add WKCR
+ src/girl-0.4.dtd | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
 
-2014-11-08  gettextize  <bug-gnu-gettext gnu org>
+commit 32465a904620e8004731a08494e6585a5128f816
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 14:53:53 2014 +0100
 
-       * Makefile.am (ACLOCAL_AMFLAGS): New variable.
-       (EXTRA_DIST): Add config.rpath, m4/ChangeLog.
+    Update programming-language
 
-2014-11-08  Ole Aamot  <oka oka no>
+ girl.doap | 1 +
+ 1 file changed, 1 insertion(+)
 
-       * NEWS: girl 0.2.1 released.
-       * src/stations.xml: Add KZSU
+commit 0e9b6fc1b83f0b6d2c6823c425f500fa9cdc490f
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 14:53:11 2014 +0100
 
-2014-11-07  Ole Aamot  <oka oka no>
+    Update DOAP file.
 
-       * NEWS: girl 0.2.0 released.
-       * src/stations.xml: Add WMBR
-       * src/stations.xml: Add KEXP
+ girl.doap | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-2014-11-04  Ole Aamot  <oka oka no>
+commit 7e2774638a4980715bf9b5bf126ea05db17d9c35
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 14:40:43 2014 +0100
 
-       * NEWS: girl 0.1.3 released.
+    Add DOAP file for girl.
 
-2014-11-01  Ole Aamot  <oka ping uio no>
+ girl.doap | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
 
-       * NEWS: girl 0.1.2 released.
+commit 0327e2fe76c1051a693241e89186d88252e90688
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 14:02:59 2014 +0100
 
-2014-11-01  Ole Aamot  <oka ping uio no>
+    Correct minor spelling errors and changes.
 
-       * src/stations.xml: Add WCPE (http://theclassicalstation.org/)
+ ChangeLog           |  2 +-
+ NEWS                |  2 +-
+ src/girl-gui.c      | 23 ++++++++++++-----------
+ src/girl-listener.c |  5 +----
+ src/girl.c          | 15 ++++++++++++---
+ src/listeners.xml   |  6 +++---
+ src/stations.xml    | 16 +++++++++-------
+ 7 files changed, 39 insertions(+), 30 deletions(-)
 
-2014-11-01  Ole Aamot  <oka ping uio no>
+commit 11be8607a193d78d017f9f11f642ac193b1d45da
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 22 04:43:09 2014 +0100
 
-       * NEWS: girl 0.1.1 released.
+    GNOME Internet Radio Locator 0.4.0 release
 
-2002-09-22  Ole Aamot  <ole gnu org>
+ ChangeLog                        |  11 ++++++-
+ NEWS                             |   9 ++++++
+ configure                        |  20 ++++++------
+ configure.ac                     |   2 +-
+ data/icons/16x16/apps/girl.png   | Bin 4109 -> 781 bytes
+ data/icons/22x22/apps/girl.png   | Bin 4109 -> 1020 bytes
+ data/icons/256x256/apps/girl.png | Bin 4655 -> 2803 bytes
+ data/icons/48x48/apps/girl.png   | Bin 4109 -> 2803 bytes
+ girl.spec.in                     |   4 +++
+ src/Makefile.am                  |   4 +--
+ src/Makefile.in                  |   4 +--
+ src/girl-gui.c                   |   7 ++--
+ src/girl-station.c               |   6 ++--
+ src/stations.xml                 |  67 +++++++++++++++++++++++++++++++++------
+ 14 files changed, 102 insertions(+), 32 deletions(-)
 
-       * girl-station.c: Add support for $HOME/.girl/stations.xml
+commit f7fa43bb4505b4f5fd0d87bc3571c7525abb8491
+Author: Ole Aamot <oka oka no>
+Date:   Sun Nov 16 23:47:14 2014 +0100
 
-2002-09-22  Ole Aamot  <ole gnu org>
-
-       * NEWS: Project started.
+    Add KTRU and WWNO in src/stations.xml
+
+ Makefile.in      |  2 +-
+ configure        | 20 ++++++++++----------
+ configure.ac     |  2 +-
+ girl.spec.in     |  9 ++++-----
+ src/stations.xml | 17 +++++++++++++++++
+ 5 files changed, 33 insertions(+), 17 deletions(-)
+
+commit 715e7b7e875793fc756b50271cad105b1ab103ab
+Author: Ole Aamot <oka oka no>
+Date:   Sun Nov 16 22:36:31 2014 +0100
+
+    Release GNOME Internet Radio Locator 0.3.2
+
+ ChangeLog                | 15 ++++++++++++---
+ Makefile.in              |  7 +++----
+ NEWS                     | 16 +++++++++++++---
+ README                   |  2 +-
+ configure.ac             |  2 +-
+ data/girl.appdata.xml.in |  2 +-
+ data/girl.desktop.in.in  |  8 ++++----
+ girl.spec.in             | 14 ++++++++------
+ 8 files changed, 43 insertions(+), 23 deletions(-)
+
+commit 65d28d74d9efe75df198f005bef07b3cb14c7704
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 15 19:22:45 2014 +0100
+
+    Check for totem as audio helper.
+
+ Makefile.in                    |   1 +
+ configure                      | 121 +++++++++++++++++++++++++++++++++++++----
+ configure.ac                   |   7 ++-
+ data/Makefile.in               |   1 +
+ data/icons/16x16/Makefile.in   |   1 +
+ data/icons/22x22/Makefile.in   |   1 +
+ data/icons/24x24/Makefile.in   |   1 +
+ data/icons/256x256/Makefile.in |   1 +
+ data/icons/32x32/Makefile.in   |   1 +
+ data/icons/48x48/Makefile.in   |   1 +
+ data/icons/Makefile.in         |   1 +
+ data/pixmaps/Makefile.in       |   1 +
+ girl.spec.in                   |  14 ++++-
+ src/Makefile.am                |   2 +-
+ src/Makefile.in                |   3 +-
+ src/girl-station.c             |   3 +-
+ src/girl.h                     |   2 +-
+ 17 files changed, 145 insertions(+), 17 deletions(-)
+
+commit 2601fee24f0f2bda9bb99c351a67006f7afaff4d
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 15 18:35:08 2014 +0100
+
+    Note on mailing list.
+
+ HACKING | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit d7b230fe57020ff0a69158229409ad1c040e03be
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 15 18:31:31 2014 +0100
+
+    Introduction to hacking on GNOME Internet Radio Locator
+
+ Makefile    | 819 ------------------------------------------------------------
+ Makefile.am |   1 +
+ Makefile.in |   1 +
+ autogen.sh  |  25 ++
+ 4 files changed, 27 insertions(+), 819 deletions(-)
+
+commit f2f2fbad294fa3ee5a1d46fc030bd7a0905f4ca0
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 15 18:28:35 2014 +0100
+
+    Introduction to hacking on GNOME Internet Radio Locator.
+
+ HACKING | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+commit 1446046b5bec497cdf3a0173e66cbae2b2ac5dc2
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 15 18:18:44 2014 +0100
+
+    Screenshot of GNOME Internet Radio Locator version 0.3.2.
+
+ data/screenshot.png | Bin 0 -> 164998 bytes
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+
+commit f8183e0c0b028d9b3ead70682d10767001f629aa
+Author: Ole Aamot <oka oka no>
+Date:   Sat Nov 15 00:55:41 2014 +0100
+
+    GNOME Internet Radio Locator (Girl) 0.3.0
+
+ ABOUT-NLS                        | 1282 ++++++
+ AUTHORS                          |    1 +
+ COPYING                          |  340 ++
+ ChangeLog                        |   47 +
+ INSTALL                          |  370 ++
+ LETTER                           |   83 +
+ Makefile                         |  819 ++++
+ Makefile.am                      |   36 +
+ Makefile.in                      |  819 ++++
+ NEWS                             |   25 +
+ README                           |   14 +
+ THANKS                           |    3 +
+ TODO                             |   13 +
+ YP-DIRS                          |    9 +
+ aclocal.m4                       | 1906 +++++++++
+ config.h.in                      |   86 +
+ config.rpath                     |  690 ++++
+ configure                        | 7314 ++++++++++++++++++++++++++++++++++
+ configure.ac                     |   65 +
+ data/Makefile.am                 |   44 +
+ data/Makefile.in                 |  722 ++++
+ data/girl.appdata.xml.in         |   24 +
+ data/girl.desktop.in.in          |   18 +
+ data/icons/16x16/Makefile.am     |    9 +
+ data/icons/16x16/Makefile.in     |  482 +++
+ data/icons/16x16/apps/girl.png   |  Bin 0 -> 4109 bytes
+ data/icons/22x22/Makefile.am     |    9 +
+ data/icons/22x22/Makefile.in     |  482 +++
+ data/icons/22x22/apps/girl.png   |  Bin 0 -> 4109 bytes
+ data/icons/24x24/Makefile.am     |    7 +
+ data/icons/24x24/Makefile.in     |  481 +++
+ data/icons/24x24/apps/girl.png   |  Bin 0 -> 4109 bytes
+ data/icons/256x256/Makefile.am   |    7 +
+ data/icons/256x256/Makefile.in   |  481 +++
+ data/icons/256x256/apps/girl.png |  Bin 0 -> 4655 bytes
+ data/icons/32x32/Makefile.am     |    9 +
+ data/icons/32x32/Makefile.in     |  482 +++
+ data/icons/32x32/apps/girl.png   |  Bin 0 -> 4109 bytes
+ data/icons/48x48/Makefile.am     |    9 +
+ data/icons/48x48/Makefile.in     |  482 +++
+ data/icons/48x48/apps/girl.png   |  Bin 0 -> 4109 bytes
+ data/icons/Makefile.am           |   16 +
+ data/icons/Makefile.in           |  617 +++
+ data/pixmaps/Makefile.am         |    9 +
+ data/pixmaps/Makefile.in         |  482 +++
+ data/pixmaps/girl-map.png        |  Bin 0 -> 111584 bytes
+ depcomp                          |  791 ++++
+ girl.spec.in                     |   69 +
+ install-sh                       |  527 +++
+ m4/ChangeLog                     |   11 +
+ m4/nls.m4                        |   32 +
+ missing                          |  215 +
+ po/ChangeLog                     | 8127 ++++++++++++++++++++++++++++++++++++++
+ po/LINGUAS                       |    3 +
+ po/Makefile.in.in                |  222 ++
+ po/POTFILES.in                   |   10 +
+ po/POTFILES.skip                 |    3 +
+ po/nb.po                         |   20 +
+ src/Makefile.am                  |   13 +
+ src/Makefile.in                  |  648 +++
+ src/girl-0.1.dtd                 |   16 +
+ src/girl-0.2.dtd                 |   16 +
+ src/girl-0.3.dtd                 |   17 +
+ src/girl-canvas.c                |   45 +
+ src/girl-canvas.h                |   38 +
+ src/girl-gui.c                   |  456 +++
+ src/girl-gui.h                   |   14 +
+ src/girl-listener.c              |  191 +
+ src/girl-listener.h              |   37 +
+ src/girl-logo.png                |  Bin 0 -> 111584 bytes
+ src/girl-station.c               |  310 ++
+ src/girl-station.h               |   79 +
+ src/girl.c                       |  340 ++
+ src/girl.h                       |   82 +
+ src/girl.png                     |  Bin 0 -> 4655 bytes
+ src/listener-1.0.dtd             |   14 +
+ src/listeners.xml                |   11 +
+ src/stations.xml                 |   58 +
+ 78 files changed, 31209 insertions(+)
+
+commit 02032d665bb508e84376cca1d21461d513670d11
+Author: Ole K Aamot <oleaamot users noreply github com>
+Date:   Sat Nov 15 00:53:18 2014 +0100
+
+    Initial commit
+
+ LICENSE   | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ README.md |   4 +
+ 2 files changed, 344 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index a4e1ec1..d380aaf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data man src po debian
+SUBDIRS = data help man src po debian
 
 datadir = @datadir@
 
@@ -10,21 +10,6 @@ EXTRA_DIST = config.rpath m4/ChangeLog  \
        LETTER \
        Makefile \
        NEWS \
-       NEWS-0.5 \
-       NEWS-0.6 \
-       NEWS-0.7 \
-       NEWS-0.8 \
-       NEWS-0.9 \
-       NEWS-1.0 \
-       NEWS-1.1 \
-       NEWS-1.2 \
-       NEWS-1.3 \
-       NEWS-1.4 \
-       NEWS-1.5 \
-       NEWS-1.6 \
-       NEWS-1.7 \
-       NEWS-1.8 \
-       NEWS-1.9 \
        README \
        THANKS \
        TODO \
@@ -52,3 +37,13 @@ MAINTAINERCLEANFILES = \
 -include $(top_srcdir)/git.mk
 
 ACLOCAL_AMFLAGS = -I m4
+
+# Build ChangeLog from GIT history
+ChangeLog:
+       @if test -f $(top_srcdir)/.git/HEAD; then \
+               git log --stat --after="Mon Jul 20 23:47:57 2009" > $@; \
+       fi
+
+dist: ChangeLog
+
+.PHONY: ChangeLog
diff --git a/NEWS b/NEWS
index 08405a3..fe02193 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,20 @@
 =============
+Version 2.0.0
+=============
+
+Stations
+
+       * src/girl.xml: Add UCT Radio (www.radio.uct.ac.za)
+       * src/girl.xml: Add NRK P1 (www.nrk.no/p1)
+       * src/girl.xml: Add NRK P2 (www.nrk.no/p2)
+       * src/girl.xml: Add NRK P3 (www.nrk.no/p3)
+       * src/girl.xml: Add NRK Urørt (www.nrk.no/urort)
+       
+Translations
+
+       * po/hu.po: Updated Hungarian translation by Balázs Úr
+
+=============
 Version 1.9.0
 =============
 
diff --git a/README b/README
index 32a0a9c..80b4e68 100644
--- a/README
+++ b/README
@@ -1,4 +1,13 @@
 ==============
+GIRL 2.0 notes
+==============
+
+GNOME Internet Radio Locator (GIRL) version 2.0.0 is available and
+supports 62 Internet radio stations in Norway, South Africa, Canada,
+Switzerland, United Kingdom, Canada, Nova Scotia, New Zealand, Australia,
+Czech Republic, United Kingdom, Portugal, Belgium, France, and México.
+
+==============
 GIRL 1.5 notes
 ==============
 
diff --git a/THANKS b/THANKS
index 8df0638..03cbb7e 100644
--- a/THANKS
+++ b/THANKS
@@ -18,3 +18,4 @@ Efstathios Iosifidis for Greek translation.
 Matej Urbančič for Slovenian translation.
 Samir Ribić for Bosnian translation.
 Enrico Nicoletto for Brazilian Portuguese translation.
+Lillebjørn Nilsen for inspiration to continue work on GIRL.
diff --git a/configure b/configure
index d1af7d4..fc50c48 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 1.9.0.
+# Generated by GNU Autoconf 2.69 for girl 2.0.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='girl'
 PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='1.9.0'
-PACKAGE_STRING='girl 1.9.0'
+PACKAGE_VERSION='2.0.0'
+PACKAGE_STRING='girl 2.0.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -622,6 +622,13 @@ ac_includes_default="\
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+YELP_HELP_RULES
+XMLLINT
+ITSTOOL
+HELP_DIR
+YELP_LC_DIST
+YELP_LC_MEDIA_LINKS
+LN_S
 GIRL_PKG_DEPS
 GETTEXT_PACKAGE
 ALL_LINGUAS
@@ -797,6 +804,7 @@ enable_gtk_doc
 enable_gtk_doc_html
 enable_gtk_doc_pdf
 enable_nls
+with_help_dir
 '
       ac_precious_vars='build_alias
 host_alias
@@ -813,7 +821,9 @@ GIRL_CFLAGS
 GIRL_LIBS
 GTKDOC_DEPS_CFLAGS
 GTKDOC_DEPS_LIBS
-CPP'
+CPP
+ITSTOOL
+XMLLINT'
 
 
 # Initialize some variables set by options.
@@ -1354,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures girl 1.9.0 to adapt to many kinds of systems.
+\`configure' configures girl 2.0.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1420,7 +1430,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 1.9.0:";;
+     short | recursive ) echo "Configuration of girl 2.0.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1444,6 +1454,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-recording        Support recording with streamripper
   --with-html-dir=PATH    path to installed docs
+  --with-help-dir=DIR     path where help files are installed
 
 Some influential environment variables:
   CC          C compiler command
@@ -1465,6 +1476,8 @@ Some influential environment variables:
   GTKDOC_DEPS_LIBS
               linker flags for GTKDOC_DEPS, overriding pkg-config
   CPP         C preprocessor
+  ITSTOOL     Path to the `itstool` command
+  XMLLINT     Path to the `xmllint` command
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1532,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 1.9.0
+girl configure 2.0.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1897,7 +1910,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by girl $as_me 1.9.0, which was
+It was created by girl $as_me 2.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2760,7 +2773,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='1.9.0'
+ VERSION='2.0.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6570,8 +6583,307 @@ _ACEOF
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
+
+
+
+
+
+
+YELP_LC_MEDIA_LINKS=true
+YELP_LC_DIST=true
+
+for yelpopt in ; do
+  case $yelpopt in
+    lc-media-links)    YELP_LC_MEDIA_LINKS=true ;;
+    no-lc-media-links) YELP_LC_MEDIA_LINKS= ;;
+    lc-dist)           YELP_LC_DIST=true ;;
+    no-lc-dist)        YELP_LC_DIST= ;;
+    *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;;
+  esac
+done;
+
+
+
+
+# Check whether --with-help-dir was given.
+if test "${with_help_dir+set}" = set; then :
+  withval=$with_help_dir;
+else
+  with_help_dir='${datadir}/help'
+fi
+
+HELP_DIR="$with_help_dir"
+
+
+
+# Extract the first word of "itstool", so it can be a program name with args.
+set dummy itstool; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ITSTOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ITSTOOL"; then
+  ac_cv_prog_ITSTOOL="$ITSTOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ITSTOOL="itstool"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ITSTOOL=$ac_cv_prog_ITSTOOL
+if test -n "$ITSTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5
+$as_echo "$ITSTOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x"$ITSTOOL" = x; then
+  as_fn_error $? "itstool not found" "$LINENO" 5
+fi
+
+
+# Extract the first word of "xmllint", so it can be a program name with args.
+set dummy xmllint; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_XMLLINT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$XMLLINT"; then
+  ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_XMLLINT="xmllint"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+XMLLINT=$ac_cv_prog_XMLLINT
+if test -n "$XMLLINT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+$as_echo "$XMLLINT" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x"$XMLLINT" = x; then
+  as_fn_error $? "xmllint not found" "$LINENO" 5
+fi
+
+YELP_HELP_RULES='
+HELP_ID ?=
+HELP_POT ?=
+HELP_FILES ?=
+HELP_EXTRA ?=
+HELP_MEDIA ?=
+HELP_LINGUAS ?=
+
+_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter 
$(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS))
+_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot))
+_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po))
+_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES))
+_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f))
+_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f))
+_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f))
+_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f)))
+_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp)
+
+_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
+_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V))
+_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V))
+_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V))
+_HELP_LC_VERBOSE_0 = @echo "  GEN    "$(dir $@);
+
+all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES)
+
+.PHONY: pot
+pot: $(_HELP_POTFILE)
+$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
+       $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \
+       $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)")
+
+.PHONY: repo
+repo: $(_HELP_POTFILE)
+       $(AM_V_at)for po in $(_HELP_POFILES); do \
+         if test "x$(_HELP_V)" = "x0"; then echo "  GEN    $${po}"; fi; \
+         msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \
+       done
+
+$(_HELP_POFILES):
+       $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
+       $(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi
+       $(AM_V_GEN)if ! test -f "$@"; then \
+         (cd "$(dir $@)" && \
+           $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \
+           mv "$(notdir $@).tmp" "$(notdir $@)"); \
+       else \
+         (cd "$(dir $@)" && \
+           $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \
+           msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \
+           rm "$(notdir $@).tmp"); \
+       fi
+
+$(_HELP_MOFILES): %.mo: %.po
+       $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
+       $(AM_V_GEN)msgfmt -o "$@" "$<"
+
+$(_HELP_LC_FILES): $(_HELP_LINGUAS)
+$(_HELP_LINGUAS): $(_HELP_LC_STAMPS)
+$(_HELP_LC_STAMPS): %.stamp: %.mo
+$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA)
+       $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi
+       $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \
+       mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
+       if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \
+       (cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \
+       touch "$@"
+
+.PHONY: clean-help
+mostlyclean-am: $(if $(HELP_ID),clean-help)
+clean-help:
+       rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES)
+
+EXTRA_DIST ?=
+EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA)
+EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp))
+EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po)
+EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
+
+distdir: distdir-help-files
+distdir-help-files: $(_HELP_LC_FILES)
+       @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
+         $(MKDIR_P) "$(distdir)/$$lc"; \
+         for file in $(HELP_FILES); do \
+           if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \
+           cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \
+         done; \
+       done; \
+
+.PHONY: check-help
+check: check-help
+check-help:
+       for lc in C $(_HELP_LINGUAS); do \
+         if test -d "$$lc"; \
+           then d=; \
+           xmlpath="$$lc"; \
+         else \
+           d="$(srcdir)/"; \
+           xmlpath="$$lc:$(srcdir)/$$lc"; \
+         fi; \
+         for page in $(HELP_FILES); do \
+           echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \
+           $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \
+         done; \
+       done
+
+
+.PHONY: install-help
+install-data-am: $(if $(HELP_ID),install-help)
+install-help: $(_HELP_LC_FILES)
+       @for lc in C $(_HELP_LINGUAS); do \
+         $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
+       done
+       @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
+         if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \
+         helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+         if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
+         echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \
+         $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \
+       done; done
+       @for f in $(_HELP_C_EXTRA); do \
+         lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
+         if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \
+         helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+         if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \
+         echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \
+         $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \
+       done
+       @for f in $(HELP_MEDIA); do \
+         for lc in C $(_HELP_LINGUAS); do \
+           if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \
+           helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+           mdir=`dirname "$$f"`; \
+           if test "x$mdir" = "x."; then mdir=""; fi; \
+           if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \
+           if test -f "$$d$$lc/$$f"; then \
+             echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \
+             $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \
+           elif test "x$$lc" != "xC"; then \
+             if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \
+               echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \
+               $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \
+             fi; \
+           fi; \
+         done; \
+       done
+
+.PHONY: uninstall-help
+uninstall-am: $(if $(HELP_ID),uninstall-help)
+uninstall-help:
+       for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \
+         helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+         echo "rm -f $$helpdir`basename $$f`"; \
+         rm -f "$$helpdir`basename $$f`"; \
+       done; done
+       @for f in $(_HELP_C_EXTRA); do \
+         lc=`dirname "$$f"`; lc=`basename "$$lc"`; \
+         helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+         echo "rm -f $$helpdir`basename $$f`"; \
+         rm -f "$$helpdir`basename $$f`"; \
+       done
+       @for f in $(HELP_MEDIA); do \
+         for lc in C $(_HELP_LINGUAS); do \
+           helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \
+           echo "rm -f $$helpdir$$f"; \
+           rm -f "$$helpdir$$f"; \
+         done; \
+       done;
+'
+
+
+
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop.in data/pixmaps/Makefile 
data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile 
data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/512x512/Makefile 
data/icons/1024x1024/Makefile debian/Makefile debian/source/Makefile man/Makefile po/Makefile.in src/Makefile 
girl.spec"
+ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop.in data/pixmaps/Makefile 
data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile 
data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/512x512/Makefile 
data/icons/1024x1024/Makefile debian/Makefile debian/source/Makefile help/Makefile man/Makefile 
po/Makefile.in src/Makefile girl.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7135,7 +7447,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by girl $as_me 1.9.0, which was
+This file was extended by girl $as_me 2.0.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7201,7 +7513,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-girl config.status 1.9.0
+girl config.status 2.0.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7349,6 +7661,7 @@ do
     "data/icons/1024x1024/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/1024x1024/Makefile" ;;
     "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
     "debian/source/Makefile") CONFIG_FILES="$CONFIG_FILES debian/source/Makefile" ;;
+    "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index b2f0286..8129484 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(girl, 1.9.0)
+AC_INIT(girl, 2.0.0)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
@@ -85,7 +85,7 @@ AC_SUBST(GIRL_PKG_DEPS)
 AC_SUBST(GIRL_HELPER_PLAYER)
 
 dnl Enable yelp-tools
-dnl YELP_HELP_INIT
+YELP_HELP_INIT
 
 AC_OUTPUT([
 Makefile
@@ -103,6 +103,7 @@ data/icons/512x512/Makefile
 data/icons/1024x1024/Makefile
 debian/Makefile
 debian/source/Makefile
+help/Makefile
 man/Makefile
 po/Makefile.in
 src/Makefile
diff --git a/data/Makefile.in b/data/Makefile.in
index 1878647..b9960d0 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -80,7 +80,7 @@ subdir = data
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(srcdir)/girl.desktop.in.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -238,6 +238,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -254,9 +255,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -286,6 +289,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index 1421b67..375a54f 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -80,7 +80,7 @@ subdir = data/icons/16x16
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(dist_appicons_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -178,6 +178,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -194,9 +195,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +229,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index cff358f..a99350c 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -80,7 +80,7 @@ subdir = data/icons/22x22
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(dist_appicons_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -178,6 +178,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -194,9 +195,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +229,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
index f32944c..efaed8a 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -80,7 +80,7 @@ subdir = data/icons/24x24
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(dist_appicons_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -178,6 +178,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -194,9 +195,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +229,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/256x256/Makefile.in b/data/icons/256x256/Makefile.in
index aeed376..6708f1c 100644
--- a/data/icons/256x256/Makefile.in
+++ b/data/icons/256x256/Makefile.in
@@ -80,7 +80,7 @@ subdir = data/icons/256x256
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(dist_appicons_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -178,6 +178,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -194,9 +195,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +229,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
index 5444a14..f52a6a5 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -80,7 +80,7 @@ subdir = data/icons/32x32
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(dist_appicons_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -178,6 +178,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -194,9 +195,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +229,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/48x48/Makefile.in b/data/icons/48x48/Makefile.in
index f9b7a10..79c14e2 100644
--- a/data/icons/48x48/Makefile.in
+++ b/data/icons/48x48/Makefile.in
@@ -80,7 +80,7 @@ subdir = data/icons/48x48
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(dist_appicons_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -178,6 +178,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -194,9 +195,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -226,6 +229,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index dff37be..8da98fb 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -78,7 +78,7 @@ POST_UNINSTALL = :
 subdir = data/icons
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -207,6 +207,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -223,9 +224,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -255,6 +258,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in
index 6f59d6f..a96fa65 100644
--- a/data/pixmaps/Makefile.in
+++ b/data/pixmaps/Makefile.in
@@ -79,7 +79,7 @@ POST_UNINSTALL = :
 subdir = data/pixmaps
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -177,6 +177,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -193,9 +194,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -225,6 +228,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
diff --git a/data/screenshot.png b/data/screenshot.png
index 88cbdd2..4b1ca6a 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/girl.spec.in b/girl.spec.in
index 41e9b7d..9565f25 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -65,8 +65,12 @@ fi
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man1/%{name}.1*
+%{_datadir}/help/*/%{name}/*
 
 %changelog
+* Tue Mar 24 2015 Ole Aamot - 2.0.0-1.fc21
+- Girl 2.0.0 build on Fedora Linux 21
+
 * Sat Mar 21 2015 Ole Aamot - 1.9.0-1.fc21
 - Girl 1.9.0 build on Fedora Linux 21
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 18a446b..db963a8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,6 @@ girl_CFLAGS  = $(GIRL_CFLAGS) \
 girl_LDADD = $(GIRL_LIBS)
 
 girldir = $(datadir)/girl
-girl_DATA = girl-1.6.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-2.0.dtd girl-logo.png girl.png girl.xml
 
-EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h 
girl-canvas.h girl-1.6.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h 
girl-canvas.h girl-2.0.dtd girl-logo.png girl.png girl.xml
diff --git a/src/Makefile.in b/src/Makefile.in
index 68ecb37..3b1a09c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -82,7 +82,7 @@ subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/yelp.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -228,6 +228,7 @@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 HAVE_GIRL_RECORD = @HAVE_GIRL_RECORD@
+HELP_DIR = @HELP_DIR@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -244,9 +245,11 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+ITSTOOL = @ITSTOOL@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -276,6 +279,9 @@ STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
+XMLLINT = @XMLLINT@
+YELP_LC_DIST = @YELP_LC_DIST@
+YELP_LC_MEDIA_LINKS = @YELP_LC_MEDIA_LINKS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -343,8 +349,8 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
 
 girl_LDADD = $(GIRL_LIBS)
 girldir = $(datadir)/girl
-girl_DATA = girl-1.6.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h 
girl-canvas.h girl-1.6.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-2.0.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-gui.h girl-listener.h girl-program.h girl-runners.h girl-streams.h 
girl-canvas.h girl-2.0.dtd girl-logo.png girl.png girl.xml
 all: all-am
 
 .SUFFIXES:
diff --git a/src/girl-gui.c b/src/girl-gui.c
index a4c445f..ec99cd8 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -51,10 +51,6 @@
 extern GtkWidget *girl_app;
 
 GnomeUIInfo toolbar[] = {
-       GNOMEUIINFO_ITEM_STOCK(N_("Stations"), N_("Internet Radio Stations"),
-                              on_stations_selector_button_clicked,
-                              GTK_STOCK_NETWORK),
-       GNOMEUIINFO_SEPARATOR,  
        GNOMEUIINFO_ITEM_STOCK(N_("Search"), N_("Search by location for radio stations"),
                               on_search_button_clicked,
                               GTK_STOCK_FIND),
@@ -74,6 +70,9 @@ GnomeUIInfo toolbar[] = {
        GNOMEUIINFO_ITEM_STOCK(N_("Previous"),
                               N_("Go back to the previous radio station"),
                               on_previous_station_click, GTK_STOCK_GO_BACK),
+       GNOMEUIINFO_ITEM_STOCK(N_("Stations"), N_("Internet Radio Stations"),
+                              on_stations_selector_button_clicked,
+                              GTK_STOCK_NETWORK),
        GNOMEUIINFO_ITEM_STOCK(N_("Next"), N_("Proceed to the next radio station"),
                               on_next_station_click, GTK_STOCK_GO_FORWARD),
        GNOMEUIINFO_SEPARATOR,
@@ -451,7 +450,7 @@ GtkWidget *create_search_selector(void) {
        gtk_entry_set_completion(GTK_ENTRY(textentry), completion);
        g_signal_connect(G_OBJECT(completion), "match-selected",
                         G_CALLBACK(on_search_matches), NULL);
-       model = gtk_list_store_new(11, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+       model = gtk_list_store_new(11, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_STRING);
 
        world_station_xml_filename = g_strconcat(GIRL_DATADIR, "/girl.xml", NULL);
        GIRL_DEBUG_MSG("world_station_xml_filename = %s\n",
@@ -511,7 +510,7 @@ GtkWidget *create_search_selector(void) {
                                   STATION_ID,
                                   stationinfo->id,
                                   -1);
-               
+
                stationinfo = stationinfo->next;
        }
 
diff --git a/src/girl-station.c b/src/girl-station.c
index a430538..db1e85b 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -498,7 +498,7 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
                        GIRL_DEBUG_MSG("station->stream->uri = %s\n",
                            station->stream->uri);
 
-                       /* fprintf(stdout, "%s (%s)\n%s\n\n, ", station->name, station->location, 
station->stream->uri); */
+                       /* fprintf(stdout, "%s (%s)\n%s\n\n", station->name, station->location, 
station->stream->uri); */
                        
                        chans = (gchar *)xmlGetProp(sub, (const xmlChar *)"stations");
 
diff --git a/src/girl-station.h b/src/girl-station.h
index 1f98bf3..ec19e05 100644
--- a/src/girl-station.h
+++ b/src/girl-station.h
@@ -30,6 +30,7 @@ typedef struct _GirlStationInfo GirlStationInfo;
 typedef struct _GirlStreamInfo GirlStreamInfo;
 
 typedef enum {
+       STATION_LANG = 11,
        STATION_ID = 10,
        STATION_NAME = 0,
        STATION_RANK = 7,
@@ -56,6 +57,7 @@ struct _GirlStationInfo {
        gchar *bitrate;
        gchar *samplerate;
        gchar *uri;
+       gchar *lang;
        /*   gchar *category; */
        GirlStreamInfo *stream;
        GirlStationInfo *next;
diff --git a/src/girl.c b/src/girl.c
index e235163..69b4716 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -22,16 +22,13 @@
  */
 
 #include <config.h>
-
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libgnomevfs/gnome-vfs-application-registry.h>
 #include <gio/gcredentials.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
-
 #include "girl.h"
 #include "girl-gui.h"
 #include "girl-listener.h"
@@ -192,6 +189,9 @@ void on_previous_station_click(GtkWidget * a, gpointer user_data)
                                girl->selected_station_name,
                                GIRL_STREAM_SHOUTCAST,
                                GIRL_STREAM_PLAYER);
+
+               about_station((GirlData*)girl, (GirlStationInfo*)girl->previous_station);
+               
        } else {
 
                GIRL_DEBUG_MSG("Prev Station: At the beginning of Stations list!\n");
@@ -254,6 +254,8 @@ void on_next_station_click(GtkWidget * a, gpointer user_data)
                                        GIRL_STREAM_PLAYER);
 
                        girl->selected_station = (GirlStationInfo*)station;
+
+                       about_station((GirlData*)girl, (GirlStationInfo*)girl->selected_station);
                }
        }
 }
@@ -582,15 +584,16 @@ void about_listener(GtkWidget * a, gpointer user_data)
 
 void about_program(GtkWidget * a, gpointer user_data)
 {
-       static GtkWidget *about_program = NULL;
+       GtkWidget *about_program;
+       
        /* const gchar *translator_credits = _("translator_credits"); */
        const gchar *authors[] = {
                girl->selected_program_name,
                NULL,
        };
 
-       about_program->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       
+       /* about_program->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); */
+               
        if (about_program) {
                gdk_window_raise(about_program->window);
                gtk_widget_show(GTK_WIDGET(about_program->window));
@@ -611,29 +614,33 @@ void about_program(GtkWidget * a, gpointer user_data)
 
 }
 
-void about_station(GtkWidget * a, gpointer user_data)
+void about_station(GirlData * a, gpointer user_data)
 {
-       static GtkWidget *about_station = NULL;
+       static GtkWidget *about_station;
        /* const gchar *translator_credits = _("translator_credits"); */
        const gchar *authors[] = {
                girl->selected_station_name,
                NULL,
        };
 
+       if (GTK_IS_WIDGET(about_station)) {
+               gtk_widget_destroy(GTK_WIDGET(about_station));
+       }
+       
        if (about_station) {
                gdk_window_raise(about_station->window);
                return;
        }
 
        about_station = gnome_about_new(girl->selected_station_name,
-                                       girl->selected_station_band,
-                                       girl->selected_station_location,
-                                       girl->selected_station_description,
-                                       authors,
-                                       NULL,
-                                       NULL,
-                                       girl->icon);
-
+                                             girl->selected_station_band,
+                                             girl->selected_station_location,
+                                             girl->selected_station_description,
+                                             authors,
+                                             NULL,
+                                             NULL,
+                                             girl->icon);
+       
        g_signal_connect(G_OBJECT(about_station), "destroy",
                         G_CALLBACK(gtk_widget_destroy), NULL);
        g_signal_connect(G_OBJECT(about_station), "delete-event",
diff --git a/src/girl.h b/src/girl.h
index 817486f..1c94cf1 100644
--- a/src/girl.h
+++ b/src/girl.h
@@ -91,14 +91,13 @@ void quit_app(GtkWidget *, gpointer user_data);
 void about_app(GtkWidget *, gpointer user_data);
 void about_listener(GtkWidget *, gpointer user_data);
 void about_program(GtkWidget *, gpointer user_data);
-void about_station(GtkWidget *, gpointer user_data);
-void about_streams(GtkWidget *, gpointer user_data);
        
 struct _GirlData {
        GtkImage *pixmap;
        GnomeAppBar *appbar;
        GtkProgressBar *progress;
        GtkAboutDialog *window;
+       GtkWidget *about_station;
        GirlListenerInfo *selected_listener;
        gchar *selected_listener_uri;
        gchar *selected_listener_name;
@@ -140,6 +139,9 @@ struct _GirlData {
 
 typedef struct _GirlData GirlData;
 
+void about_station(GirlData *, gpointer user_data);
+void about_streams(GtkWidget *, gpointer user_data);
+
 extern GirlData *girl;
 extern GList *girl_listeners;
 extern GList *girl_programs;
diff --git a/src/girl.xml b/src/girl.xml
index 642c87f..3f3c5ad 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,19 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="http://www.ping.uio.no/~oka/src/girl/girl.xsl"; ?>
-<!DOCTYPE girl SYSTEM "girl-1.6.dtd">
-<girl version="1.9">
+<!DOCTYPE girl SYSTEM "girl-2.0.dtd">
+<girl version="1.0">
+  <station band="ONLINE" id="nrkp1" lang="no" name="NRK P1" rank="1.0" type="gov">
+    <frequency uri="http://www.nrk.no/p1/";>ONLINE in Oslo, Norway</frequency>
+    <location>Oslo, Norway</location>
+    <description>
+      NRK P1 is one of the nationwide radio channels operated by the Norwegian Broadcasting Corporation 
(NRK).
+      NRK P1 is the direct descendant of NRK's first radio station which began broadcasting in 1933. P1's 
programming is aimed at a broad mature demographic and it is Norway's most popular radio station, with 
approximately 1.9 million listeners daily.
+    </description>
+    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p1_ostlandssendingen_aac_h"; codec="MPEG 1 
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://www.nrk.no/p1</uri>
+  </station>
+  <station band="ONLINE" id="nrkp2" lang="no" name="NRK P2" rank="1.0" type="gov">
+    <frequency uri="http://www.nrk.no/p2/";>ONLINE in Oslo, Norway</frequency>
+    <location>Oslo, Norway</location>
+    <description>
+      NRK P2 is one of the nationwide radio channels operated by the Norwegian Broadcasting Corporation 
(NRK).
+    </description>
+    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p2_aac_h"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://www.nrk.no/p2</uri>
+  </station>
+  <station band="ONLINE" id="nrkp3" lang="no" name="NRK P3" rank="1.0" type="gov">
+    <frequency uri="http://www.nrk.no/p3/";>ONLINE in Oslo, Norway</frequency>
+    <location>Oslo, Norway</location>
+    <description>
+      NRK P3 is one of the radio channels operated by the Norwegian Broadcasting Corporation (NRK).
+      NRK P3 focuses on youth culture.
+    </description>
+    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p3_aac_h"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://www.nrk.no/p3</uri>
+  </station>
+  <station band="ONLINE" id="nrkurort" lang="no" name="NRK Urørt" rank="1.0" type="gov">
+    <frequency uri="http://www.nrk.no/urort/";>ONLINE in Oslo, Norway</frequency>
+    <location>Oslo, Norway</location>
+    <description>
+      NRK P3 Urørt is a site where independent Norwegian artists and bands can promote their music.  The 
Urørt editors review the music played on NRK P3 Urørt.
+    </description>
+    <stream mime="audio/mpeg" uri="http://lyd.nrk.no/nrk_radio_p3_urort_aac_h"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://urort.p3.no</uri>
+  </station>
+  <station band="104.5FM" id="uctradio" lang="en" name="UCT Radio" rank="1.0" type="edu">
+    <frequency uri="http://www.radio.uct.ac.za/";>104.5 FM in Cape Town, South Africa</frequency>
+    <location>Cape Town, South Africa</location>
+    <description>
+      UCT Radio 104.5fm in three words: Diverse, Dynamic and Contemporary.
+
+      From the underground beats of hip hop, to the euphoric tones of house and the classic tunes of rock,  
and everything else in between, UCT Radio embodies what it truly means to be a music lover. The station 
captures a diverse audience of university students, staffers and even the wider Cape Town community.
+    </description>
+    <stream mime="audio/mpeg" uri="http://listenlive-c2p1.ndstream.net:8130/listen.pls"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Mono" bitrate="48 kbps" />
+    <uri>http://www.radio.uct.ac.za/</uri>
+  </station>
   <station band="101.9FM" id="cfrc" lang="en" name="CFRC" rank="1.0" type="edu">
     <frequency uri="http://www.cfrc.ca/";>101.9 FM in Kingston, Canada</frequency>
     <location>Kingston, Canada</location>
     <description>
       CFRC 101.9 FM is Kingston’s only campus and community radio station!
-
       We are 100% not-for-profit, volunteer-powered media that fills the gap left by the mainstream.
-
-      We offer diverse music and spoken word programming 24/7: over the air at 101.9FM in the Kingston area 
and worldwide on-line.
-
-      We provide free broadcast skills training and experience to members of the community.
-
+<!--      We offer diverse music and spoken word programming 24/7: over the air at 101.9FM in the Kingston 
area and worldwide on-line.
+      We provide free broadcast skills training and experience to members of the community.-->
       We have been broadcasting since 1922, making us the longest-running campus-based broadcaster in Canada.
     </description>
     <stream mime="audio/mpeg" uri="http://stream.cfrc.ca:8000/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
@@ -23,13 +68,8 @@
     <frequency uri="http://chuo.fm/";>89.1 FM in Ottawa, Canada</frequency>
     <location>Ottawa, Canada</location>
     <description>
-      Music, information, community. That’s CHUO
-
       We are NOT your traditional radio station. We are THE community radio station.
-
       For over 20 YEARS we’ve been playing nothing but the best in indie-rock, folk, funk, reggae, hip hop, 
jazz, blues, country, rock, classical, ska, punk, soul, Motown and more. We offer a new, refreshing flavour 
of music from local, independent, underground and emerging artists to tickle every one of your musical taste 
buds. We play tunes that you probably won’t know the words to… we feature artists you’ve probably never heard 
of… we make radio worth listening to.
-
-      We are the voice of the community. We talk about things you care about. We represent the various 
facets that make up our beautiful community……We are CHUO FM 89.1by the people for the people!
     </description>
     <stream mime="audio/mpeg" uri="http://icecast1.isiglobal.ca:8000/chuo.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://chuo.fm/</uri>
@@ -38,10 +78,9 @@
     <frequency uri="http://radiorakel.no/";>99.3 FM in Oslo, Norway</frequency>
     <location>Oslo, Norway</location>
     <description>RadiOrakel was started in 1982 when the government allowed local radio operations in 
Norway. At a women's cultural festival a group of women collected funds to start up the world's first women's 
radio station. On 16th of October 1982, RadiOrakel was founded.
-
-    Since 1982 RadiOrakel has produced experimental journalism with the aim of educating women in 
radio-journalism and audio engineering. RadiOrakel has a minimum of 2 / 3 female members. RadiOrakel actively 
prioritizes and promotes women as both interviewers and interviewees, and also has a profile with at least 
50% of all music being performed by female performers / musicians. RadiOrakel also seeks to combat 
discrimination based on gender, race, religion and sexual orientation.
-
-    RadiOrakel is located at the Blitz House on Pilestredet 30E in Oslo. They broadcast daily from 1:00 p.m. 
to 7:00 p.m., and on Friday’s and Saturday’s from 9:00 a.m. to 7:00 p.m. on FM 99.3 in Oslo and surrounding 
areas.  Broadcasts are streamed over the Internet.</description>
+    RadiOrakel is located at the Blitz House on Pilestredet 30E in Oslo. They broadcast daily from 1:00 p.m. 
to 7:00 p.m., and on Friday’s and Saturday’s from 9:00 a.m. to 7:00 p.m. on FM 99.3 in Oslo and surrounding 
areas.
+<!--    Since 1982 RadiOrakel has produced experimental journalism with the aim of educating women in 
radio-journalism and audio engineering. RadiOrakel has a minimum of 2 / 3 female members. RadiOrakel actively 
prioritizes and promotes women as both interviewers and interviewees, and also has a profile with at least 
50% of all music being performed by female performers / musicians. RadiOrakel also seeks to combat 
discrimination based on gender, race, religion and sexual orientation.-->
+<!--      Broadcasts are streamed over the Internet.--></description>
     <stream mime="audio/mpeg" uri="http://stream.radionova.no/fm993.mp3"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://radiorakel.no/</uri>
   </station>
@@ -49,10 +88,8 @@
     <frequency uri="http://kxsc.org/";>1560 AM in Los Angeles, CA</frequency>
     <location>Los Angeles, CA</location>
     <description>KXSC Radio (formerly KSCR) is the 100% student-run radio station of the University of 
Southern California; we are volunteer, non-profit, donation funded and we provide the USC community with 
original radio programming 24 hours a day.
-    
     KXSC traces its roots to the original KUSC, which was operated by students starting in 1946. KUSC 
transitioned to classical programming and moved off-campus in the mid-1970s, but students still demanded a 
broadcast voice. So on April 2, 1975, a dozen students gathered in a converted production studio to start 
KSCR, a radio station run by and for students.
-
-    KXSC has undergone yet another revolution with our new home in the Ronald Tutor Campus Center, but our 
approach to radio is still the same: All-student run music, sports and news broadcasts that encourage 
diversity and a student-centric approach.
+<!--    KXSC has undergone yet another revolution with our new home in the Ronald Tutor Campus Center, but 
our approach to radio is still the same: All-student run music, sports and news broadcasts that encourage 
diversity and a student-centric approach.-->
     </description>
     <stream mime="audio/mpeg" uri="http://kxsc.org/s/kxsc.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.kxsc.org/</uri>
@@ -93,7 +130,7 @@
     </description>
     <stream mime="audio/mpeg" uri="http://cast9.directhostingcenter.com:2199/tunein/soevwkmu.pls"; 
codec="MPEG 1 Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://soundfm.ca/</uri>
-  </station>    
+  </station>
   <station band="ONLINE" id="nrj-bern" lang="en" name="Radio NRJ Bern" rank="1.0" type="edu">
     <frequency uri="http://www.energy.ch/bern/";>Internet</frequency>
     <location>Bern, Switzerland</location>
@@ -105,10 +142,8 @@
     <frequency uri="http://www.wvau.org/";>Online in Washington, DC</frequency>
     <location>Washington, DC</location>
     <description>WVAU is American University's student radio station. We broadcast online 24/7 from the Mary 
Graydon Center in Washington, D.C.
-
-    With a staff of over 120 student DJs, WVAU offers unique musical programming and a perspective that you 
won't find anywhere else. Outside of the studio, WVAU brings in local and touring artists every semester for 
interviews, in-studio performances, and our Capital Punishment free concert series. We also host monthly open 
mic nights to showcase AU's talented students and faculty. All of our events are free and open to the public.
-
-    WVAU focuses on showcasing independent music that you won't hear on your traditional Top 40 station. Our 
live programming covers the best in indie rock, hip-hop, electronic, experimental, jazz, folk, world music, 
and more. Our eclectic schedule doesn't limit students to genre-specific shows, which sets WVAU apart from 
traditional college radio stations and gives our DJs the freedom to play whatever music they 
want.</description>
+<!--    With a staff of over 120 student DJs, WVAU offers unique musical programming and a perspective that 
you won't find anywhere else. Outside of the studio, WVAU brings in local and touring artists every semester 
for interviews, in-studio performances, and our Capital Punishment free concert series. We also host monthly 
open mic nights to showcase AU's talented students and faculty. All of our events are free and open to the 
public.-->
+<!--    WVAU focuses on showcasing independent music that you won't hear on your traditional Top 40 station. 
Our live programming covers the best in indie rock, hip-hop, electronic, experimental, jazz, folk, world 
music, and more. Our eclectic schedule doesn't limit students to genre-specific shows, which sets WVAU apart 
from traditional college radio stations and gives our DJs the freedom to play whatever music they 
want.--></description>
     <stream mime="audio/mpeg" uri="http://ice8.securenetsystems.net/WVAU"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.wvau.org/</uri>
   </station>
@@ -118,7 +153,7 @@
     <description>KCSN is commercial free, public radio that relies heavily on donor 
contributions.</description>
     <stream mime="audio/mpeg" uri="http://130.166.82.184:8000/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <stream mime="audio/mpeg" uri="http://130.166.82.184:8002/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps" />
-    <stream mime="audio/mpeg" uri="http://130.166.82.184:8004/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="32 kbps" />    
+    <stream mime="audio/mpeg" uri="http://130.166.82.184:8004/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="32 kbps" />
     <uri>http://www.kcsn.org/</uri>
   </station>
   <station band="91.7FM" id="kvrx" name="KVRX" rank="1.0" type="edu">
@@ -130,14 +165,14 @@
   </station>
   <station band="ONLINE" id="ksub" name="KSUB" rank="1.0" type="edu">
     <frequency uri="http://www.ksubseattle.org/";>Online in Seattle, WA</frequency>
-    <location>Seattle, WA</location>        
+    <location>Seattle, WA</location>
     <description>We are one of the last college radio stations in the Seattle area actually run by students. 
Our DJ's are current students and beloved alumni (and even some faculty), and because we are non-commercial, 
we are free from mainstream radio constraints. Each individual DJ has near complete control of what he or she 
plays on the air, giving KSUB a rich musical diversity.</description>
     <stream mime="audio/mpeg" uri="http://lin1.san.fast-serv.com:6014"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.ksubseattle.org/</uri>
   </station>
   <station band="ONLINE" id="wrvu" name="WRVU" rank="1.0" type="edu">
     <frequency uri="http://wrvu.org/";>Online in Nashville, TN</frequency>
-    <location>Nashville, TN</location>    
+    <location>Nashville, TN</location>
     <description>WRVU is a free-format college radio station committed to providing Vanderbilt University 
and the surrounding community with the best in new, non-mainstream music. WRVU is student-run and focuses on 
teaching Vanderbilt students the ins and outs of radio broadcasting, playing music you can’t hear anywhere 
else.</description>
     <stream mime="audio/mpeg" uri="http://129.59.202.68:8200/listen.pls"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://wrvu.org/</uri>
@@ -159,7 +194,7 @@
   <station band="90.1FM" id="wusb" name="WUSB" rank="1.0" type="edu">
     <frequency uri="http://www.wusb.fm/";>90.1 FM in Long Island, NY</frequency>
     <location>Long Island, NY</location>
-    <description>WUSB is a 3,600 watt non-commercial station located on the campus of Stony Brook 
University. Since 1977, we have served the campus and Long Island listening communities with a diverse 
broadcast mix of music, news, public affairs, drama and sports programming. Our 24 hour a day schedule is 
made possible by a volunteer staff efforts of over 160 Stony Brook students, faculty, staff, alumni and 
community residents. Behind-the-scenes as well as on-air work, combined with a variety of nationally 
syndicated radio programs integrated into the schedule, creates the 168 hours per week of innovative and 
high-quality programming.</description>
+    <description>WUSB is a 3,600 watt non-commercial station located on the campus of Stony Brook 
University. Since 1977, we have served the campus and Long Island listening communities with a diverse 
broadcast mix of music, news, public affairs, drama and sports programming.<!-- Our 24 hour a day schedule is 
made possible by a volunteer staff efforts of over 160 Stony Brook students, faculty, staff, alumni and 
community residents. Behind-the-scenes as well as on-air work, combined with a variety of nationally 
syndicated radio programs integrated into the schedule, creates the 168 hours per week of innovative and 
high-quality programming.--></description>
     <stream mime="audio/mpeg" uri="http://stream.wusb.stonybrook.edu:8080/listen.pls"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="32 kbps" />
     <stream mime="audio/mpeg" uri="http://stream.wusb.stonybrook.edu:8090/listen.pls"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.wusb.fm/</uri>
@@ -174,18 +209,16 @@
   <station band="90.7FM" id="wvua" name="WVUA-FM" rank="1.0" type="edu">
     <frequency uri="http://wvuafm.ua.edu/";></frequency>
     <location>Tuscaloosa, AL</location>
-    <description>WVUA-FM is the University’s only student operated radio station. Its history dates back to 
1940 when the Department of Radio Arts began operation of an AM carrier-current station (the signal was 
transmitted to dormitories and other buildings on campus through electrical wiring). The station was known as 
BRN (the Bama Radio Network). In 1947, the signal was extended and the station became known as WABP. The 
station was operated as a commercial venture at 570 on the AM dial. During the 1950’s and 1960’s, as more 
students moved off campus, the station’s listenership dwindled.</description>
+    <description>WVUA-FM is the University’s only student operated radio station. Its history dates back to 
1940 when the Department of Radio Arts began operation of an AM carrier-current station (the signal was 
transmitted to dormitories and other buildings on campus through electrical wiring).<!-- The station was 
known as BRN (the Bama Radio Network). In 1947, the signal was extended and the station became known as WABP. 
The station was operated as a commercial venture at 570 on the AM dial. During the 1950’s and 1960’s, as more 
students moved off campus, the station’s listenership dwindled.--></description>
     <stream mime="audio/mpeg" uri="http://ice8.securenetsystems.net/WVUA"; codec="MPEG-4 AAC" 
samplerate="44100 Hz" channels="Stereo" bitrate="30 kbps" />
     <uri>http://wvuafm.ua.edu/</uri>
   </station>
   <station band="1350AM" id="ury" lang="en" name="University Radio York" rank="1.0" type="edu">
     <frequency uri="http://ury.org.uk/";></frequency>
     <location>York, United Kingdom</location>
-    <description>University Radio York (URY) is the student radio station for the University of York, 
broadcasting 24 hours a day during term time on 1350am across the University's Heslington Campus and 
worldwide via this website.
-
+    <description>University Radio York (URY) is the student radio station for the University of York, 
broadcasting 24 hours a day during term time on 1350am across the University's Heslington Campus and 
worldwide via this website.<!--
     The station is run by students for students, meaning the people behind the station understand what the 
listenership want to hear.
-
-    With no playlist and no set format to many of our shows, our presenters have the chance to try whatever 
they like, as long as it's legal!</description>
+    With no playlist and no set format to many of our shows, our presenters have the chance to try whatever 
they like, as long as it's legal!--></description>
     <stream mime="audio/mpeg" uri="http://ury.york.ac.uk/audio/live-mobile.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="48 kbps" />
     <stream mime="audio/mpeg" uri="http://ury.york.ac.uk/audio/live-low.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
     <stream mime="audio/mpeg" uri="http://ury.york.ac.uk/audio/live-high.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
@@ -210,7 +243,7 @@
   <station band="ONLINE" id="fusefm" lang="en" name="Fuse FM" rank="1.0" type="edu">
     <frequency uri="http://fusefm.co.uk/";></frequency>
     <location>Manchester, United Kingdom</location>
-    <description>Fuse FM is Manchester University's student radio station. We first went on air back in 
2001, and 13 years later we now broadcast from a brand new, professional quality studio from within the 
Students' Union. We broadcast online throughout the academic year and you can listen to live shows and 
podcasts on our website. We love our new home, but we need your help to sound great on air. If you want to 
get in on the action, you'd be more than welcome! We are constantly on the look out for new talent, so if you 
fancy yourself as a music journalist, producer, DJ, news reader, or think you have what it takes to host your 
own show, Fuse FM is certainly the place for you! Not only is Fuse FM a fun organisation to be part of, but 
we can help you if you are interested in getting into the radio industry. Past Fuse FM members have gone on 
to find work at the BBC and commercial radio stations.</description>
+    <description>Fuse FM is Manchester University's student radio station. We first went on air back in 
2001, and 13 years later we now broadcast from a brand new, professional quality studio from within the 
Students' Union. We broadcast online throughout the academic year and you can listen to live shows and 
podcasts on our website. We love our new home, but we need your help to sound great on air. <!--If you want 
to get in on the action, you'd be more than welcome! We are constantly on the look out for new talent, so if 
you fancy yourself as a music journalist, producer, DJ, news reader, or think you have what it takes to host 
your own show, Fuse FM is certainly the place for you! Not only is Fuse FM a fun organisation to be part of, 
but we can help you if you are interested in getting into the radio industry. Past Fuse FM members have gone 
on to find work at the BBC and commercial radio stations.--></description>
     <stream mime="audio/mpeg" uri="http://studio.fusefm.co.uk:8000/livehi"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="320 kbps" />
     <stream mime="audio/ogg" uri="http://studio.fusefm.co.uk:8000/livehi"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="320 kbps" />
     <stream mime="audio/mpeg" uri="http://studio.fusefm.co.uk:8000/live"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
@@ -220,7 +253,7 @@
   <station band="90.9FM" id="cjsw" lang="en" name="CJSW" rank="1.0" type="edu">
     <frequency uri="http://cjsw.com/";></frequency>
     <location>Calgary, Canada</location>
-    <description>CJSW 90.9 FM will be celebrating 30 years of on air radio programming at the beginning of 
2015. Our goal is to provide an alternative to commercial media by recognizing and promoting the diverse 
musical styles, points of view and cultures that exist within our city. CJSW strives to provide programming 
to an audience and by programmers that are varied in their ethnicity, culture, gender, sexual orientation, 
age, and physical and mental ability. Our diverse programming includes music, arts, spoken word and 
multicultural programs.</description>
+    <description>CJSW 90.9 FM will be celebrating 30 years of on air radio programming at the beginning of 
2015. Our goal is to provide an alternative to commercial media by recognizing and promoting the diverse 
musical styles, points of view and cultures that exist within our city.<!-- CJSW strives to provide 
programming to an audience and by programmers that are varied in their ethnicity, culture, gender, sexual 
orientation, age, and physical and mental ability. Our diverse programming includes music, arts, spoken word 
and multicultural programs.--></description>
     <stream mime="audio/mpeg" uri="http://stream.cjsw.com/cjsw.mp3.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://cjsw.com/</uri>
   </station>
@@ -228,11 +261,8 @@
     <frequency uri="http://caperradio.ca/";>Pending FM license in Sydney, Nova Scotia, Canada</frequency>
     <location>Sydney, Nova Scotia, Canada</location>
     <description>Caper Radio Incorporated is CBU's campus radio station!
-
     Located in the Students' Union building we are equipped with an ever-growing music collection of over 
6000 CDs on a digital library. We offer some of the best independent music in Canada. Caper Radio is also a 
prime resource for information on events taking place both on and off campus.
-
-    Being involved with Caper Radio, Inc. helps students gain new skills (in communication, as well as 
working with the equipment), build confidence, and make new friends. Taking part in shaping the university 
community, and building valuable job skills – It's a lot of fun too!
-
+<!--    Being involved with Caper Radio, Inc. helps students gain new skills (in communication, as well as 
working with the equipment), build confidence, and make new friends. Taking part in shaping the university 
community, and building valuable job skills – It's a lot of fun too!-->
     Caper Radio broadcasts from 9:30am until 4:30pm Monday - Friday. Repeat broadcasts can be heard by 
visiting our website.</description>
     <stream mime="audio/mpeg" uri="http://142.12.32.15:8000/stream.m3u"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://caperradio.ca/</uri>
@@ -240,7 +270,7 @@
   <station band="88.3FM" id="wxou" lang="en" name="WXOU" rank="1.0" type="edu">
     <frequency uri="http://wxou.org/";>88.3 FM in Rochester, MI</frequency>
     <location>Rochester, MI</location>
-    <description>WXOU is a non-profit, student operated, freeform community radio station. Currently we are 
broadcasting with 110 watts of power from the campus of Oakland University. WE offer diverse programming such 
as, music, sports, news and student produced programs. Our goal is to supply the community with a service 
that provides both an educational experience to those involved with the radio station, while also providing 
information and entertainment o the rest of the community outside of Oakland’s campus.</description>
+    <description>WXOU is a non-profit, student operated, freeform community radio station. Currently we are 
broadcasting with 110 watts of power from the campus of Oakland University. WE offer diverse programming such 
as, music, sports, news and student produced programs.<!-- Our goal is to supply the community with a service 
that provides both an educational experience to those involved with the radio station, while also providing 
information and entertainment o the rest of the community outside of Oakland’s campus.--></description>
     <stream mime="audio/mpeg" uri="http://wxou.oakland.edu:8000/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="22050 Hz" channels="Mono" bitrate="24 kbps" />
     <stream mime="audio/mpeg" uri="http://wxou.oakland.edu:8002/listen.pls"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Mono" bitrate="128 kbps" />
   </station>
@@ -261,8 +291,8 @@
   <station band="95.0FM" id="95bfm" lang="en" name="95bFM" rank="1.0" type="edu">
     <frequency uri="http://www.95bfm.com/";>95.0 FM in Auckland, New Zealand</frequency>
     <location>Auckland, New Zealand</location>
-    <description>In 1969, Radio Bosom was born as a student's capping stunt, broadcasting illegally from a 
boat in the Waitemata Harbour. Over the next few decades the bosom morphed into the mighty 95bFM, the 
longest-standing independent radio station in New Zealand.
-    We're passionate about music, just like you. We think that radio is better when it's free from 
commercial pressures, and that it should be challenging without being inaccessible. This is not top 40 
radio.</description>
+    <description>In 1969, Radio Bosom was born as a student's capping stunt, broadcasting illegally from a 
boat in the Waitemata Harbour. Over the next few decades the bosom morphed into the mighty 95bFM, the 
longest-standing independent radio station in New Zealand.<!--
+    We're passionate about music, just like you. We think that radio is better when it's free from 
commercial pressures, and that it should be challenging without being inaccessible. This is not top 40 
radio.--></description>
     <stream mime="audio/mpeg" uri="http://streams.95bfm.com/stream95"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="22050 Hz" channels="Mono" bitrate="32 kbps" />
     <uri>http://www.95bfm.com/</uri>
   </station>
@@ -314,31 +344,28 @@
   <station band="ONLINE" id="kcl" lang="en" name="King's College London Radio" rank="1.0" type="edu">
     <frequency uri="http://www.kclradio.co.uk/";>Internet</frequency>
     <location>London, United Kingdom</location>
-    <description>KCL Radio is King’s College London’s award winning, student radio station, which first 
broadcast live last year. Our studio is currently located on the basement floor of the Chesham Building 
(although there are plans to relocate to a new studio in Tutu’s on the 4th floor of the Macadam Building 
during 2015).  Output ranges from music to news, chat, sport, comedy and everything in between. Live 
broadcasts also take place throughout the year for significant events on the KCLSU calendar such as the 
Student Officer Elections or the Varsity Rugby match.</description>
+    <description>KCL Radio is King’s College London’s award winning, student radio station, which first 
broadcast live last year. Our studio is currently located on the basement floor of the Chesham Building 
(although there are plans to relocate to a new studio in Tutu’s on the 4th floor of the Macadam Building 
during 2015).<!--  Output ranges from music to news, chat, sport, comedy and everything in between. Live 
broadcasts also take place throughout the year for significant events on the KCLSU calendar such as the 
Student Officer Elections or the Varsity Rugby match.--></description>
     <stream mime="audio/mpeg" uri="http://159.92.75.8:8080/KCLR"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.kclradio.co.uk/</uri>
   </station>
   <station band="ONLINE" id="icradio" lang="en" name="Imperial College Radio" rank="1.0" type="edu">
     <frequency uri="http://icradio.com/";>1134 AM in Wye, Kent, United Kingdom</frequency>
     <location>London, United Kingdom</location>
-    <description>IC Radio is among the oldest student radio stations in the country. Started in 1976, 
broadcasting on a home built AM transmitter around halls, we now broadcast all over the globe from 
icradio.com. Absolutely anyone is welcome to try their hand at presenting or producing a show; whatever your 
music taste. We also love a good speech based program, so anyone will feel at home in IC Radio. As well as 
being able to broadcast, we are lucky enough to have a brand new, fully equipped recording studio which we 
use to record bands and musicians.
-
-Behind the scenes we rely on our fantastic technical, musical and promotional teams. Are you interested in 
web design? Want to record professional band and artists? Maybe you fancy running our IT system? Or perhaps 
you want to talk to industry insiders to get your hands on new music weeks before any of your friends? 
There's a place for you here and we'd love for you to join us!</description>
+    <description>IC Radio is among the oldest student radio stations in the country. Started in 1976, 
broadcasting on a home built AM transmitter around halls, we now broadcast all over the globe from 
icradio.com.<!-- Absolutely anyone is welcome to try their hand at presenting or producing a show; whatever 
your music taste. We also love a good speech based program, so anyone will feel at home in IC Radio. As well 
as being able to broadcast, we are lucky enough to have a brand new, fully equipped recording studio which we 
use to record bands and musicians.-->
+<!--
+Behind the scenes we rely on our fantastic technical, musical and promotional teams. Are you interested in 
web design? Want to record professional band and artists? Maybe you fancy running our IT system? Or perhaps 
you want to talk to industry insiders to get your hands on new music weeks before any of your friends? 
There's a place for you here and we'd love for you to join us!--></description>
     <stream mime="audio/mpeg" uri="http://icecast.icradio.com:8000/live-mp3-high"; codec="MPEG 1 Audio, Layer 
3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
     <uri>http://icradio.com/</uri>
   </station>
   <station band="107.9FM" id="ruc" lang="pt" name="Coimbra University Radio" rank="1.0" type="edu">
     <frequency uri="http://www.ruc.pt/";>107.9 FM in Coimbra, Portugal</frequency>
     <location>Coimbra, Portugal</location>
-    <description>Coimbra University Radio (Portuguese: Rádio Universidade de Coimbra - RUC) is a university 
radio station of the Coimbra Academic Association (students' union) of the University of Coimbra in Coimbra, 
Portugal.
-
-    It broadcasts on 107.9 FM (also broadcasts on-line). The Center of Experimental Radio was founded in the 
40's, but it was only on March, 1st 1986, that the radio obtained the authorization to broadcast on FM.
-
+    <description>Coimbra University Radio (Portuguese: Rádio Universidade de Coimbra - RUC) is a university 
radio station of the Coimbra Academic Association (students' union) of the University of Coimbra in Coimbra, 
Portugal.<!--
+    It broadcasts on 107.9 FM (also broadcasts on-line). The Center of Experimental Radio was founded in the 
40's, but it was only on March, 1st 1986, that the radio obtained the authorization to broadcast on FM.-->
+<!--
     The studios and offices of this university radio station are located in the main building of the 
Associação Académica de Coimbra, in the city centre. One of its trademarks is that there are no set playlists 
for any of the programs broadcast. This allows for an exceptionally wide range of musical genres.
-
     The radio gives courses in Programming, Technic and News, that students from the University of Coimbra 
can join.
-
-    For its 25th anniversary, the radio hosts concerts of the indie Swedish band the Radio Dept., and later 
Eleanor Friedberger from the rock duo The Fiery Furnaces and the Welsh songwriter Euros Childs.</description>
+    For its 25th anniversary, the radio hosts concerts of the indie Swedish band the Radio Dept., and later 
Eleanor Friedberger from the rock duo The Fiery Furnaces and the Welsh songwriter Euros 
Childs.--></description>
     <stream mime="audio/mpeg" uri="http://ruc.midi-club.net:8000/;stream/1"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.ruc.pt/</uri>
   </station>
@@ -380,7 +407,7 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
   <station band="97.2FM" id="camfm" lang="en" name="Cam FM" rank="1.0" type="edu">
     <frequency uri="http://www.camfm.co.uk/";>97.2 FM in Cambridge, United Kingdom</frequency>
     <location>Cambridge, United Kingdom</location>
-    <description>Originally founded in 1979, the award-winning Cam FM is now one of the most heavily 
listened to student radio stations in the UK, as well as one of the largest student-run media organisations 
in Cambridge, covering students at both Cambridge and Anglia Ruskin Universities. We know students because we 
are students; every aspect of the station is professionally run by students, staff, and alumni of the 
Universities - presenting, producing, or running the committee. Our content is primarily geared towards 
engaging with the student community in Cambridge.</description>
+    <description>Originally founded in 1979, the award-winning Cam FM is now one of the most heavily 
listened to student radio stations in the UK, as well as one of the largest student-run media organisations 
in Cambridge, covering students at both Cambridge and Anglia Ruskin Universities. <!--We know students 
because we are students; every aspect of the station is professionally run by students, staff, and alumni of 
the Universities - presenting, producing, or running the committee. Our content is primarily geared towards 
engaging with the student community in Cambridge.--></description>
     <stream mime="audio/mpeg" uri="http://stream.camfm.co.uk/camfm"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.camfm.co.uk/</uri>
   </station>
@@ -397,7 +424,7 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <description>WXYC went on the air on March 17, 1977 with Joni Mitchell's "You Turn Me on I'm a Radio."
 
       WXYC was preceded by WCAR, a carrier current station that reached dorms on the UNC-Chapel Hill campus 
through electrical wiring. The station's alumni include top 40 radio host Rick Dees.
-
+<!--
       When WCAR wanted to upgrade in the early 1970s, it decided to pursue an FM license and begin 
broadcastin over the air rather than update the carrier current system. Funding for the change to FM was 
provided by a student referendum passed in 1973. The physical conversion cost $35,000 and took two years to 
complete.
 
       The non-profit Student Educational Broadcasting, Inc. was established to serve as the official owner 
of WXYC's broadcast license, and in 1977 WCAR became WXYC. The station was originally scheduled to begin 
broadcasting in January 1977, but winter freezes prevented the installation of an antenna on UNC's water 
tower delaying the broadcast until March.
@@ -408,7 +435,7 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
 
       In 1994, the staff of UNC's SunSITE, the first Web site in North America, helped WXYC become the first 
radio station in the world to stream its on-air signal live over the Internet. We're proud to have been at 
the forefront of the Internet radio medium. We now have loyal listeners all over the world who contact us 
with comments and requests by email and IM.
 
-      WXYC alumni include ESPN anchor Stuart Scott, former Squirrel Nut Zipper Tom Maxwell, former Polvo 
guitarist Dave Brylawski, Newsweek reporter Colin Soloway, film director Peyton Reed, as well as scores of 
doctors, lawyers, writers, executives, and successful professionals of all kinds.</description>
+      WXYC alumni include ESPN anchor Stuart Scott, former Squirrel Nut Zipper Tom Maxwell, former Polvo 
guitarist Dave Brylawski, Newsweek reporter Colin Soloway, film director Peyton Reed, as well as scores of 
doctors, lawyers, writers, executives, and successful professionals of all kinds.--></description>
     <stream mime="audio/ogg" uri="http://www.wxyc.org/files/streams/wxyc-ogg.pls"; codec="Ogg Vorbis" 
samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
     <stream mime="audio/mpeg" uri="http://wxyc.org/files/streams/wxyc-mp3.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://www.wxyc.org/</uri>
@@ -417,10 +444,10 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <frequency uri="http://kalx.berkeley.edu/";>90.7 FM in Berkeley, CA</frequency>
     <location>Berkeley, CA</location>
     <description>KALX 90.7 FM broadcasts freeform radio 24 hours a day to a large portion of the San 
Francisco Bay Area. You can catch all stripes of underground music accented with news, sports and alternative 
informational programming.
-
+<!--
       KALX has a wonderfully dedicated staff of student and community volunteers who are willing to explore 
with and educate their listeners. KALX is regular folks doing wild, unpredictable, extraordinary radio. All 
of our programs are homespun, we don't depend on satellite feeds. Rather we create programs from, and for our 
community (a community that includes both the University of California, Berkeley student population AND the 
surrounding area).
 
-      As part of our mission to educate, every KALX DJ is encouraged to play a variety of musical styles and 
types. Rather than segregating music into limited boxes, this philosophy is an attempt to entertain the 
listener while broadening their musical experience. A pretty fun way to be educated, don't ya 
think!</description>
+      As part of our mission to educate, every KALX DJ is encouraged to play a variety of musical styles and 
types. Rather than segregating music into limited boxes, this philosophy is an attempt to entertain the 
listener while broadening their musical experience. A pretty fun way to be educated, don't ya 
think!--></description>
     <stream mime="audio/ogg" uri="http://icecast.media.berkeley.edu:8000/kalx-128.ogg.m3u"; codec="Ogg 
Vorbis" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <stream mime="audio/mpeg" uri="http://icecast.media.berkeley.edu:8000/kalx-128.mp3.m3u"; codec="MPEG 1 
Audio, Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://kalx.berkeley.edu/</uri>
@@ -478,10 +505,10 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <frequency>90.1 FM in Stanford, CA</frequency>
     <location>San Francisco, CA</location>
     <description>KZSU is Stanford University's FM radio station, broadcasting across the Bay Area on 90.1 FM 
and across the world at kzsulive.stanford.edu. We exist to serve the Stanford community with quality radio 
broadcasts, including music, sports, news, and public affairs programming.
-
+<!--
       The station is owned by the Board of Trustees of Stanford University and is governed by a Board of 
Directors appointed by the President. We got our FM license in 1964, and upgraded from 10 to 500 watts in 
1978. Before 1964, KZSU broadcast as an AM carrier current station (through the University's power supply) on 
880 kHz, starting in 1947 as a part of the Department of Communication.
 
-      KZSU is a non-commercial station funded mainly by Stanford student fees, in addition to underwriting 
and listener donations. KZSU's staff is all volunteer, made up of Stanford students, staff, alumni, and 
community affiliates.</description>
+      KZSU is a non-commercial station funded mainly by Stanford student fees, in addition to underwriting 
and listener donations. KZSU's staff is all volunteer, made up of Stanford students, staff, alumni, and 
community affiliates.--></description>
     <stream mime="audio/mpeg" uri="http://kzsulive.stanford.edu/audio/kzsu-1-128.m3u"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://kzsulive.stanford.edu/</uri>
   </station>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]