[girl] GTK+ 2.0 backport. See GNOME3 for details about my GTK+ 3.0 port.



commit 217b4f087dfd61dea136d8d0caba1fcbe033432a
Author: Ole Aamot <oka oka no>
Date:   Thu Mar 16 14:35:20 2017 +0100

    GTK+ 2.0 backport.  See GNOME3 for details about my GTK+ 3.0 port.

 GNOME3          |   30 ++++-
 NEWS            |    6 +
 README          |    9 ++
 configure       |  138 +++++++++++---------
 configure.ac    |   17 ++-
 girl.spec.in    |   15 ++-
 help/sv/sv.po   |  395 +++++++++++++++++++++++--------------------------------
 po/POTFILES.in  |   22 +---
 po/hu.po        |  192 ++++++++++++++-------------
 po/sr.po        |  255 ++++++++++++++---------------------
 po/sr latin po  |  255 ++++++++++++++---------------------
 src/Makefile.am |   36 +++--
 src/Makefile.in |  334 ++++++++++++++++++++++++++++++-----------------
 src/girl.c      |  182 -------------------------
 src/girl.xml    |    4 +-
 15 files changed, 850 insertions(+), 1040 deletions(-)
---
diff --git a/GNOME3 b/GNOME3
index 4b882a4..1dc92e7 100644
--- a/GNOME3
+++ b/GNOME3
@@ -1,11 +1,29 @@
-The next generation (10.0.0) of GNOME Internet Radio Locator is in
-development.
+GNOME Internet Radio Locator 10.0.0 being written.
 
-You can download a GNOME 3 test release based on libchamplain and GNOME
-Maps from from
-https://people.gnome.org/~ole/testing/girl-10.0.0-champlain-test.tar.xz
+You can download a GNOME 3 test release based on libchamplain and
+GNOME Maps - https://people.gnome.org/~ole/girl/girl-9.9.0.tar.xz
+
+See HACKING and my first attempt of porting the files to GTK+ 3.0
+
+src/GIRL.c
+src/GIRL-GUI.c
+src/GIRL-GUI.h
+src/GIRL.h
+src/GIRL-LISTENER.c
+src/GIRL-LISTENER.h
+src/GIRL-PROGRAM.c
+src/GIRL-PROGRAM.h
+src/GIRL-RUNNERS.c
+src/GIRL-RUNNERS.h
+src/GIRL-STATION.c
+src/GIRL-STATION.h
+src/GIRL-STATIONS-MAP.c
+src/GIRL-STATIONS-MAP.h
+src/GIRL-STREAMS.c
+src/GIRL-STREAMS.h
+src/GIRL-TZ.c
+src/GIRL-TZ.h
 
-See HACKING for details on how to contribute code to the next generation.
 
 Enjoy Internet radio,
 Ole Aamot <ole src gnome org>
diff --git a/NEWS b/NEWS
index 321f1f4..457dd02 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
 =============
+Version 9.8.1
+=============
+
+       * src/girl.xml: Add KCED (http://www.centralia.edu/kced/)
+
+=============
 Version 9.8.0
 =============
 
diff --git a/README b/README
index 824c92c..8f7daa4 100644
--- a/README
+++ b/README
@@ -1,4 +1,13 @@
 ================
+GIRL 9.9.1 notes
+================
+
+GNOME Internet Radio Locator version 9.9 was released in March 2017.
+
+The new release ships with KCED (http://www.centralia.edu/kced/) and
+initial GTK+ 3.0 port of GNOME Internet Radio Locator (see GNOME3).
+
+================
 GIRL 9.8.0 notes
 ================
 
diff --git a/configure b/configure
index 2f62a5c..d542d2f 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 9.9.0.
-#
-# Report bugs to <girl-list gnome org>.
+# Generated by GNU Autoconf 2.69 for girl 9.9.1.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -266,11 +264,10 @@ fi
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_echo "$0: Please tell bug-autoconf gnu org and
-$0: girl-list gnome org about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+    $as_echo "$0: Please tell bug-autoconf gnu org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -580,12 +577,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='girl'
 PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='9.9.0'
-PACKAGE_STRING='girl 9.9.0'
-PACKAGE_BUGREPORT='girl-list gnome org'
+PACKAGE_VERSION='9.9.1'
+PACKAGE_STRING='girl 9.9.1'
+PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
-ac_unique_file="src/GIRL.c"
+ac_unique_file="src/girl.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1365,7 +1362,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 9.9.0 to adapt to many kinds of systems.
+\`configure' configures girl 9.9.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1431,7 +1428,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 9.9.0:";;
+     short | recursive ) echo "Configuration of girl 9.9.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1483,7 +1480,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <girl-list gnome org>.
+Report bugs to the package provider.
 _ACEOF
 ac_status=$?
 fi
@@ -1546,7 +1543,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 9.9.0
+girl configure 9.9.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1793,10 +1790,6 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------- ##
-## Report this to girl-list gnome org ##
-## ---------------------------------- ##"
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
@@ -1915,7 +1908,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 9.9.0, which was
+It was created by girl $as_me 9.9.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2778,7 +2771,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='9.9.0'
+ VERSION='9.9.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4131,26 +4124,32 @@ if test -n "$GIRL_CFLAGS"; then
     pkg_cv_GIRL_CFLAGS="$GIRL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 \\
-                 pangoft2 >= 0.28 \\
-                 champlain-gtk-0.12 >= 0.12.10 \\
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0 \\
+                 glib-2.0 >= 2.40 \\
+                 libgnome-2.0 >= 2.0 \\
+                 libgnomeui-2.0 >= 2.0 \\
                  libxml-2.0 >= 2.0 \\
-                 gstreamer-1.0 >= 1.0 \\
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GIRL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+  pkg_cv_GIRL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4163,26 +4162,32 @@ if test -n "$GIRL_LIBS"; then
     pkg_cv_GIRL_LIBS="$GIRL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 \\
-                 pangoft2 >= 0.28 \\
-                 champlain-gtk-0.12 >= 0.12.10 \\
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.0 \\
+                 glib-2.0 >= 2.40 \\
+                 libgnome-2.0 >= 2.0 \\
+                 libgnomeui-2.0 >= 2.0 \\
                  libxml-2.0 >= 2.0 \\
-                 gstreamer-1.0 >= 1.0 \\
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GIRL_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+  pkg_cv_GIRL_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0" 2>/dev/null`
                      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -4204,28 +4209,34 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               GIRL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+               GIRL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0" 2>&1`
         else
-               GIRL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+               GIRL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$GIRL_PKG_ERRORS" >&5
 
-       as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+       as_fn_error $? "Package requirements (gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0) were not met:
 
 $GIRL_PKG_ERRORS
@@ -4259,7 +4270,7 @@ $as_echo "yes" >&6; }
 
 fi 2>&5
 
-GIRL_PKG_DEPS="gtk+-3.0 libxml-2.0, gstreamer-1.0 gstreamer-video-1.0"
+GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0, gstreamer-1.0 
gstreamer-video-1.0"
 
 
 
@@ -6692,7 +6703,7 @@ uninstall-help:
 
 
 
-ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop 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 help/Makefile man/Makefile po/Makefile.in src/Makefile girl.spec"
+ac_config_files="$ac_config_files Makefile data/Makefile data/girl.desktop 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 help/Makefile man/Makefile po/Makefile.in src/Makefile girl.spec 
mingw32-girl.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7256,7 +7267,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 9.9.0, which was
+This file was extended by girl $as_me 9.9.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7316,13 +7327,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <girl-list gnome org>."
+Report bugs to the package provider."
 
 _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 9.9.0
+girl config.status 9.9.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7473,6 +7484,7 @@ do
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "girl.spec") CONFIG_FILES="$CONFIG_FILES girl.spec" ;;
+    "mingw32-girl.spec") CONFIG_FILES="$CONFIG_FILES mingw32-girl.spec" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/configure.ac b/configure.ac
index c71b6c2..76c4a02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(girl, [9.9.0], [girl-list gnome org])
+AC_INIT(girl, 9.9.1)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
-AC_CONFIG_SRCDIR([src/GIRL.c])
+AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
 
 # Checks for libraries.
@@ -33,14 +33,16 @@ AC_SUBST([HAVE_GIRL_RECORD])
 AC_CHECK_LIB(m, pow, [], [], [])
 
 PKG_CHECK_MODULES(GIRL,
-                 gtk+-3.0 >= 3.0 \
-                 pangoft2 >= 0.28 \
-                 champlain-gtk-0.12 >= 0.12.10 \
+                 gtk+-2.0 >= 2.0 \
+                 glib-2.0 >= 2.40 \
+                 libgnome-2.0 >= 2.0 \
+                 libgnomeui-2.0 >= 2.0 \
                  libxml-2.0 >= 2.0 \
-                 gstreamer-1.0 >= 1.0 \
+                 gnome-vfs-2.0 >= 2.0
+                 gstreamer-1.0 >= 1.0
                  gstreamer-video-1.0) 2>&5
 
-GIRL_PKG_DEPS="gtk+-3.0 libxml-2.0, gstreamer-1.0 gstreamer-video-1.0"
+GIRL_PKG_DEPS="gtk+-2.0, glib-2.0, libgnome-2.0, libgnomeui-2.0, libxml-2.0, gnome-vfs-2.0, gstreamer-1.0 
gstreamer-video-1.0"
 
 GTK_DOC_CHECK([1.16], [--flavour no-tmpl])
 
@@ -91,4 +93,5 @@ man/Makefile
 po/Makefile.in
 src/Makefile
 girl.spec
+mingw32-girl.spec
 ])
diff --git a/girl.spec.in b/girl.spec.in
index 10fe070..1999f1a 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -7,10 +7,11 @@ URL:            http://people.gnome.org/~ole/girl
 Group:          Applications/Internet
 Source:         http://people.gnome.org/~ole/%{name}/%{name}-%{version}.tar.xz
 
-BuildRequires:  gtk3-devel
-BuildRequires:  pango
-BuildRequires:  libchamplain-gtk
+BuildRequires:  gtk2-devel
+BuildRequires:  libgnome-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gnome-vfs2-devel
+BuildRequires:  libgnomeui-devel
 BuildRequires:  intltool
 BuildRequires:  itstool
 BuildRequires:  libappstream-glib
@@ -34,7 +35,7 @@ Enjoy Internet Radio.
 %setup -q
 
 %build
-%configure --disable-silent-rules
+%configure --with-recording --disable-silent-rules
 
 %install
 %make_install
@@ -70,9 +71,15 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+* Thu Mar 16 2017 Ole Aamot - 9.9.1-1.fc25
+- Girl 9.9.1 build on Fedora Linux 25
+
 * Wed Mar 15 2017 Ole Aamot - 9.9.0-1.fc25
 - GIRL 9.9.0 build on Fedora Linux 25
 
+* Wed Feb 15 2017 Ole Aamot - 9.8.1-1.fc25
+- Girl 9.8.1 build on Fedora Linux 25
+
 * Sun Feb 05 2017 Ole Aamot - 9.8.0-1.fc25
 - Girl 9.8.0 build on Fedora Linux 25
 
diff --git a/help/sv/sv.po b/help/sv/sv.po
index b749b36..2394fef 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -1,22 +1,21 @@
 # Swedish translation for girl.
-# Copyright © 2015-2017 girl's COPYRIGHT HOLDER
+# Copyright © 2015 girl's COPYRIGHT HOLDER
 # This file is distributed under the same license as the girl package.
 # Josef Andersson <josef andersson gmail com>, 2015.
-# Anders Jonsson <anders jonsson norsjovallen se>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: girl master\n"
-"POT-Creation-Date: 2017-02-26 15:30+0000\n"
-"PO-Revision-Date: 2017-03-04 22:38+0100\n"
-"Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
+"POT-Creation-Date: 2016-05-02 06:32+0000\n"
+"PO-Revision-Date: 2016-05-02 16:52+0200\n"
+"Last-Translator: Josef Andersson <josef andersson fripost org>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -25,21 +24,21 @@ msgstr "Josef Andersson <josef andersson fripost org>, 2015"
 
 #. (itstool) path: credit/name
 #: C/aboutprogram.page:9 C/aboutstation.page:9 C/exit.page:9 C/index.page:14
-#: C/intro.page:9 C/listen.page:9 C/new.page:7 C/next.page:9 C/prev.page:7
-#: C/record.page:9 C/search.page:9 C/stations.page:9
+#: C/intro.page:9 C/listen.page:9 C/next.page:9 C/prev.page:7 C/record.page:9
+#: C/search.page:9 C/stations.page:9
 msgid "Ole Aamot"
 msgstr "Ole Aamot"
 
 #. (itstool) path: info/desc
 #: C/aboutprogram.page:14 C/aboutstation.page:14 C/exit.page:14 C/intro.page:14
-#: C/listen.page:14 C/new.page:11 C/next.page:14 C/prev.page:11
-#: C/record.page:14 C/search.page:14 C/stations.page:14
+#: C/listen.page:14 C/next.page:14 C/prev.page:11 C/record.page:14
+#: C/search.page:14 C/stations.page:14
 msgid "Search for Internet radio stations by location."
 msgstr "Sök efter radiostationer på internet efter plats."
 
 #. (itstool) path: page/title
 #. (itstool) path: section/title
-#: C/aboutprogram.page:17 C/index.page:69
+#: C/aboutprogram.page:17 C/index.page:64
 msgid "About Program"
 msgstr "Om programmet"
 
@@ -56,7 +55,7 @@ msgstr ""
 
 #. (itstool) path: page/title
 #. (itstool) path: section/title
-#: C/aboutstation.page:17 C/index.page:64
+#: C/aboutstation.page:17 C/index.page:59
 msgid "About Station"
 msgstr "Om station"
 
@@ -79,17 +78,7 @@ msgstr ""
 "En sammanfattning för visas för varje radiostation, och hämtas från "
 "webbplatsen för radiostationen."
 
-#. (itstool) path: page/title
-#: C/exit.page:17
-msgid "Exit"
-msgstr "Avsluta"
-
-#. (itstool) path: page/p
-#: C/exit.page:19
-msgid "It is possible to exit the <app>GIRL</app> with the \"Exit\" button."
-msgstr "Det är möjligt att avsluta <app>GIRL</app> med knappen ”Avsluta”."
-
-#. (itstool) path: title/media
+#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
@@ -102,6 +91,16 @@ msgstr ""
 "external ref='media/girl-exit.png' md5='f972c3c2c1041b055241addfec4582c0'"
 
 #. (itstool) path: page/title
+#: C/exit.page:17
+msgid "Exit"
+msgstr "Avsluta"
+
+#. (itstool) path: page/p
+#: C/exit.page:19
+msgid "It is possible to exit the <app>GIRL</app> with the \"Exit\" button."
+msgstr "Det är möjligt att avsluta <app>GIRL</app> med knappen ”Avsluta”."
+
+#. (itstool) path: page/title
 #: C/exit.page:21
 msgid ""
 "<media type=\"image\" mime=\"image/png\" src=\"media/girl-exit.png\"/> GNOME "
@@ -113,11 +112,11 @@ msgstr ""
 #. (itstool) path: page/p
 #: C/exit.page:26
 msgid ""
-"However, in order to stop streaming the radio station, you must click on "
-"\"Stop\" first."
+"However, in order to stop streaming the radio station, you must exit the "
+"<app>Videos</app> app."
 msgstr ""
-"Men, för att avsluta strömning av radiostationen måste du klicka på ”Stopp” "
-"först."
+"Men, för att avsluta strömning av radiostationen måste du avsluta programmet "
+"<app>Videor</app>."
 
 #. (itstool) path: info/desc
 #: C/index.page:8
@@ -138,8 +137,8 @@ msgstr "GNOME Internetradioletare"
 
 #. (itstool) path: credit/years
 #: C/index.page:16
-msgid "2016"
-msgstr "2016"
+msgid "2015"
+msgstr "2015"
 
 #. (itstool) path: info/desc
 #: C/index.page:21
@@ -169,34 +168,23 @@ msgstr ""
 "Internetradioletare</app>!"
 
 #. (itstool) path: section/title
-#. (itstool) path: page/title
-#: C/index.page:33 C/new.page:13
-msgid "New"
-msgstr "Ny"
-
-#. (itstool) path: section/p
-#: C/index.page:34
-msgid "<link xref=\"new\">New</link> radio station by location."
-msgstr "<link xref=\"new\">Ny</link> radiostation efter plats."
-
-#. (itstool) path: section/title
-#: C/index.page:38
+#: C/index.page:33
 msgid "Search"
 msgstr "Sök"
 
 #. (itstool) path: section/p
-#: C/index.page:39
+#: C/index.page:34
 msgid "<link xref=\"search\">Search</link> for radio stations by location."
 msgstr "<link xref=\"search\">Sök</link> radiostationer efter plats."
 
 #. (itstool) path: section/title
 #. (itstool) path: page/title
-#: C/index.page:43 C/listen.page:17
+#: C/index.page:38 C/listen.page:17
 msgid "Listen"
 msgstr "Lyssna"
 
 #. (itstool) path: section/p
-#: C/index.page:44
+#: C/index.page:39
 msgid ""
 "Learn how to <link xref=\"listen\">listen</link> to your default radio "
 "station."
@@ -205,46 +193,46 @@ msgstr ""
 
 #. (itstool) path: section/title
 #. (itstool) path: page/title
-#: C/index.page:48 C/record.page:17
+#: C/index.page:43 C/record.page:17
 msgid "Record"
 msgstr "Spela in"
 
 #. (itstool) path: section/p
-#: C/index.page:49
+#: C/index.page:44
 msgid "Learn how to <link xref=\"record\">record</link> from radio stations."
 msgstr "Lär dig att <link xref=\"record\">spela in</link> från radiostationer."
 
 #. (itstool) path: section/title
 #. (itstool) path: page/title
-#: C/index.page:54 C/prev.page:13
+#: C/index.page:49 C/prev.page:13
 msgid "Prev"
 msgstr "Föregående"
 
 #. (itstool) path: section/p
-#: C/index.page:55
+#: C/index.page:50
 msgid "Navigate to the <link xref=\"prev\">previous</link> radio station."
 msgstr "Gå till <link xref=\"prev\">föregående</link> radiostation."
 
 #. (itstool) path: section/title
 #. (itstool) path: page/title
-#: C/index.page:59 C/next.page:17
+#: C/index.page:54 C/next.page:17
 msgid "Next"
 msgstr "Nästa"
 
 #. (itstool) path: section/p
-#: C/index.page:60
+#: C/index.page:55
 msgid "Navigate to the <link xref=\"next\">next</link> radio station."
 msgstr "Gå till <link xref=\"next\">nästa</link> radiostation."
 
 #. (itstool) path: section/p
-#: C/index.page:65
+#: C/index.page:60
 msgid ""
 "Learn <link xref=\"aboutstation\">about the current radio station</link>."
 msgstr ""
 "Läs mer om <link xref=\"aboutstation\">den aktuella radiostationen</link>."
 
 #. (itstool) path: section/p
-#: C/index.page:70
+#: C/index.page:65
 msgid ""
 "Learn <link xref=\"aboutprogram\">about the GNOME Internet Radio Locator</"
 "link> and its contributors."
@@ -252,6 +240,18 @@ msgstr ""
 "Läs <link xref=\"aboutprogram\">om GNOME Internetradioletare</link> och dess "
 "bidragsgivare."
 
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/intro.page:25
+msgctxt "_"
+msgid ""
+"external ref='media/girl-main.png' md5='604ab52adcccb7c7c73bb04f1f11f24c'"
+msgstr ""
+"external ref='media/girl-main.png' md5='604ab52adcccb7c7c73bb04f1f11f24c'"
+
 #. (itstool) path: page/title
 #: C/intro.page:17
 msgid "Intro"
@@ -266,21 +266,6 @@ msgstr ""
 "GNOME Internetradioletare (GIRL) är ett fritt program för att lyssna på "
 "oberoende, icke-kommersiella radiostationer som strömmar på Internet."
 
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/intro.page:25
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='media/girl-main.png' md5='604ab52adcccb7c7c73bb04f1f11f24c'"
-msgctxt "_"
-msgid ""
-"external ref='media/girl-main.png' md5='935b9e52a954f1991f9b241dcfaf687d'"
-msgstr ""
-"external ref='media/girl-main.png' md5='935b9e52a954f1991f9b241dcfaf687d'"
-
 #. (itstool) path: page/title
 #: C/intro.page:24
 msgid ""
@@ -308,17 +293,30 @@ msgstr ""
 "> eller skicka ett brev till Creative Commons, 444 Castro Street, Suite 900, "
 "Mountain View, California, 94041, USA."
 
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/listen.page:30
+msgctxt "_"
+msgid ""
+"external ref='media/girl-listen.png' md5='ad6fce1f9ff9ce95ccacd310d490a287'"
+msgstr ""
+"external ref='media/girl-listen.png' md5='ad6fce1f9ff9ce95ccacd310d490a287'"
+
 #. (itstool) path: page/p
 #: C/listen.page:19
 msgid ""
 "It is possible to listen to supported radio stations in <app>GIRL</app> if "
-"you have installed gstreamer with the necessary audio codecs."
+"you have installed the <app>Videos</app> application with the necessary "
+"audio codecs."
 msgstr ""
-"Det är möjligt att lyssna på radiostationer som stöds i <app>GIRL</app> om "
-"du har installerat gstreamer med nödvändiga ljudkodekar."
+"Det är möjligt att lyssna på stödda radiostationer i <app>GIRL</app> om du "
+"har installerat programmet <app>Videor</app> med nödvändiga ljudkodekar."
 
 #. (itstool) path: page/p
-#: C/listen.page:21
+#: C/listen.page:22
 msgid ""
 "If you have installed Ogg Vorbis audio codec on your computer, then you can "
 "listen to many of the included radio stations."
@@ -327,30 +325,19 @@ msgstr ""
 "många av de inkluderade radiostationerna."
 
 #. (itstool) path: page/p
-#: C/listen.page:24
+#: C/listen.page:25
 msgid ""
 "If you select the radio station from \"Stations\" and click on \"Listen\" in "
 "the <app>GIRL</app> program after you listened to a radio station "
-"previously, the default radio station will stream audio with gstreamer."
+"previously, the default radio station will stream in the <app>Videos</app> "
+"application."
 msgstr ""
 "Om du väljer radiostationen från ”Stationer” och klickar på ”Lyssna” i "
 "<app>GIRL</app> efter att du tidigare har lyssnat på en radiostation kommer "
-"standardradiostationen att strömma ljud med gstreamer."
-
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/listen.page:28
-msgctxt "_"
-msgid ""
-"external ref='media/girl-listen.png' md5='ad6fce1f9ff9ce95ccacd310d490a287'"
-msgstr ""
-"external ref='media/girl-listen.png' md5='ad6fce1f9ff9ce95ccacd310d490a287'"
+"standardradiostationen att strömma i programmet <app>Videor</app>."
 
 #. (itstool) path: page/title
-#: C/listen.page:27
+#: C/listen.page:29
 msgid ""
 "<media type=\"image\" mime=\"image/png\" src=\"media/girl-listen.png\"/> "
 "Listen to radio station"
@@ -358,44 +345,19 @@ msgstr ""
 "<media type=\"image\" mime=\"image/png\" src=\"media/girl-listen.png\"/> "
 "Lyssna på radiostation"
 
-#. (itstool) path: page/p
-#: C/new.page:14
-msgid ""
-"It is possible to add new Internet radio stations in <app>GIRL</app> with "
-"the \"New\" button."
-msgstr ""
-"Det är möjligt att lägga till nya internetradiostationer i <app>GIRL</app> "
-"med knappen ”Ny”."
-
-#. (itstool) path: title/media
+#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/new.page:17
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='media/girl-prev-station.png' "
-#| "md5='b84ef579d50632f350d2b73fd0db6d61'"
+#: C/next.page:29
 msgctxt "_"
 msgid ""
-"external ref='media/girl-newstation.png' "
-"md5='c00156ebc179c6d70f0f2aa70d6a63be'"
-msgstr ""
-"external ref='media/girl-newstation.png' "
-"md5='c00156ebc179c6d70f0f2aa70d6a63be'"
-
-#. (itstool) path: page/title
-#: C/new.page:16
-#| msgid ""
-#| "<media type=\"image\" mime=\"image/png\" src=\"media/girl-next-station.png"
-#| "\"/> Next station"
-msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"media/girl-newstation.png\"/> "
-"New Internet radio station"
+"external ref='media/girl-next-station.png' "
+"md5='1ac694b5ad1ece05233424651bd7854e'"
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"media/girl-newstation.png\"/> "
-"Ny internetradiostation"
+"external ref='media/girl-next-station.png' "
+"md5='1ac694b5ad1ece05233424651bd7854e'"
 
 #. (itstool) path: page/p
 #: C/next.page:19
@@ -425,20 +387,6 @@ msgstr ""
 "Du kan också navigera mellan radiostationer genom att klicka på ”Stationer” "
 "eller genom att söka en radiostation efter plats genom att klicka på ”Sök”."
 
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/next.page:29
-msgctxt "_"
-msgid ""
-"external ref='media/girl-next-station.png' "
-"md5='1ac694b5ad1ece05233424651bd7854e'"
-msgstr ""
-"external ref='media/girl-next-station.png' "
-"md5='1ac694b5ad1ece05233424651bd7854e'"
-
 #. (itstool) path: page/title
 #: C/next.page:28
 msgid ""
@@ -448,21 +396,12 @@ msgstr ""
 "<media type=\"image\" mime=\"image/png\" src=\"media/girl-next-station.png\"/"
 "> Nästa station"
 
-#. (itstool) path: page/p
-#: C/prev.page:14
-msgid ""
-"It is possible to listen to the previous of supported radio stations in "
-"<app>GIRL</app> with the \"Prev\" button."
-msgstr ""
-"Det är möjligt att lyssna på föregående radiostationer i <app>GIRL</app> med "
-"knappen ”Föregående”."
-
-#. (itstool) path: title/media
+#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/prev.page:24
+#: C/prev.page:31
 msgctxt "_"
 msgid ""
 "external ref='media/girl-prev-station.png' "
@@ -471,49 +410,56 @@ msgstr ""
 "external ref='media/girl-prev-station.png' "
 "md5='b84ef579d50632f350d2b73fd0db6d61'"
 
-#. (itstool) path: page/title
+#. (itstool) path: page/p
+#: C/prev.page:14
+msgid ""
+"It is possible to listen to the previous of supported radio stations in "
+"<app>GIRL</app> with the \"Prev\" button."
+msgstr ""
+"Det är möjligt att lyssna på föregående radiostationer i <app>GIRL</app> med "
+"knappen ”Föregående”."
+
+#. (itstool) path: page/p
 #: C/prev.page:23
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"media/girl-prev-station.png\"/"
-"> Previous radio station"
+"It is possible to record from supported radio stations in <app>GIRL</app> if "
+"you have installed the <app>streamripper</app> application."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"media/girl-prev-station.png\"/"
-"> Föregående radiostation"
+"Det är möjligt att spela in från radiostationer i <app>GIRL</app> om du har "
+"installerat programmet <app>streamripper</app>."
 
 #. (itstool) path: page/p
-#: C/record.page:19
+#: C/prev.page:25 C/record.page:22
 msgid ""
-"A planned feature in <app>GIRL</app> is to make it possible to record audio "
-"files from supported radio stations in <app>GIRL</app> if you have installed "
-"the gstreamer library."
+"If you have installed streamripper on your computer, then you can record "
+"audio broadcasted from any of the supported radio stations."
 msgstr ""
-"En planerad funktion i <app>GIRL</app> är att göra det möjligt att spela in "
-"ljudfiler från radiostationer som stöds i <app>GIRL</app> om du har "
-"installerat gstreamer-biblioteket."
+"Om du har installerat streamripper på din dator kan du spela in ljud utsänt "
+"från radiostationerna."
 
 #. (itstool) path: page/p
-#: C/record.page:23
+#: C/prev.page:27 C/record.page:25
 msgid ""
 "If you select the radio station from \"Stations\" and click on \"Listen\" in "
 "the <app>GIRL</app> program after you listened to a radio station "
-"previously, and then click on \"Record\", the radio station would be "
-"recorded and the recorded audio file would be stored in your home directory."
+"previously, and then click on \"Record\", the radio station will be recorded "
+"and the recorded audio file will be stored in your home directory."
 msgstr ""
 "Om du väljer radiostationen från ”Stationer” och klickar på ”Lyssna” i "
 "<app>GIRL</app> efter att du har lyssnat på en radiostation tidigare och "
 "sedan klickar på ”Spela in” kommer radiostationen att spelas in och den "
 "inspelade ljudfilen kommer att lagras i din hemmapp."
 
-#. (itstool) path: page/p
-#: C/record.page:27
+#. (itstool) path: page/title
+#: C/prev.page:30
 msgid ""
-"Please get in touch and check out src/girl-record.c for the code if you want "
-"to implement recording with gstreamer."
+"<media type=\"image\" mime=\"image/png\" src=\"media/girl-prev-station.png\"/"
+"> Previous radio station"
 msgstr ""
-"Kontakta oss os ta en titt på src/girl-record.c för koden om du vill "
-"implementera inspelning med gstreamer."
+"<media type=\"image\" mime=\"image/png\" src=\"media/girl-prev-station.png\"/"
+"> Föregående radiostation"
 
-#. (itstool) path: title/media
+#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
@@ -525,6 +471,30 @@ msgid ""
 msgstr ""
 "external ref='media/girl-record.png' md5='1a18a45034f89f60e3870da834b7ffac'"
 
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/record.page:37
+msgctxt "_"
+msgid ""
+"external ref='media/girl-stop.png' md5='7353f5fee63913ec3ca67af509ac8133'"
+msgstr ""
+"external ref='media/girl-stop.png' md5='7353f5fee63913ec3ca67af509ac8133'"
+
+#. (itstool) path: page/p
+#: C/record.page:19
+msgid ""
+"It is possible to record from supported radio stations in <app>GIRL</app> if "
+"you have installed the <app>streamripper</app> application. You can download "
+"streamripper from <link href=\"http://streamripper.sf.net/\";>streamripper.sf."
+"net</link>."
+msgstr ""
+"Det är möjligt att spela in från radiostationer i <app>GIRL</app> om du har "
+"installerat programmet <app>streamripper</app>. Du kan hämta streamripper "
+"från <link href=\"http://streamripper.sf.net/\";>streamripper.sf.net</link>."
+
 #. (itstool) path: page/title
 #: C/record.page:29
 msgid ""
@@ -537,30 +507,32 @@ msgstr ""
 #. (itstool) path: page/p
 #: C/record.page:34
 msgid ""
-"If you want to stop the recording process of the radio station, click on "
-"\"Stop\"."
+"If you want to stop the streamripper recording process of the radio station, "
+"click on \"Stop\"."
 msgstr ""
-"Om du vill stoppa inspelningsprocessen för radiostationen, klicka på "
-"”Stoppa”."
+"Om du vill stoppa streamripper-inspelningsprocessen för radiostationen, "
+"klicka på ”Stoppa”."
 
-#. (itstool) path: title/media
+#. (itstool) path: page/title
+#: C/record.page:36
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"media/girl-stop.png\"/> Stop"
+msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"media/girl-stop.png\"/> Stopp"
+
+#. (itstool) path: media
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/record.page:37
+#: C/search.page:24
 msgctxt "_"
 msgid ""
-"external ref='media/girl-stop.png' md5='7353f5fee63913ec3ca67af509ac8133'"
-msgstr ""
-"external ref='media/girl-stop.png' md5='7353f5fee63913ec3ca67af509ac8133'"
-
-#. (itstool) path: page/title
-#: C/record.page:36
-msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"media/girl-stop.png\"/> Stop"
+"external ref='media/girl-search-station-by-location.png' "
+"md5='664cfe950a74f893cfcb37afcf52a6f7'"
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"media/girl-stop.png\"/> Stopp"
+"external ref='media/girl-search-station-by-location.png' "
+"md5='664cfe950a74f893cfcb37afcf52a6f7'"
 
 #. (itstool) path: page/title
 #: C/search.page:17
@@ -585,20 +557,6 @@ msgstr ""
 "Ange ett stadsnamn för radiostationen i frågefältet och tryck <key>RETUR</"
 "key>."
 
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/search.page:24
-msgctxt "_"
-msgid ""
-"external ref='media/girl-search-station-by-location.png' "
-"md5='664cfe950a74f893cfcb37afcf52a6f7'"
-msgstr ""
-"external ref='media/girl-search-station-by-location.png' "
-"md5='664cfe950a74f893cfcb37afcf52a6f7'"
-
 #. (itstool) path: page/title
 #: C/search.page:23
 msgid ""
@@ -608,6 +566,20 @@ msgstr ""
 "<media type=\"image\" mime=\"image/png\" src=\"media/girl-search-station-by-"
 "location.png\"/> Sök radiostationer efter plats"
 
+#. (itstool) path: media
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/stations.page:22
+msgctxt "_"
+msgid ""
+"external ref='media/girl-select-station.png' "
+"md5='3452d9e56efe77b70a8fbc58de0422ac'"
+msgstr ""
+"external ref='media/girl-select-station.png' "
+"md5='3452d9e56efe77b70a8fbc58de0422ac'"
+
 #. (itstool) path: page/title
 #: C/stations.page:17
 msgid "Stations"
@@ -622,20 +594,6 @@ msgstr ""
 "Det är möjligt att välja en ström för en radiostation som stöds från en "
 "lista i programmet <app>GIRL</app>."
 
-#. (itstool) path: title/media
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/stations.page:22
-msgctxt "_"
-msgid ""
-"external ref='media/girl-select-station.png' "
-"md5='3452d9e56efe77b70a8fbc58de0422ac'"
-msgstr ""
-"external ref='media/girl-select-station.png' "
-"md5='3452d9e56efe77b70a8fbc58de0422ac'"
-
 #. (itstool) path: page/title
 #: C/stations.page:21
 msgid ""
@@ -644,24 +602,3 @@ msgid ""
 msgstr ""
 "<media type=\"image\" mime=\"image/png\" src=\"media/girl-select-station.png"
 "\"/> GNOME Internetradioletare"
-
-#~ msgid "2015"
-#~ msgstr "2015"
-
-#~ msgid ""
-#~ "If you have installed streamripper on your computer, then you can record "
-#~ "audio broadcasted from any of the supported radio stations."
-#~ msgstr ""
-#~ "Om du har installerat streamripper på din dator kan du spela in ljud "
-#~ "utsänt från radiostationerna."
-
-#~ msgid ""
-#~ "It is possible to record from supported radio stations in <app>GIRL</app> "
-#~ "if you have installed the <app>streamripper</app> application. You can "
-#~ "download streamripper from <link href=\"http://streamripper.sf.net/";
-#~ "\">streamripper.sf.net</link>."
-#~ msgstr ""
-#~ "Det är möjligt att spela in från radiostationer i <app>GIRL</app> om du "
-#~ "har installerat programmet <app>streamripper</app>. Du kan hämta "
-#~ "streamripper från <link href=\"http://streamripper.sf.net/\";>streamripper."
-#~ "sf.net</link>."
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5ac4ec..c0b01fd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,21 +4,7 @@
 data/girl.appdata.xml.in
 data/girl.desktop.in
 data/girl.desktop.in.in
-src/GIRL.c
-src/GIRL-GUI.c
-src/GIRL-GUI.h
-src/GIRL.h
-src/GIRL-LISTENER.c
-src/GIRL-LISTENER.h
-src/GIRL-PROGRAM.c
-src/GIRL-PROGRAM.h
-src/GIRL-RUNNERS.c
-src/GIRL-RUNNERS.h
-src/GIRL-STATION.c
-src/GIRL-STATION.h
-src/GIRL-STATIONS-MAP.c
-src/GIRL-STATIONS-MAP.h
-src/GIRL-STREAMS.c
-src/GIRL-STREAMS.h
-src/GIRL-TZ.c
-src/GIRL-TZ.h
+src/girl-gui.c
+src/girl-listener.c
+src/girl-station.c
+src/girl.c
diff --git a/po/hu.po b/po/hu.po
index 9b4e671..b866f7a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,46 +2,42 @@
 # Copyright (C) 2014-2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the girl package.
 #
-# Balázs Úr <urbalazs gmail com>, 2014, 2015, 2016, 2017.
+# Balázs Úr <urbalazs gmail com>, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: girl master\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=girl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-26 15:30+0000\n"
-"PO-Revision-Date: 2017-03-15 18:45+0100\n"
-"Last-Translator: Balázs Úr <urbalazs gmail com>\n"
+"POT-Creation-Date: 2016-10-02 13:53+0000\n"
+"PO-Revision-Date: 2016-10-02 19:36+0200\n"
+"Last-Translator: Meskó Balázs <meskobalazs gmail com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Poedit 1.8.8\n"
 
 #: ../data/girl.appdata.xml.in.h:1
-#| msgid ""
-#| "GIRL, the GNOME Internet Radio Locator program, allows users to easily "
-#| "find and record live radio programs on radio broadcasters on the Internet."
 msgid ""
-"GNOME Internet Radio Locator (GIRL) allows users to easily find and listen "
-"to live radio programs on radio broadcasters on the Internet."
+"GIRL, the GNOME Internet Radio Locator program, allows users to easily find "
+"and record live radio programs on radio broadcasters on the Internet."
 msgstr ""
-"A GNOME Internetes rádió felderítő (GIRL) lehetővé teszi a felhasználóknak "
+"A GIRL, a GNOME Internetes rádió felderítő lehetővé teszi a felhasználóknak "
 "az Interneten lévő rádió műsorszórók élő rádióprogramjainak könnyű "
-"megtalálását és meghallgatását."
+"megtalálását és rögzítését."
 
 #: ../data/girl.appdata.xml.in.h:2
-#| msgid ""
-#| "GIRL is developed for the GNOME desktop and requires one audio helper "
-#| "such as Totem to be installed for playback and streamripper to be "
-#| "installed for recording live radio streams of supported radio stations."
 msgid ""
-"GIRL is developed for the GNOME desktop and requires gstreamer 1.0 to be "
-"installed for playback of supported radio stations."
+"GIRL is developed for the GNOME desktop and requires one audio helper such "
+"as Totem to be installed for playback and streamripper to be installed for "
+"recording live radio streams of supported radio stations."
 msgstr ""
-"A GIRL programot a GNOME asztalhoz fejlesztették, és a támogatott "
-"rádióállomások lejátszáshoz a gstreamer 1.0 telepítésének meglétét igényli."
+"A GIRL programot a GNOME asztalhoz fejlesztették, és a lejátszáshoz egy "
+"telepített hangsegítőt igényel, mint például a Totem, illetve a támogatott "
+"rádióállomások élő hangfolyamának rögzítéséhez egy hangfolyam feldolgozó "
+"telepítése szükséges."
 
 #: ../data/girl.appdata.xml.in.h:3
 msgid ""
@@ -55,7 +51,7 @@ msgstr ""
 msgid "Internet Radio Locator"
 msgstr "Internetes rádió felderítő"
 
-#: ../data/girl.desktop.in.in.h:2 ../src/girl.c:705
+#: ../data/girl.desktop.in.in.h:2 ../src/girl.c:694
 msgid "Locate Internet Radio Stations"
 msgstr "Internetes rádióállomások felderítése"
 
@@ -64,126 +60,126 @@ msgstr "Internetes rádióállomások felderítése"
 msgid "Live;Radio;Program;Station;Locator;"
 msgstr "Élő;Rádió;Program;Állomás;Felderítő;"
 
-#: ../src/girl-gui.c:58
+#: ../src/girl-gui.c:56
 msgid "New"
 msgstr "Új"
 
-#: ../src/girl-gui.c:58
+#: ../src/girl-gui.c:56
 msgid "Add a new radio station"
 msgstr "Új rádióállomás hozzáadása"
 
-#: ../src/girl-gui.c:61
+#: ../src/girl-gui.c:59
 msgid "Search"
 msgstr "Keresés"
 
-#: ../src/girl-gui.c:61
+#: ../src/girl-gui.c:59
 msgid "Search by location for radio stations"
 msgstr "Rádióállomások keresése hely szerint"
 
-#: ../src/girl-gui.c:65
+#: ../src/girl-gui.c:63
 msgid "Listen"
 msgstr "Hallgatás"
 
-#: ../src/girl-gui.c:65
+#: ../src/girl-gui.c:63
 msgid "Listen to selected radio station"
 msgstr "A kiválasztott rádióállomás hallgatása"
 
-#: ../src/girl-gui.c:69
+#: ../src/girl-gui.c:67
 msgid "Record"
 msgstr "Rögzítés"
 
-#: ../src/girl-gui.c:69
+#: ../src/girl-gui.c:67
 msgid "Record selected radio station"
 msgstr "A kiválasztott rádióállomás rögzítése"
 
-#: ../src/girl-gui.c:73
+#: ../src/girl-gui.c:70
 msgid "Stop"
 msgstr "Leállítás"
 
-#: ../src/girl-gui.c:73
+#: ../src/girl-gui.c:70
 msgid "Stop recording selected radio station"
 msgstr "A kiválasztott rádióállomás rögzítésének leállítása"
 
-#: ../src/girl-gui.c:77
+#: ../src/girl-gui.c:75
 msgid "Previous"
 msgstr "Előző"
 
-#: ../src/girl-gui.c:78
+#: ../src/girl-gui.c:76
 msgid "Go back to the previous radio station"
 msgstr "Ugrás vissza az előző rádióállomáshoz"
 
-#: ../src/girl-gui.c:80
+#: ../src/girl-gui.c:78
 msgid "Stations"
 msgstr "Állomások"
 
-#: ../src/girl-gui.c:80
+#: ../src/girl-gui.c:78
 msgid "Internet Radio Stations"
 msgstr "Internetes rádióállomások"
 
-#: ../src/girl-gui.c:83
+#: ../src/girl-gui.c:81
 msgid "Next"
 msgstr "Következő"
 
-#: ../src/girl-gui.c:83
+#: ../src/girl-gui.c:81
 msgid "Proceed to the next radio station"
 msgstr "Folytatás a következő rádióállomással"
 
-#: ../src/girl-gui.c:86
+#: ../src/girl-gui.c:84
 msgid "Station"
 msgstr "Állomás"
 
-#: ../src/girl-gui.c:87
+#: ../src/girl-gui.c:85
 msgid "About the current Station"
 msgstr "A jelenlegi állomás névjegye"
 
-#: ../src/girl-gui.c:90
+#: ../src/girl-gui.c:88
 msgid "Program"
 msgstr "Program"
 
-#: ../src/girl-gui.c:91
+#: ../src/girl-gui.c:89
 msgid "About the GNOME Internet Radio Locator"
 msgstr "A GNOME Internetes rádió felderítő névjegye"
 
-#: ../src/girl-gui.c:95
+#: ../src/girl-gui.c:93
 msgid "Exit"
 msgstr "Kilépés"
 
-#: ../src/girl-gui.c:96
+#: ../src/girl-gui.c:94
 msgid "Quit the GNOME Internet Radio Locator"
 msgstr "Kilépés a GNOME Internetes rádió felderítőből"
 
-#: ../src/girl-gui.c:205
+#: ../src/girl-gui.c:203
 #, c-format
 msgid "Playing %s"
 msgstr "%s lejátszása"
 
 #. The Listeners dialog
-#: ../src/girl-gui.c:231
+#: ../src/girl-gui.c:229
 msgid "Select a listener"
 msgstr "Hallgató kiválasztása"
 
-#: ../src/girl-gui.c:258
+#: ../src/girl-gui.c:256
 #, c-format
 msgid "Failed to open %s.  Please install it.\n"
 msgstr "Nem sikerült megnyitni: %s. Kérjük, telepítse.\n"
 
-#: ../src/girl-gui.c:268 ../src/girl-gui.c:776 ../src/girl-gui.c:1117
+#: ../src/girl-gui.c:266 ../src/girl-gui.c:768 ../src/girl-gui.c:1109
 #, c-format
 msgid "Failed to open %s\n"
 msgstr "Nem sikerült megnyitni: %s\n"
 
 #. The Programs dialog
-#: ../src/girl-gui.c:369
+#: ../src/girl-gui.c:367
 msgid "Select a program"
 msgstr "Program kiválasztása"
 
-#: ../src/girl-gui.c:400 ../src/girl-gui.c:410 ../src/girl-gui.c:593
-#: ../src/girl-gui.c:762 ../src/girl-gui.c:960 ../src/girl-gui.c:1102
+#: ../src/girl-gui.c:398 ../src/girl-gui.c:408 ../src/girl-gui.c:585
+#: ../src/girl-gui.c:754 ../src/girl-gui.c:952 ../src/girl-gui.c:1094
 #, c-format
 msgid "Failed to open %s.\n"
 msgstr "Nem sikerült megnyitni: %s.\n"
 
-#: ../src/girl-gui.c:514
+#: ../src/girl-gui.c:512
 #, c-format
 msgid "Your search by location resulted in the radio station %s in %s: %s"
 msgstr ""
@@ -191,48 +187,48 @@ msgstr ""
 "itt: %s: %s"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:551
+#: ../src/girl-gui.c:543
 msgid "Search by location"
 msgstr "Keresés hely szerint"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:731
+#: ../src/girl-gui.c:723
 msgid "Select a station"
 msgstr "Állomás kiválasztása"
 
-#: ../src/girl-gui.c:872
+#: ../src/girl-gui.c:864
 #, c-format
 msgid "Found location %s"
 msgstr "%s hely megtalálva"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:907
+#: ../src/girl-gui.c:899
 msgid "New radio station"
 msgstr "Új rádióállomás"
 
 #. The Streams dialog
-#: ../src/girl-gui.c:1073
+#: ../src/girl-gui.c:1065
 msgid "Select a stream"
 msgstr "Hangfolyam kiválasztása"
 
-#: ../src/girl-gui.c:1204
+#: ../src/girl-gui.c:1196
 #, c-format
 msgid "Selection cleared!\n"
 msgstr "Kijelölés törölve!\n"
 
-#: ../src/girl-gui.c:1240
+#: ../src/girl-gui.c:1232
 msgid "GIRL"
 msgstr "GIRL"
 
-#: ../src/girl-gui.c:1242
+#: ../src/girl-gui.c:1234
 msgid "GNOME Internet Radio Locator"
 msgstr "GNOME Internetes rádió felderítő"
 
-#: ../src/girl-gui.c:1254
+#: ../src/girl-gui.c:1246
 msgid "Couldn't create pixmap"
 msgstr "Nem sikerült létrehozni a képet"
 
-#: ../src/girl-gui.c:1271
+#: ../src/girl-gui.c:1263
 msgid ""
 "Search by location from \"Search\" or select a radio station from \"Stations"
 "\".  Click \"Listen\" to listen to, or \"Record\" to record from the station."
@@ -241,7 +237,7 @@ msgstr ""
 "„Állomásokból”. Kattintson a „Hallgatásra” a hallgatáshoz, vagy a "
 "„Rögzítésre” az állomás rögzítéséhez."
 
-#: ../src/girl-gui.c:1273
+#: ../src/girl-gui.c:1265
 msgid ""
 "Select a radio station from \"Stations\" and click \"Listen\" to listen to "
 "the station."
@@ -250,12 +246,12 @@ msgstr ""
 "a rádióállomás hallgatásához."
 
 #. printf("Archiving program at %s\n", archive);
-#: ../src/girl-station.c:239
+#: ../src/girl-station.c:237
 #, c-format
 msgid "Recording from %s in %s to %s"
 msgstr "Rögzítés a rádióállomásból: %s itt: %s – %s"
 
-#: ../src/girl-station.c:257
+#: ../src/girl-station.c:255
 #, c-format
 msgid ""
 "An error happened trying to play %s\n"
@@ -264,7 +260,7 @@ msgstr ""
 "Hiba történt a(z) %s lejátszási kísérlete közben.\n"
 "Vagy nem létezik a fájl, vagy nincs lejátszója hozzá."
 
-#: ../src/girl-station.c:263
+#: ../src/girl-station.c:261
 #, c-format
 msgid ""
 "An error happened trying to record %s\n"
@@ -273,13 +269,13 @@ msgstr ""
 "Hiba történt a(z) %s rögzítési kísérlete közben.\n"
 "Vagy nem létezik a fájl, vagy nincs felvevője hozzá."
 
-#: ../src/girl-station.c:294 ../src/girl-station.c:314
-#: ../src/girl-station.c:431 ../src/girl-station.c:454
+#: ../src/girl-station.c:292 ../src/girl-station.c:312
+#: ../src/girl-station.c:429 ../src/girl-station.c:452
 #, c-format
 msgid "Failed to run %s (%i)\n"
 msgstr "Nem sikerült lefuttatni: %s (%i)\n"
 
-#: ../src/girl-station.c:341 ../src/girl-station.c:478
+#: ../src/girl-station.c:339 ../src/girl-station.c:476
 #, c-format
 msgid ""
 "Failed to open URL: '%s'\n"
@@ -290,7 +286,7 @@ msgstr ""
 "Állapotkód: %i\n"
 "Részletek: %s"
 
-#: ../src/girl-station.c:359 ../src/girl-station.c:373
+#: ../src/girl-station.c:359 ../src/girl-station.c:372
 #, c-format
 msgid ""
 "Failed to open URL: '%s'\n"
@@ -299,6 +295,15 @@ msgstr ""
 "Az URL megnyitása nem sikerült: „%s”\n"
 "Részletek: %s"
 
+#: ../src/girl-station.c:398
+#, c-format
+msgid ""
+"Failed to run '%s'\n"
+"Details: %s"
+msgstr ""
+"A(z) „%s” futtatása nem sikerült\n"
+"Részletek: %s"
+
 #: ../src/girl.c:76
 msgid "GNOME VFS initialization failed!\n"
 msgstr "A GNOME VFS előkészítése nem sikerült!\n"
@@ -330,7 +335,7 @@ msgstr[1] "és %i adatfolyam található"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/girl.c:211
+#: ../src/girl.c:212
 #, c-format
 msgid "Selected the previous radio station: %s in %s: %s"
 msgstr "Az előző rádióállomás kiválasztva: %s itt: %s: %s"
@@ -340,17 +345,17 @@ msgstr "Az előző rádióállomás kiválasztva: %s itt: %s: %s"
 msgid "Selected the next radio station %s in %s: %s"
 msgstr "A következő rádióállomás kiválasztva: %s itt: %s: %s"
 
-#: ../src/girl.c:377
+#: ../src/girl.c:378
 #, c-format
 msgid "Selected %s in %s: %s (%f)"
 msgstr "%s kiválasztva itt: %s: %s (%f)"
 
-#: ../src/girl.c:425
+#: ../src/girl.c:426
 #, c-format
 msgid "Selected %s in %s: %s"
 msgstr "%s kiválasztva itt: %s: %s"
 
-#: ../src/girl.c:474 ../src/girl.c:522
+#: ../src/girl.c:475 ../src/girl.c:522
 #, c-format
 msgid "Selected the radio station %s in %s: %s"
 msgstr "A rádióállomás kiválasztva: %s itt: %s: %s"
@@ -360,7 +365,7 @@ msgstr "A rádióállomás kiválasztva: %s itt: %s: %s"
 msgid "Selected %s [%s] [%s] [%s]"
 msgstr "Kiválasztva: %s [%s] [%s] [%s]"
 
-#: ../src/girl.c:673
+#: ../src/girl.c:662
 msgid ""
 "Marek Černocký <marek manet cz> (Czech translation)\n"
 "Rafael Fontenelle <rafaelff gnome org> (Brazilian Portuguese translation)\n"
@@ -420,28 +425,23 @@ msgstr ""
 "Paul Feuvraux and Claude Paroz <claude 2xlibre net> (francia fordítás)\n"
 "Anders Jonsson <anders jonsson norsjovallen se> (svéd fordítás)\n"
 
-#: ../src/girl.c:706
-#| msgid "Copyright (C) 2014, 2015, 2016  Ole Aamot Software"
-msgid "Copyright (C) 2014-2017  Ole Aamot Software"
-msgstr "Copyright © Ole Aamot Software, 2014-2017."
+#: ../src/girl.c:695
+msgid "Copyright (C) 2014, 2015, 2016  Ole Aamot Software"
+msgstr "Copyright © Ole Aamot Software, 2014, 2015, 2016."
 
-#: ../src/girl.c:707
+#: ../src/girl.c:696
 msgid "Mario Blättermann <mario blaettermann gmail com> (German translation)"
 msgstr "Mario Blättermann <mario blaettermann gmail com> (német fordítás)"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:696
 msgid "Marek Černocký <marek manet cz> (Czech translation)"
 msgstr "Marek Černocký <marek manet cz> (cseh fordítás)"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:696
 msgid "Daniel Mustieles <daniel mustieles gmail com> (Spanish translation)"
 msgstr "Daniel Mustieles <daniel mustieles gmail com> (Spanyol fordítás)"
 
-#: ../src/girl.c:707
-msgid "Josef Andersson <josef andersson fripost org> (Swedish translation)"
-msgstr "Josef Andersson <josef andersson fripost org> (svéd fordítás)"
-
-#: ../src/girl.c:716
+#: ../src/girl.c:705
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -466,34 +466,40 @@ msgstr ""
 "meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: ../src/girl.c:722
+#: ../src/girl.c:711
 #, c-format
 msgid "Unable to load GIRL logo: %s\n"
 msgstr "Nem sikerült betölteni a GIRL logót: %s\n"
 
-#: ../src/girl.c:880
+#: ../src/girl.c:869
 msgid "Search radio station by location"
 msgstr "Rádióállomások keresése hely szerint"
 
-#: ../src/girl.c:886
+#: ../src/girl.c:875
 #, c-format
 msgid "Listening to the radio station %s in %s: %s "
 msgstr "A rádióállomás hallgatása: %s itt: %s: %s  "
 
 #. g_spawn_close_pid( girl->record_pid);
-#: ../src/girl.c:945
+#: ../src/girl.c:936
 #, c-format
 msgid "Finished saving recording from the radio station %s in %s from %s to %s"
 msgstr "Rögzítés befejezve a rádióállomásból: %s itt: %s: %s – %s"
 
 #. g_spawn_close_pid( girl->player_pid);
-#: ../src/girl.c:963
+#: ../src/girl.c:952
 #, c-format
 msgid "Stopped playing the radio station %s in %s."
 msgstr "%s állomás lejátszása leállítva itt: %s."
 
-#: ../src/girl.c:1007
+#: ../src/girl.c:996
 #, c-format
 msgid "Archiving %s"
 msgstr "%s archiválása"
 
+#~ msgid ""
+#~ "Stopped playing the radio station %s in %s, exit the application GNOME "
+#~ "Videos."
+#~ msgstr ""
+#~ "A lejátszás befejezve a következő rádióállomásból: %s itt: %s, lépjen ki "
+#~ "a GNOME Videók alkalmazásból."
diff --git a/po/sr.po b/po/sr.po
index 0dba917..f92ca9d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,16 +1,16 @@
 # Serbian translation for girl.
 # Copyright (C) 2014 girl's COPYRIGHT HOLDER
 # This file is distributed under the same license as the girl package.
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2014—2017.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2014—2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: girl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=girl&ke";
 "ywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-01-29 15:23+0000\n"
-"PO-Revision-Date: 2017-02-12 17:57+0200\n"
+"POT-Creation-Date: 2016-08-31 19:26+0000\n"
+"PO-Revision-Date: 2016-09-01 17:13+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: српски <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,28 +20,23 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: ../data/girl.appdata.xml.in.h:1
-#| msgid ""
-#| "GIRL, the GNOME Internet Radio Locator program, allows users to easily "
-#| "find and record live radio programs on radio broadcasters on the Internet."
 msgid ""
-"GNOME Internet Radio Locator (GIRL) allows users to easily find and listen "
-"to live radio programs on radio broadcasters on the Internet."
+"GIRL, the GNOME Internet Radio Locator program, allows users to easily find "
+"and record live radio programs on radio broadcasters on the Internet."
 msgstr ""
-"Гномов проналазач интернет радиа (GIRL), омогућава корисницима да с лакоћом "
-"нађу и да слушају радио програме уживо на радио станицама које емитују преко "
-"интернета."
+"Гирл, Гномов проналазач интернет радиа (GNOME Internet Radio Locator), "
+"омогућава корисницима да с лакоћом нађу и да снимају радио програме уживо на "
+"радио станицама које емитују преко интернета."
 
 #: ../data/girl.appdata.xml.in.h:2
-#| msgid ""
-#| "GIRL is developed for the GNOME desktop and requires one audio helper "
-#| "such as Totem to be installed for playback and streamripper to be "
-#| "installed for recording live radio streams of supported radio stations."
 msgid ""
-"GIRL is developed for the GNOME desktop and requires gstreamer 1.0 to be "
-"installed for playback of supported radio stations."
+"GIRL is developed for the GNOME desktop and requires one audio helper such "
+"as Totem to be installed for playback and streamripper to be installed for "
+"recording live radio streams of supported radio stations."
 msgstr ""
-"Гирл је направљен за Гномову радну површ и захтева да је инсталиран гстример "
-"1.0 за пуштање подржаних радио станица."
+"Гирл је направљен за Гномову радну површ и захтева аудио помоћника као што "
+"је Тотем за пуштање и издвајача токова за уживо снимање радио токова "
+"подржаних радио станица."
 
 #: ../data/girl.appdata.xml.in.h:3
 msgid ""
@@ -54,7 +49,7 @@ msgstr ""
 msgid "Internet Radio Locator"
 msgstr "Проналазач интернет радиа"
 
-#: ../data/girl.desktop.in.in.h:2 ../src/girl.c:705
+#: ../data/girl.desktop.in.in.h:2 ../src/girl.c:660
 msgid "Locate Internet Radio Stations"
 msgstr "Пронађите радио станице на интернету"
 
@@ -63,173 +58,173 @@ msgstr "Пронађите радио станице на интернету"
 msgid "Live;Radio;Program;Station;Locator;"
 msgstr "радио;уживо;програм;станица;проналазач;"
 
-#: ../src/girl-gui.c:58
+#: ../src/girl-gui.c:56
 msgid "New"
 msgstr "Нова"
 
-#: ../src/girl-gui.c:58
+#: ../src/girl-gui.c:56
 msgid "Add a new radio station"
 msgstr "Додајте нову радио станицу"
 
-#: ../src/girl-gui.c:61
+#: ../src/girl-gui.c:59
 msgid "Search"
 msgstr "Тражи"
 
-#: ../src/girl-gui.c:61
+#: ../src/girl-gui.c:59
 msgid "Search by location for radio stations"
 msgstr "Потражите радио станице према месту"
 
-#: ../src/girl-gui.c:65
+#: ../src/girl-gui.c:63
 msgid "Listen"
 msgstr "Слушај"
 
-#: ../src/girl-gui.c:65
+#: ../src/girl-gui.c:63
 msgid "Listen to selected radio station"
 msgstr "Слушајте изабрану радио станицу"
 
-#: ../src/girl-gui.c:69
+#: ../src/girl-gui.c:67
 msgid "Record"
 msgstr "Сними"
 
-#: ../src/girl-gui.c:69
+#: ../src/girl-gui.c:67
 msgid "Record selected radio station"
 msgstr "Снимајте изабрану радио станицу"
 
-#: ../src/girl-gui.c:73
+#: ../src/girl-gui.c:70
 msgid "Stop"
 msgstr "Заустави"
 
-#: ../src/girl-gui.c:73
+#: ../src/girl-gui.c:70
 msgid "Stop recording selected radio station"
 msgstr "Зауставите снимање изабране радио станице"
 
-#: ../src/girl-gui.c:77
+#: ../src/girl-gui.c:75
 msgid "Previous"
 msgstr "Претходна"
 
-#: ../src/girl-gui.c:78
+#: ../src/girl-gui.c:76
 msgid "Go back to the previous radio station"
 msgstr "Идите на претходну радио станицу"
 
-#: ../src/girl-gui.c:80
+#: ../src/girl-gui.c:78
 msgid "Stations"
 msgstr "Станице"
 
-#: ../src/girl-gui.c:80
+#: ../src/girl-gui.c:78
 msgid "Internet Radio Stations"
 msgstr "Радио станице на интернету"
 
-#: ../src/girl-gui.c:83
+#: ../src/girl-gui.c:81
 msgid "Next"
 msgstr "Следећа"
 
-#: ../src/girl-gui.c:83
+#: ../src/girl-gui.c:81
 msgid "Proceed to the next radio station"
 msgstr "Идите на следећу радио станицу"
 
-#: ../src/girl-gui.c:86
+#: ../src/girl-gui.c:84
 msgid "Station"
 msgstr "Станица"
 
-#: ../src/girl-gui.c:87
+#: ../src/girl-gui.c:85
 msgid "About the current Station"
 msgstr "Подаци о тренутној станици"
 
-#: ../src/girl-gui.c:90
+#: ../src/girl-gui.c:88
 msgid "Program"
 msgstr "Програм"
 
-#: ../src/girl-gui.c:91
+#: ../src/girl-gui.c:89
 msgid "About the GNOME Internet Radio Locator"
 msgstr "О Гномовом проналазачу интернет радиа"
 
-#: ../src/girl-gui.c:95
+#: ../src/girl-gui.c:93
 msgid "Exit"
 msgstr "Изађи"
 
-#: ../src/girl-gui.c:96
+#: ../src/girl-gui.c:94
 msgid "Quit the GNOME Internet Radio Locator"
 msgstr "Изађите из Гномовог проналазача интернет радиа"
 
-#: ../src/girl-gui.c:205
+#: ../src/girl-gui.c:203
 #, c-format
 msgid "Playing %s"
 msgstr "Пуштам „%s“"
 
 #. The Listeners dialog
-#: ../src/girl-gui.c:231
+#: ../src/girl-gui.c:229
 msgid "Select a listener"
 msgstr "Изаберите слушаоца"
 
-#: ../src/girl-gui.c:258
+#: ../src/girl-gui.c:256
 #, c-format
 msgid "Failed to open %s.  Please install it.\n"
 msgstr "Нисам успео да отворим „%s“.  Инсталирајте га.\n"
 
-#: ../src/girl-gui.c:268 ../src/girl-gui.c:776 ../src/girl-gui.c:1117
+#: ../src/girl-gui.c:266 ../src/girl-gui.c:768 ../src/girl-gui.c:1109
 #, c-format
 msgid "Failed to open %s\n"
 msgstr "Нисам успео да отворим „%s“\n"
 
 #. The Programs dialog
-#: ../src/girl-gui.c:369
+#: ../src/girl-gui.c:367
 msgid "Select a program"
 msgstr "Изаберите програм"
 
-#: ../src/girl-gui.c:400 ../src/girl-gui.c:410 ../src/girl-gui.c:593
-#: ../src/girl-gui.c:762 ../src/girl-gui.c:960 ../src/girl-gui.c:1102
+#: ../src/girl-gui.c:398 ../src/girl-gui.c:408 ../src/girl-gui.c:585
+#: ../src/girl-gui.c:754 ../src/girl-gui.c:952 ../src/girl-gui.c:1094
 #, c-format
 msgid "Failed to open %s.\n"
 msgstr "Нисам успео да отворим „%s“.\n"
 
-#: ../src/girl-gui.c:514
+#: ../src/girl-gui.c:512
 #, c-format
 msgid "Your search by location resulted in the radio station %s in %s: %s"
 msgstr "Ваша претрага према месту даје радио станицу %s у %s: %s"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:551
+#: ../src/girl-gui.c:543
 msgid "Search by location"
 msgstr "Тражите према месту"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:731
+#: ../src/girl-gui.c:723
 msgid "Select a station"
 msgstr "Изаберите станицу"
 
-#: ../src/girl-gui.c:872
+#: ../src/girl-gui.c:864
 #, c-format
 msgid "Found location %s"
 msgstr "Нашао сам место „%s“"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:907
+#: ../src/girl-gui.c:899
 msgid "New radio station"
 msgstr "Нова радио станица"
 
 #. The Streams dialog
-#: ../src/girl-gui.c:1073
+#: ../src/girl-gui.c:1065
 msgid "Select a stream"
 msgstr "Изаберите ток"
 
-#: ../src/girl-gui.c:1204
+#: ../src/girl-gui.c:1196
 #, c-format
 msgid "Selection cleared!\n"
 msgstr "Избор је очишћен!\n"
 
-#: ../src/girl-gui.c:1240
+#: ../src/girl-gui.c:1232
 msgid "GIRL"
 msgstr "Гирл"
 
-#: ../src/girl-gui.c:1242
+#: ../src/girl-gui.c:1234
 msgid "GNOME Internet Radio Locator"
 msgstr "Гномов проналазач интернет радиа"
 
-#: ../src/girl-gui.c:1254
+#: ../src/girl-gui.c:1246
 msgid "Couldn't create pixmap"
 msgstr "Не могу да направим сличицу"
 
-#: ../src/girl-gui.c:1271
+#: ../src/girl-gui.c:1263
 msgid ""
 "Search by location from \"Search\" or select a radio station from \"Stations"
 "\".  Click \"Listen\" to listen to, or \"Record\" to record from the station."
@@ -238,7 +233,7 @@ msgstr ""
 "изборника „Станице“.  Притисните „Слушај“ да слушате, или „Сними“ да снимате "
 "са станице."
 
-#: ../src/girl-gui.c:1273
+#: ../src/girl-gui.c:1265
 msgid ""
 "Select a radio station from \"Stations\" and click \"Listen\" to listen to "
 "the station."
@@ -247,12 +242,12 @@ msgstr ""
 "слушате радио станицу."
 
 #. printf("Archiving program at %s\n", archive);
-#: ../src/girl-station.c:239
+#: ../src/girl-station.c:234
 #, c-format
 msgid "Recording from %s in %s to %s"
 msgstr "Снимам са „%s“ за %s у %s"
 
-#: ../src/girl-station.c:257
+#: ../src/girl-station.c:252
 #, c-format
 msgid ""
 "An error happened trying to play %s\n"
@@ -261,7 +256,7 @@ msgstr ""
 "Дошло је до грешке када сам покушао да пустим „%s“\n"
 "Или датотека не постоји, или немате одговарајући програм за пуштање исте."
 
-#: ../src/girl-station.c:263
+#: ../src/girl-station.c:258
 #, c-format
 msgid ""
 "An error happened trying to record %s\n"
@@ -270,13 +265,13 @@ msgstr ""
 "Дошло је до грешке када сам покушао да снимим „%s“\n"
 "Или датотека не постоји, или немате одговарајући програм за снимање."
 
-#: ../src/girl-station.c:294 ../src/girl-station.c:314
-#: ../src/girl-station.c:431 ../src/girl-station.c:454
+#: ../src/girl-station.c:289 ../src/girl-station.c:309
+#: ../src/girl-station.c:426 ../src/girl-station.c:449
 #, c-format
 msgid "Failed to run %s (%i)\n"
 msgstr "Нисам успео да покренем „%s“ (%i)\n"
 
-#: ../src/girl-station.c:341 ../src/girl-station.c:478
+#: ../src/girl-station.c:336 ../src/girl-station.c:473
 #, c-format
 msgid ""
 "Failed to open URL: '%s'\n"
@@ -287,7 +282,7 @@ msgstr ""
 "Шифра стања: %i\n"
 "Појединости: %s"
 
-#: ../src/girl-station.c:359 ../src/girl-station.c:373
+#: ../src/girl-station.c:356 ../src/girl-station.c:369
 #, c-format
 msgid ""
 "Failed to open URL: '%s'\n"
@@ -296,20 +291,20 @@ msgstr ""
 "Нисам успео да отворим адресу: „%s“\n"
 "Појединости: %s"
 
-#: ../src/girl.c:76
+#: ../src/girl-station.c:395
+#, c-format
+msgid ""
+"Failed to run '%s'\n"
+"Details: %s"
+msgstr ""
+"Нисам успео да покренем „%s“\n"
+"Појединости: %s"
+
+#: ../src/girl.c:72
 msgid "GNOME VFS initialization failed!\n"
 msgstr "Покретање Гном ВФС-а није успело!\n"
 
-#: ../src/girl.c:81
-#| msgid "GNOME VFS initialization failed!\n"
-msgid "Player Frontend initialization failure..."
-msgstr "Покретање челника пуштача није успело..."
-
-#: ../src/girl.c:86
-msgid "Player Backend creation failure"
-msgstr "Стварање позадинца пуштача није успело"
-
-#: ../src/girl.c:140
+#: ../src/girl.c:124
 #, c-format
 msgid "%i station"
 msgid_plural "%i stations"
@@ -318,8 +313,9 @@ msgstr[1] "Нашао сам %i станице"
 msgstr[2] "Нашао сам %i станица"
 msgstr[3] "Нашао сам једну станицу"
 
-#: ../src/girl.c:141
+#: ../src/girl.c:125
 #, c-format
+#| msgid "%i stations and %i streams found"
 msgid "and %i stream found"
 msgid_plural "and %i streams found"
 msgstr[0] "и %i ток"
@@ -327,68 +323,42 @@ msgstr[1] "и %i тока"
 msgstr[2] "и %i токова"
 msgstr[3] "и један ток"
 
-#: ../src/girl.c:143
+#: ../src/girl.c:127
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/girl.c:211
+#: ../src/girl.c:196
 #, c-format
 msgid "Selected the previous radio station: %s in %s: %s"
 msgstr "Изабрана је претходна радио станица: %s у %s: %s"
 
-#: ../src/girl.c:274
+#: ../src/girl.c:258
 #, c-format
 msgid "Selected the next radio station %s in %s: %s"
 msgstr "Изабрана је следећа радио станица: %s у %s: %s"
 
-#: ../src/girl.c:377
+#: ../src/girl.c:362
 #, c-format
 msgid "Selected %s in %s: %s (%f)"
 msgstr "Изабрана је %s у %s: %s (%f)"
 
-#: ../src/girl.c:425
+#: ../src/girl.c:410
 #, c-format
 msgid "Selected %s in %s: %s"
 msgstr "Изабрана је %s у %s: %s"
 
-#: ../src/girl.c:474 ../src/girl.c:522
+#: ../src/girl.c:459 ../src/girl.c:506
 #, c-format
 msgid "Selected the radio station %s in %s: %s"
 msgstr "Изабрана је радио станица %s у %s: %s"
 
-#: ../src/girl.c:572
+#: ../src/girl.c:556
 #, c-format
 msgid "Selected %s [%s] [%s] [%s]"
 msgstr "Изабрана је %s [%s] [%s] [%s]"
 
-#: ../src/girl.c:673
-#| msgid ""
-#| "Marek Černocký <marek manet cz> (Czech translation)\n"
-#| "Rafael Fontenelle <rafaelff gnome org> (Brazilian Portuguese "
-#| "translation)\n"
-#| "Miroslav Nikolić <miroslavnikolic rocketmail com> (Serbian translation)\n"
-#| "Wolfgang Stöggl <c72578 yahoo de> (German translation)\n"
-#| "Piotr Drąg <piotrdrag gmail com> (Polish translation)\n"
-#| "Muhammet Kara <muhammetk gmail com> (Turkish translation)\n"
-#| "Balázs Úr <urbalazs gmail com> (Hungarian translation)\n"
-#| "Andika Triwidada <andika gmail com> (Indonesian translation)\n"
-#| "Daniel Mustieles <daniel mustieles gmail com> (Spanish translation)\n"
-#| "Matej Urbančič <mateju svn gnome org> (Slovenian translation)\n"
-#| "Γιάννης Κουτσούκος <giankoyt gmail com> (Greek translation)\n"
-#| "Efstathios Iosifidis <iosifidis opensuse org> (Greek translation)\n"
-#| "Samir Ribić <megaribi epn ba> (Bosnian translation)\n"
-#| "Enrico Nicoletto <liverig gmail com> (Brazilian Portuguese translation)\n"
-#| "Sveinn í Felli <sv1 fellsnet is> (Icelandic translation)\n"
-#| "Josef Andersson <josef andersson gmail com> (Swedish translation)\n"
-#| "Pedro Albuquerque <palbuquerque73 gmail com> (Portuguese translation)\n"
-#| "Mario Blättermann <mario blaettermann gmail com> (German translation)\n"
-#| "Necdet Yücel <necdetyucel gmail com> (Turkish translation)\n"
-#| "Andy Daniel Cruz Campos <god_of_war_2 hotmail com> (Spanish translation)\n"
-#| "Mирослав Николић <miroslavnikolic rocketmail com> (Serbian translation)\n"
-#| "Balázs Meskó <meskobalazs gmail com> (Hungarian translation)\n"
-#| "Laudivan Freire de Almeida <laudivan riseup net> (Brazilian Portuguese "
-#| "translation)\n"
+#: ../src/girl.c:632
 msgid ""
 "Marek Černocký <marek manet cz> (Czech translation)\n"
 "Rafael Fontenelle <rafaelff gnome org> (Brazilian Portuguese translation)\n"
@@ -414,36 +384,28 @@ msgid ""
 "Balázs Meskó <meskobalazs gmail com> (Hungarian translation)\n"
 "Laudivan Freire de Almeida <laudivan riseup net> (Brazilian Portuguese "
 "translation)\n"
-"Bernd Homuth <dev hmt im> (German translation)\n"
-"Paul Feuvraux and Claude Paroz <claude 2xlibre net> (French translation)\n"
-"Anders Jonsson <anders jonsson norsjovallen se> (Swedish translation)\n"
 msgstr ""
 "Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "\n"
 "http://prevod.org — превод на српски језик\n"
 
-#: ../src/girl.c:706
-#| msgid "Copyright (C) 2014, 2015, 2016  Ole Aamot Software"
-msgid "Copyright (C) 2014-2017  Ole Aamot Software"
-msgstr "Ауторска права © 2014—2017 Оле Амот софтвер"
+#: ../src/girl.c:661
+msgid "Copyright (C) 2014, 2015, 2016  Ole Aamot Software"
+msgstr "Ауторска права © 2014, 2015, 2016 Оле Амот софтвер"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:662
 msgid "Mario Blättermann <mario blaettermann gmail com> (German translation)"
 msgstr "Марио Блатерман <mario blaettermann gmail com> (превод на немачки)"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:662
 msgid "Marek Černocký <marek manet cz> (Czech translation)"
 msgstr "Марек Черноцки <marek manet cz> (превод на чешки)"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:662
 msgid "Daniel Mustieles <daniel mustieles gmail com> (Spanish translation)"
 msgstr "Даниел Мустјелес <daniel mustieles gmail com> (превод на шпански)"
 
-#: ../src/girl.c:707
-msgid "Josef Andersson <josef andersson fripost org> (Swedish translation)"
-msgstr "Јозеф Андерсон <josef andersson fripost org> (превод на шведски)"
-
-#: ../src/girl.c:716
+#: ../src/girl.c:671
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -472,51 +434,40 @@ msgstr ""
 "софтвера на адресу: „Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301 USA“."
 
-#: ../src/girl.c:722
+#: ../src/girl.c:677
 #, c-format
 msgid "Unable to load GIRL logo: %s\n"
 msgstr "Не могу да учитам логотип Гирла: %s\n"
 
-#: ../src/girl.c:880
+#: ../src/girl.c:835
 msgid "Search radio station by location"
 msgstr "Тражи радио станицу према месту"
 
-#: ../src/girl.c:886
+#: ../src/girl.c:841
 #, c-format
 msgid "Listening to the radio station %s in %s: %s "
 msgstr "Слушам радио станицу %s у %s: %s "
 
 #. g_spawn_close_pid( girl->record_pid);
-#: ../src/girl.c:945
+#: ../src/girl.c:892
 #, c-format
 msgid "Finished saving recording from the radio station %s in %s from %s to %s"
 msgstr "Завршио сам снимање са радио станице „%s“ за %s са %s у %s"
 
 #. g_spawn_close_pid( girl->player_pid);
-#: ../src/girl.c:963
+#: ../src/girl.c:906
 #, c-format
-#| msgid "Selected the radio station %s in %s: %s"
-msgid "Stopped playing the radio station %s in %s."
-msgstr "Зауставио сам слушање радио станице „%s“ у %s."
+msgid ""
+"Stopped playing the radio station %s in %s, exit the application Videos."
+msgstr ""
+"Зауставио сам пуштање са радио станице „%s“ за %s, изађите из програма "
+"снимака."
 
-#: ../src/girl.c:1007
+#: ../src/girl.c:951
 #, c-format
 msgid "Archiving %s"
 msgstr "Архивирам „%s“"
 
-#~ msgid ""
-#~ "Failed to run '%s'\n"
-#~ "Details: %s"
-#~ msgstr ""
-#~ "Нисам успео да покренем „%s“\n"
-#~ "Појединости: %s"
-
-#~ msgid ""
-#~ "Stopped playing the radio station %s in %s, exit the application Videos."
-#~ msgstr ""
-#~ "Зауставио сам пуштање са радио станице „%s“ за %s, изађите из програма "
-#~ "снимака."
-
 #~ msgid "%i stations and %i streams found "
 #~ msgstr "Нашао сам %i станице и %i тока "
 
diff --git a/po/sr latin po b/po/sr latin po
index 05bae5d..d3c9610 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,16 +1,16 @@
 # Serbian translation for girl.
 # Copyright (C) 2014 girl's COPYRIGHT HOLDER
 # This file is distributed under the same license as the girl package.
-# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2014—2017.
+# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2014—2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: girl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=girl&ke";
 "ywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-01-29 15:23+0000\n"
-"PO-Revision-Date: 2017-02-12 17:57+0200\n"
+"POT-Creation-Date: 2016-08-31 19:26+0000\n"
+"PO-Revision-Date: 2016-09-01 17:13+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: srpski <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,28 +20,23 @@ msgstr ""
 "X-Project-Style: gnome\n"
 
 #: ../data/girl.appdata.xml.in.h:1
-#| msgid ""
-#| "GIRL, the GNOME Internet Radio Locator program, allows users to easily "
-#| "find and record live radio programs on radio broadcasters on the Internet."
 msgid ""
-"GNOME Internet Radio Locator (GIRL) allows users to easily find and listen "
-"to live radio programs on radio broadcasters on the Internet."
+"GIRL, the GNOME Internet Radio Locator program, allows users to easily find "
+"and record live radio programs on radio broadcasters on the Internet."
 msgstr ""
-"Gnomov pronalazač internet radia (GIRL), omogućava korisnicima da s lakoćom "
-"nađu i da slušaju radio programe uživo na radio stanicama koje emituju preko "
-"interneta."
+"Girl, Gnomov pronalazač internet radia (GNOME Internet Radio Locator), "
+"omogućava korisnicima da s lakoćom nađu i da snimaju radio programe uživo na "
+"radio stanicama koje emituju preko interneta."
 
 #: ../data/girl.appdata.xml.in.h:2
-#| msgid ""
-#| "GIRL is developed for the GNOME desktop and requires one audio helper "
-#| "such as Totem to be installed for playback and streamripper to be "
-#| "installed for recording live radio streams of supported radio stations."
 msgid ""
-"GIRL is developed for the GNOME desktop and requires gstreamer 1.0 to be "
-"installed for playback of supported radio stations."
+"GIRL is developed for the GNOME desktop and requires one audio helper such "
+"as Totem to be installed for playback and streamripper to be installed for "
+"recording live radio streams of supported radio stations."
 msgstr ""
-"Girl je napravljen za Gnomovu radnu površ i zahteva da je instaliran gstrimer "
-"1.0 za puštanje podržanih radio stanica."
+"Girl je napravljen za Gnomovu radnu površ i zahteva audio pomoćnika kao što "
+"je Totem za puštanje i izdvajača tokova za uživo snimanje radio tokova "
+"podržanih radio stanica."
 
 #: ../data/girl.appdata.xml.in.h:3
 msgid ""
@@ -54,7 +49,7 @@ msgstr ""
 msgid "Internet Radio Locator"
 msgstr "Pronalazač internet radia"
 
-#: ../data/girl.desktop.in.in.h:2 ../src/girl.c:705
+#: ../data/girl.desktop.in.in.h:2 ../src/girl.c:660
 msgid "Locate Internet Radio Stations"
 msgstr "Pronađite radio stanice na internetu"
 
@@ -63,173 +58,173 @@ msgstr "Pronađite radio stanice na internetu"
 msgid "Live;Radio;Program;Station;Locator;"
 msgstr "radio;uživo;program;stanica;pronalazač;"
 
-#: ../src/girl-gui.c:58
+#: ../src/girl-gui.c:56
 msgid "New"
 msgstr "Nova"
 
-#: ../src/girl-gui.c:58
+#: ../src/girl-gui.c:56
 msgid "Add a new radio station"
 msgstr "Dodajte novu radio stanicu"
 
-#: ../src/girl-gui.c:61
+#: ../src/girl-gui.c:59
 msgid "Search"
 msgstr "Traži"
 
-#: ../src/girl-gui.c:61
+#: ../src/girl-gui.c:59
 msgid "Search by location for radio stations"
 msgstr "Potražite radio stanice prema mestu"
 
-#: ../src/girl-gui.c:65
+#: ../src/girl-gui.c:63
 msgid "Listen"
 msgstr "Slušaj"
 
-#: ../src/girl-gui.c:65
+#: ../src/girl-gui.c:63
 msgid "Listen to selected radio station"
 msgstr "Slušajte izabranu radio stanicu"
 
-#: ../src/girl-gui.c:69
+#: ../src/girl-gui.c:67
 msgid "Record"
 msgstr "Snimi"
 
-#: ../src/girl-gui.c:69
+#: ../src/girl-gui.c:67
 msgid "Record selected radio station"
 msgstr "Snimajte izabranu radio stanicu"
 
-#: ../src/girl-gui.c:73
+#: ../src/girl-gui.c:70
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../src/girl-gui.c:73
+#: ../src/girl-gui.c:70
 msgid "Stop recording selected radio station"
 msgstr "Zaustavite snimanje izabrane radio stanice"
 
-#: ../src/girl-gui.c:77
+#: ../src/girl-gui.c:75
 msgid "Previous"
 msgstr "Prethodna"
 
-#: ../src/girl-gui.c:78
+#: ../src/girl-gui.c:76
 msgid "Go back to the previous radio station"
 msgstr "Idite na prethodnu radio stanicu"
 
-#: ../src/girl-gui.c:80
+#: ../src/girl-gui.c:78
 msgid "Stations"
 msgstr "Stanice"
 
-#: ../src/girl-gui.c:80
+#: ../src/girl-gui.c:78
 msgid "Internet Radio Stations"
 msgstr "Radio stanice na internetu"
 
-#: ../src/girl-gui.c:83
+#: ../src/girl-gui.c:81
 msgid "Next"
 msgstr "Sledeća"
 
-#: ../src/girl-gui.c:83
+#: ../src/girl-gui.c:81
 msgid "Proceed to the next radio station"
 msgstr "Idite na sledeću radio stanicu"
 
-#: ../src/girl-gui.c:86
+#: ../src/girl-gui.c:84
 msgid "Station"
 msgstr "Stanica"
 
-#: ../src/girl-gui.c:87
+#: ../src/girl-gui.c:85
 msgid "About the current Station"
 msgstr "Podaci o trenutnoj stanici"
 
-#: ../src/girl-gui.c:90
+#: ../src/girl-gui.c:88
 msgid "Program"
 msgstr "Program"
 
-#: ../src/girl-gui.c:91
+#: ../src/girl-gui.c:89
 msgid "About the GNOME Internet Radio Locator"
 msgstr "O Gnomovom pronalazaču internet radia"
 
-#: ../src/girl-gui.c:95
+#: ../src/girl-gui.c:93
 msgid "Exit"
 msgstr "Izađi"
 
-#: ../src/girl-gui.c:96
+#: ../src/girl-gui.c:94
 msgid "Quit the GNOME Internet Radio Locator"
 msgstr "Izađite iz Gnomovog pronalazača internet radia"
 
-#: ../src/girl-gui.c:205
+#: ../src/girl-gui.c:203
 #, c-format
 msgid "Playing %s"
 msgstr "Puštam „%s“"
 
 #. The Listeners dialog
-#: ../src/girl-gui.c:231
+#: ../src/girl-gui.c:229
 msgid "Select a listener"
 msgstr "Izaberite slušaoca"
 
-#: ../src/girl-gui.c:258
+#: ../src/girl-gui.c:256
 #, c-format
 msgid "Failed to open %s.  Please install it.\n"
 msgstr "Nisam uspeo da otvorim „%s“.  Instalirajte ga.\n"
 
-#: ../src/girl-gui.c:268 ../src/girl-gui.c:776 ../src/girl-gui.c:1117
+#: ../src/girl-gui.c:266 ../src/girl-gui.c:768 ../src/girl-gui.c:1109
 #, c-format
 msgid "Failed to open %s\n"
 msgstr "Nisam uspeo da otvorim „%s“\n"
 
 #. The Programs dialog
-#: ../src/girl-gui.c:369
+#: ../src/girl-gui.c:367
 msgid "Select a program"
 msgstr "Izaberite program"
 
-#: ../src/girl-gui.c:400 ../src/girl-gui.c:410 ../src/girl-gui.c:593
-#: ../src/girl-gui.c:762 ../src/girl-gui.c:960 ../src/girl-gui.c:1102
+#: ../src/girl-gui.c:398 ../src/girl-gui.c:408 ../src/girl-gui.c:585
+#: ../src/girl-gui.c:754 ../src/girl-gui.c:952 ../src/girl-gui.c:1094
 #, c-format
 msgid "Failed to open %s.\n"
 msgstr "Nisam uspeo da otvorim „%s“.\n"
 
-#: ../src/girl-gui.c:514
+#: ../src/girl-gui.c:512
 #, c-format
 msgid "Your search by location resulted in the radio station %s in %s: %s"
 msgstr "Vaša pretraga prema mestu daje radio stanicu %s u %s: %s"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:551
+#: ../src/girl-gui.c:543
 msgid "Search by location"
 msgstr "Tražite prema mestu"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:731
+#: ../src/girl-gui.c:723
 msgid "Select a station"
 msgstr "Izaberite stanicu"
 
-#: ../src/girl-gui.c:872
+#: ../src/girl-gui.c:864
 #, c-format
 msgid "Found location %s"
 msgstr "Našao sam mesto „%s“"
 
 #. The Stations dialog
-#: ../src/girl-gui.c:907
+#: ../src/girl-gui.c:899
 msgid "New radio station"
 msgstr "Nova radio stanica"
 
 #. The Streams dialog
-#: ../src/girl-gui.c:1073
+#: ../src/girl-gui.c:1065
 msgid "Select a stream"
 msgstr "Izaberite tok"
 
-#: ../src/girl-gui.c:1204
+#: ../src/girl-gui.c:1196
 #, c-format
 msgid "Selection cleared!\n"
 msgstr "Izbor je očišćen!\n"
 
-#: ../src/girl-gui.c:1240
+#: ../src/girl-gui.c:1232
 msgid "GIRL"
 msgstr "Girl"
 
-#: ../src/girl-gui.c:1242
+#: ../src/girl-gui.c:1234
 msgid "GNOME Internet Radio Locator"
 msgstr "Gnomov pronalazač internet radia"
 
-#: ../src/girl-gui.c:1254
+#: ../src/girl-gui.c:1246
 msgid "Couldn't create pixmap"
 msgstr "Ne mogu da napravim sličicu"
 
-#: ../src/girl-gui.c:1271
+#: ../src/girl-gui.c:1263
 msgid ""
 "Search by location from \"Search\" or select a radio station from \"Stations"
 "\".  Click \"Listen\" to listen to, or \"Record\" to record from the station."
@@ -238,7 +233,7 @@ msgstr ""
 "izbornika „Stanice“.  Pritisnite „Slušaj“ da slušate, ili „Snimi“ da snimate "
 "sa stanice."
 
-#: ../src/girl-gui.c:1273
+#: ../src/girl-gui.c:1265
 msgid ""
 "Select a radio station from \"Stations\" and click \"Listen\" to listen to "
 "the station."
@@ -247,12 +242,12 @@ msgstr ""
 "slušate radio stanicu."
 
 #. printf("Archiving program at %s\n", archive);
-#: ../src/girl-station.c:239
+#: ../src/girl-station.c:234
 #, c-format
 msgid "Recording from %s in %s to %s"
 msgstr "Snimam sa „%s“ za %s u %s"
 
-#: ../src/girl-station.c:257
+#: ../src/girl-station.c:252
 #, c-format
 msgid ""
 "An error happened trying to play %s\n"
@@ -261,7 +256,7 @@ msgstr ""
 "Došlo je do greške kada sam pokušao da pustim „%s“\n"
 "Ili datoteka ne postoji, ili nemate odgovarajući program za puštanje iste."
 
-#: ../src/girl-station.c:263
+#: ../src/girl-station.c:258
 #, c-format
 msgid ""
 "An error happened trying to record %s\n"
@@ -270,13 +265,13 @@ msgstr ""
 "Došlo je do greške kada sam pokušao da snimim „%s“\n"
 "Ili datoteka ne postoji, ili nemate odgovarajući program za snimanje."
 
-#: ../src/girl-station.c:294 ../src/girl-station.c:314
-#: ../src/girl-station.c:431 ../src/girl-station.c:454
+#: ../src/girl-station.c:289 ../src/girl-station.c:309
+#: ../src/girl-station.c:426 ../src/girl-station.c:449
 #, c-format
 msgid "Failed to run %s (%i)\n"
 msgstr "Nisam uspeo da pokrenem „%s“ (%i)\n"
 
-#: ../src/girl-station.c:341 ../src/girl-station.c:478
+#: ../src/girl-station.c:336 ../src/girl-station.c:473
 #, c-format
 msgid ""
 "Failed to open URL: '%s'\n"
@@ -287,7 +282,7 @@ msgstr ""
 "Šifra stanja: %i\n"
 "Pojedinosti: %s"
 
-#: ../src/girl-station.c:359 ../src/girl-station.c:373
+#: ../src/girl-station.c:356 ../src/girl-station.c:369
 #, c-format
 msgid ""
 "Failed to open URL: '%s'\n"
@@ -296,20 +291,20 @@ msgstr ""
 "Nisam uspeo da otvorim adresu: „%s“\n"
 "Pojedinosti: %s"
 
-#: ../src/girl.c:76
+#: ../src/girl-station.c:395
+#, c-format
+msgid ""
+"Failed to run '%s'\n"
+"Details: %s"
+msgstr ""
+"Nisam uspeo da pokrenem „%s“\n"
+"Pojedinosti: %s"
+
+#: ../src/girl.c:72
 msgid "GNOME VFS initialization failed!\n"
 msgstr "Pokretanje Gnom VFS-a nije uspelo!\n"
 
-#: ../src/girl.c:81
-#| msgid "GNOME VFS initialization failed!\n"
-msgid "Player Frontend initialization failure..."
-msgstr "Pokretanje čelnika puštača nije uspelo..."
-
-#: ../src/girl.c:86
-msgid "Player Backend creation failure"
-msgstr "Stvaranje pozadinca puštača nije uspelo"
-
-#: ../src/girl.c:140
+#: ../src/girl.c:124
 #, c-format
 msgid "%i station"
 msgid_plural "%i stations"
@@ -318,8 +313,9 @@ msgstr[1] "Našao sam %i stanice"
 msgstr[2] "Našao sam %i stanica"
 msgstr[3] "Našao sam jednu stanicu"
 
-#: ../src/girl.c:141
+#: ../src/girl.c:125
 #, c-format
+#| msgid "%i stations and %i streams found"
 msgid "and %i stream found"
 msgid_plural "and %i streams found"
 msgstr[0] "i %i tok"
@@ -327,68 +323,42 @@ msgstr[1] "i %i toka"
 msgstr[2] "i %i tokova"
 msgstr[3] "i jedan tok"
 
-#: ../src/girl.c:143
+#: ../src/girl.c:127
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../src/girl.c:211
+#: ../src/girl.c:196
 #, c-format
 msgid "Selected the previous radio station: %s in %s: %s"
 msgstr "Izabrana je prethodna radio stanica: %s u %s: %s"
 
-#: ../src/girl.c:274
+#: ../src/girl.c:258
 #, c-format
 msgid "Selected the next radio station %s in %s: %s"
 msgstr "Izabrana je sledeća radio stanica: %s u %s: %s"
 
-#: ../src/girl.c:377
+#: ../src/girl.c:362
 #, c-format
 msgid "Selected %s in %s: %s (%f)"
 msgstr "Izabrana je %s u %s: %s (%f)"
 
-#: ../src/girl.c:425
+#: ../src/girl.c:410
 #, c-format
 msgid "Selected %s in %s: %s"
 msgstr "Izabrana je %s u %s: %s"
 
-#: ../src/girl.c:474 ../src/girl.c:522
+#: ../src/girl.c:459 ../src/girl.c:506
 #, c-format
 msgid "Selected the radio station %s in %s: %s"
 msgstr "Izabrana je radio stanica %s u %s: %s"
 
-#: ../src/girl.c:572
+#: ../src/girl.c:556
 #, c-format
 msgid "Selected %s [%s] [%s] [%s]"
 msgstr "Izabrana je %s [%s] [%s] [%s]"
 
-#: ../src/girl.c:673
-#| msgid ""
-#| "Marek Černocký <marek manet cz> (Czech translation)\n"
-#| "Rafael Fontenelle <rafaelff gnome org> (Brazilian Portuguese "
-#| "translation)\n"
-#| "Miroslav Nikolić <miroslavnikolic rocketmail com> (Serbian translation)\n"
-#| "Wolfgang Stöggl <c72578 yahoo de> (German translation)\n"
-#| "Piotr Drąg <piotrdrag gmail com> (Polish translation)\n"
-#| "Muhammet Kara <muhammetk gmail com> (Turkish translation)\n"
-#| "Balázs Úr <urbalazs gmail com> (Hungarian translation)\n"
-#| "Andika Triwidada <andika gmail com> (Indonesian translation)\n"
-#| "Daniel Mustieles <daniel mustieles gmail com> (Spanish translation)\n"
-#| "Matej Urbančič <mateju svn gnome org> (Slovenian translation)\n"
-#| "Γιάννης Κουτσούκος <giankoyt gmail com> (Greek translation)\n"
-#| "Efstathios Iosifidis <iosifidis opensuse org> (Greek translation)\n"
-#| "Samir Ribić <megaribi epn ba> (Bosnian translation)\n"
-#| "Enrico Nicoletto <liverig gmail com> (Brazilian Portuguese translation)\n"
-#| "Sveinn í Felli <sv1 fellsnet is> (Icelandic translation)\n"
-#| "Josef Andersson <josef andersson gmail com> (Swedish translation)\n"
-#| "Pedro Albuquerque <palbuquerque73 gmail com> (Portuguese translation)\n"
-#| "Mario Blättermann <mario blaettermann gmail com> (German translation)\n"
-#| "Necdet Yücel <necdetyucel gmail com> (Turkish translation)\n"
-#| "Andy Daniel Cruz Campos <god_of_war_2 hotmail com> (Spanish translation)\n"
-#| "Miroslav Nikolić <miroslavnikolic rocketmail com> (Serbian translation)\n"
-#| "Balázs Meskó <meskobalazs gmail com> (Hungarian translation)\n"
-#| "Laudivan Freire de Almeida <laudivan riseup net> (Brazilian Portuguese "
-#| "translation)\n"
+#: ../src/girl.c:632
 msgid ""
 "Marek Černocký <marek manet cz> (Czech translation)\n"
 "Rafael Fontenelle <rafaelff gnome org> (Brazilian Portuguese translation)\n"
@@ -414,36 +384,28 @@ msgid ""
 "Balázs Meskó <meskobalazs gmail com> (Hungarian translation)\n"
 "Laudivan Freire de Almeida <laudivan riseup net> (Brazilian Portuguese "
 "translation)\n"
-"Bernd Homuth <dev hmt im> (German translation)\n"
-"Paul Feuvraux and Claude Paroz <claude 2xlibre net> (French translation)\n"
-"Anders Jonsson <anders jonsson norsjovallen se> (Swedish translation)\n"
 msgstr ""
 "Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "\n"
 "http://prevod.org — prevod na srpski jezik\n"
 
-#: ../src/girl.c:706
-#| msgid "Copyright (C) 2014, 2015, 2016  Ole Aamot Software"
-msgid "Copyright (C) 2014-2017  Ole Aamot Software"
-msgstr "Autorska prava © 2014—2017 Ole Amot softver"
+#: ../src/girl.c:661
+msgid "Copyright (C) 2014, 2015, 2016  Ole Aamot Software"
+msgstr "Autorska prava © 2014, 2015, 2016 Ole Amot softver"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:662
 msgid "Mario Blättermann <mario blaettermann gmail com> (German translation)"
 msgstr "Mario Blaterman <mario blaettermann gmail com> (prevod na nemački)"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:662
 msgid "Marek Černocký <marek manet cz> (Czech translation)"
 msgstr "Marek Černocki <marek manet cz> (prevod na češki)"
 
-#: ../src/girl.c:707
+#: ../src/girl.c:662
 msgid "Daniel Mustieles <daniel mustieles gmail com> (Spanish translation)"
 msgstr "Daniel Mustjeles <daniel mustieles gmail com> (prevod na španski)"
 
-#: ../src/girl.c:707
-msgid "Josef Andersson <josef andersson fripost org> (Swedish translation)"
-msgstr "Jozef Anderson <josef andersson fripost org> (prevod na švedski)"
-
-#: ../src/girl.c:716
+#: ../src/girl.c:671
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -472,51 +434,40 @@ msgstr ""
 "softvera na adresu: „Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301 USA“."
 
-#: ../src/girl.c:722
+#: ../src/girl.c:677
 #, c-format
 msgid "Unable to load GIRL logo: %s\n"
 msgstr "Ne mogu da učitam logotip Girla: %s\n"
 
-#: ../src/girl.c:880
+#: ../src/girl.c:835
 msgid "Search radio station by location"
 msgstr "Traži radio stanicu prema mestu"
 
-#: ../src/girl.c:886
+#: ../src/girl.c:841
 #, c-format
 msgid "Listening to the radio station %s in %s: %s "
 msgstr "Slušam radio stanicu %s u %s: %s "
 
 #. g_spawn_close_pid( girl->record_pid);
-#: ../src/girl.c:945
+#: ../src/girl.c:892
 #, c-format
 msgid "Finished saving recording from the radio station %s in %s from %s to %s"
 msgstr "Završio sam snimanje sa radio stanice „%s“ za %s sa %s u %s"
 
 #. g_spawn_close_pid( girl->player_pid);
-#: ../src/girl.c:963
+#: ../src/girl.c:906
 #, c-format
-#| msgid "Selected the radio station %s in %s: %s"
-msgid "Stopped playing the radio station %s in %s."
-msgstr "Zaustavio sam slušanje radio stanice „%s“ u %s."
+msgid ""
+"Stopped playing the radio station %s in %s, exit the application Videos."
+msgstr ""
+"Zaustavio sam puštanje sa radio stanice „%s“ za %s, izađite iz programa "
+"snimaka."
 
-#: ../src/girl.c:1007
+#: ../src/girl.c:951
 #, c-format
 msgid "Archiving %s"
 msgstr "Arhiviram „%s“"
 
-#~ msgid ""
-#~ "Failed to run '%s'\n"
-#~ "Details: %s"
-#~ msgstr ""
-#~ "Nisam uspeo da pokrenem „%s“\n"
-#~ "Pojedinosti: %s"
-
-#~ msgid ""
-#~ "Stopped playing the radio station %s in %s, exit the application Videos."
-#~ msgstr ""
-#~ "Zaustavio sam puštanje sa radio stanice „%s“ za %s, izađite iz programa "
-#~ "snimaka."
-
 #~ msgid "%i stations and %i streams found "
 #~ msgstr "Našao sam %i stanice i %i toka "
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 24ccfea..c34b971 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
+
 AM_CPPFLAGS = $(GIRL_CFLAGS) \
        $(NULL)
 
@@ -22,31 +23,38 @@ test_endianess_LDADD = $(GIRL_LIBS)
 test_endianess_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
 
 bin_PROGRAMS = girl
+
 girl_SOURCES = \
-              GIRL-GUI.c \
-              GIRL-LISTENER.c\
-              GIRL-PROGRAM.c \
-              GIRL-RUNNERS.c \
-              GIRL-STATION.c \
-              GIRL-STATIONS-MAP.c \
-              GIRL-STREAMS.c \
-              GIRL-TZ.c \
-              GIRL.c
+              girl-gui.c \
+              girl-listener.c \
+              girl-program.c \
+              girl-player.c \
+              girl-player-backend.c \
+              girl-player-frontend.c \
+              girl-record.c \
+               girl-record-backend.c \
+              girl-record-frontend.c \
+               girl-runners.c \
+              girl-station.c \
+              girl-stations-map.c \
+              girl-streams.c \
+              girl-tz.c \
+              girl.c
 
 girl_CFLAGS  = $(GIRL_CFLAGS) \
               -DGIRL_DATADIR=\"$(datadir)/girl\" \
               -DDATADIR=\"$(datadir)\" \
-              -DGIRL_DEBUG=0 \
+              -DGIRL_DEBUG=1 \
               -DGIRL_CFG \
-              -DGIRL_HELPER_PLAYER=\"$(GIRL_HELPER_PLAYER)\" \
-              -DGIRL_HELPER_RECORD=\"$(GIRL_HELPER_RECORD)\" \
               -DGNOMELOCALEDIR=\"$(datadir)/locale\"
+
 girl_LDADD = $(GIRL_LIBS)
 
 girldir = $(datadir)/girl
-girl_DATA = girl-9.9.dtd girl-logo.png girl.png girl.xml
 
-EXTRA_DIST = GIRL.h GIRL-STATION.h GIRL-STATIONS-MAP.h GIRL-TZ.h GIRL-GUI.h GIRL-LISTENER.h GIRL-PROGRAM.h 
GIRL-RUNNERS.h GIRL-STREAMS.h girl-9.9.dtd girl-map.png girl-logo.png girl.png girl.xml
+girl_DATA = girl-9.8.dtd girl-logo.png girl.png girl.xml girl.xsl
+
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h 
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.8.dtd 
girl-map.png girl-logo.png girl.png girl.xml girl.xsl
 
 all-local: check-local
 
diff --git a/src/Makefile.in b/src/Makefile.in
index f31fd54..a06b910 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -103,11 +103,15 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(girldir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-am_girl_OBJECTS = girl-GIRL-GUI.$(OBJEXT) girl-GIRL-LISTENER.$(OBJEXT) \
-       girl-GIRL-PROGRAM.$(OBJEXT) girl-GIRL-RUNNERS.$(OBJEXT) \
-       girl-GIRL-STATION.$(OBJEXT) girl-GIRL-STATIONS-MAP.$(OBJEXT) \
-       girl-GIRL-STREAMS.$(OBJEXT) girl-GIRL-TZ.$(OBJEXT) \
-       girl-GIRL.$(OBJEXT)
+am_girl_OBJECTS = girl-girl-gui.$(OBJEXT) girl-girl-listener.$(OBJEXT) \
+       girl-girl-program.$(OBJEXT) girl-girl-player.$(OBJEXT) \
+       girl-girl-player-backend.$(OBJEXT) \
+       girl-girl-player-frontend.$(OBJEXT) girl-girl-record.$(OBJEXT) \
+       girl-girl-record-backend.$(OBJEXT) \
+       girl-girl-record-frontend.$(OBJEXT) \
+       girl-girl-runners.$(OBJEXT) girl-girl-station.$(OBJEXT) \
+       girl-girl-stations-map.$(OBJEXT) girl-girl-streams.$(OBJEXT) \
+       girl-girl-tz.$(OBJEXT) girl-girl.$(OBJEXT)
 girl_OBJECTS = $(am_girl_OBJECTS)
 am__DEPENDENCIES_1 =
 girl_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -377,29 +381,33 @@ test_endianess_SOURCES = test-endianess.c date-endian.c date-endian.h
 test_endianess_LDADD = $(GIRL_LIBS)
 test_endianess_CFLAGS = $(GIRL_CFLAGS) -DGIRL_DATADIR="\"$(pkgdatadir)\""
 girl_SOURCES = \
-              GIRL-GUI.c \
-              GIRL-LISTENER.c\
-              GIRL-PROGRAM.c \
-              GIRL-RUNNERS.c \
-              GIRL-STATION.c \
-              GIRL-STATIONS-MAP.c \
-              GIRL-STREAMS.c \
-              GIRL-TZ.c \
-              GIRL.c
+              girl-gui.c \
+              girl-listener.c \
+              girl-program.c \
+              girl-player.c \
+              girl-player-backend.c \
+              girl-player-frontend.c \
+              girl-record.c \
+               girl-record-backend.c \
+              girl-record-frontend.c \
+               girl-runners.c \
+              girl-station.c \
+              girl-stations-map.c \
+              girl-streams.c \
+              girl-tz.c \
+              girl.c
 
 girl_CFLAGS = $(GIRL_CFLAGS) \
               -DGIRL_DATADIR=\"$(datadir)/girl\" \
               -DDATADIR=\"$(datadir)\" \
-              -DGIRL_DEBUG=0 \
+              -DGIRL_DEBUG=1 \
               -DGIRL_CFG \
-              -DGIRL_HELPER_PLAYER=\"$(GIRL_HELPER_PLAYER)\" \
-              -DGIRL_HELPER_RECORD=\"$(GIRL_HELPER_RECORD)\" \
               -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 girl_LDADD = $(GIRL_LIBS)
 girldir = $(datadir)/girl
-girl_DATA = girl-9.9.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = GIRL.h GIRL-STATION.h GIRL-STATIONS-MAP.h GIRL-TZ.h GIRL-GUI.h GIRL-LISTENER.h GIRL-PROGRAM.h 
GIRL-RUNNERS.h GIRL-STREAMS.h girl-9.9.dtd girl-map.png girl-logo.png girl.png girl.xml
+girl_DATA = girl-9.8.dtd girl-logo.png girl.png girl.xml girl.xsl
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-player.h 
girl-player-globals.h girl-player-frontend.h girl-player-backend.h girl-record.h girl-record-backend.h 
girl-record-globals.h girl-record-frontend.h girl-program.h girl-runners.h girl-streams.h girl-9.8.dtd 
girl-map.png girl-logo.png girl.png girl.xml girl.xsl
 all: all-am
 
 .SUFFIXES:
@@ -501,15 +509,21 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-GUI.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-LISTENER.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-PROGRAM.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-RUNNERS.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-STATION.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-STATIONS-MAP.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-STREAMS.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL-TZ.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-GIRL.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-gui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-listener.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-player-backend.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-player-frontend.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-player.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-program.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-record-backend.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-record-frontend.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-record.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-runners.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-station.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-stations-map.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-streams.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl-tz.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/girl-girl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_endianess-date-endian.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_endianess-test-endianess.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stations-girl-stations-map.Po@am__quote@
@@ -532,131 +546,215 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-girl-GIRL-GUI.o: GIRL-GUI.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-GUI.o -MD -MP -MF $(DEPDIR)/girl-GIRL-GUI.Tpo -c -o girl-GIRL-GUI.o 
`test -f 'GIRL-GUI.c' || echo '$(srcdir)/'`GIRL-GUI.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-GUI.Tpo $(DEPDIR)/girl-GIRL-GUI.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-GUI.c' object='girl-GIRL-GUI.o' libtool=no 
@AMDEPBACKSLASH@
+girl-girl-gui.o: girl-gui.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-gui.o -MD -MP -MF $(DEPDIR)/girl-girl-gui.Tpo -c -o girl-girl-gui.o 
`test -f 'girl-gui.c' || echo '$(srcdir)/'`girl-gui.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-gui.Tpo $(DEPDIR)/girl-girl-gui.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-gui.c' object='girl-girl-gui.o' libtool=no 
@AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-GUI.o `test -f 'GIRL-GUI.c' || echo 
'$(srcdir)/'`GIRL-GUI.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-gui.o `test -f 'girl-gui.c' || echo 
'$(srcdir)/'`girl-gui.c
 
-girl-GIRL-GUI.obj: GIRL-GUI.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-GUI.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-GUI.Tpo -c -o 
girl-GIRL-GUI.obj `if test -f 'GIRL-GUI.c'; then $(CYGPATH_W) 'GIRL-GUI.c'; else $(CYGPATH_W) 
'$(srcdir)/GIRL-GUI.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-GUI.Tpo $(DEPDIR)/girl-GIRL-GUI.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-GUI.c' object='girl-GIRL-GUI.obj' libtool=no 
@AMDEPBACKSLASH@
+girl-girl-gui.obj: girl-gui.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-gui.obj -MD -MP -MF $(DEPDIR)/girl-girl-gui.Tpo -c -o 
girl-girl-gui.obj `if test -f 'girl-gui.c'; then $(CYGPATH_W) 'girl-gui.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-gui.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-gui.Tpo $(DEPDIR)/girl-girl-gui.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-gui.c' object='girl-girl-gui.obj' libtool=no 
@AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-GUI.obj `if test -f 'GIRL-GUI.c'; then $(CYGPATH_W) 
'GIRL-GUI.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-GUI.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-gui.obj `if test -f 'girl-gui.c'; then $(CYGPATH_W) 
'girl-gui.c'; else $(CYGPATH_W) '$(srcdir)/girl-gui.c'; fi`
 
-girl-GIRL-LISTENER.o: GIRL-LISTENER.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-LISTENER.o -MD -MP -MF $(DEPDIR)/girl-GIRL-LISTENER.Tpo -c -o 
girl-GIRL-LISTENER.o `test -f 'GIRL-LISTENER.c' || echo '$(srcdir)/'`GIRL-LISTENER.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-LISTENER.Tpo $(DEPDIR)/girl-GIRL-LISTENER.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-LISTENER.c' object='girl-GIRL-LISTENER.o' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-listener.o: girl-listener.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-listener.o -MD -MP -MF $(DEPDIR)/girl-girl-listener.Tpo -c -o 
girl-girl-listener.o `test -f 'girl-listener.c' || echo '$(srcdir)/'`girl-listener.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-listener.Tpo $(DEPDIR)/girl-girl-listener.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-listener.c' object='girl-girl-listener.o' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-LISTENER.o `test -f 'GIRL-LISTENER.c' || echo 
'$(srcdir)/'`GIRL-LISTENER.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-listener.o `test -f 'girl-listener.c' || echo 
'$(srcdir)/'`girl-listener.c
 
-girl-GIRL-LISTENER.obj: GIRL-LISTENER.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-LISTENER.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-LISTENER.Tpo -c -o 
girl-GIRL-LISTENER.obj `if test -f 'GIRL-LISTENER.c'; then $(CYGPATH_W) 'GIRL-LISTENER.c'; else $(CYGPATH_W) 
'$(srcdir)/GIRL-LISTENER.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-LISTENER.Tpo $(DEPDIR)/girl-GIRL-LISTENER.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-LISTENER.c' object='girl-GIRL-LISTENER.obj' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-listener.obj: girl-listener.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-listener.obj -MD -MP -MF $(DEPDIR)/girl-girl-listener.Tpo -c -o 
girl-girl-listener.obj `if test -f 'girl-listener.c'; then $(CYGPATH_W) 'girl-listener.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-listener.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-listener.Tpo $(DEPDIR)/girl-girl-listener.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-listener.c' object='girl-girl-listener.obj' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-LISTENER.obj `if test -f 'GIRL-LISTENER.c'; then 
$(CYGPATH_W) 'GIRL-LISTENER.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-LISTENER.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-listener.obj `if test -f 'girl-listener.c'; then 
$(CYGPATH_W) 'girl-listener.c'; else $(CYGPATH_W) '$(srcdir)/girl-listener.c'; fi`
 
-girl-GIRL-PROGRAM.o: GIRL-PROGRAM.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-PROGRAM.o -MD -MP -MF $(DEPDIR)/girl-GIRL-PROGRAM.Tpo -c -o 
girl-GIRL-PROGRAM.o `test -f 'GIRL-PROGRAM.c' || echo '$(srcdir)/'`GIRL-PROGRAM.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-PROGRAM.Tpo $(DEPDIR)/girl-GIRL-PROGRAM.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-PROGRAM.c' object='girl-GIRL-PROGRAM.o' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-program.o: girl-program.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-program.o -MD -MP -MF $(DEPDIR)/girl-girl-program.Tpo -c -o 
girl-girl-program.o `test -f 'girl-program.c' || echo '$(srcdir)/'`girl-program.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-program.Tpo $(DEPDIR)/girl-girl-program.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-program.c' object='girl-girl-program.o' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-PROGRAM.o `test -f 'GIRL-PROGRAM.c' || echo 
'$(srcdir)/'`GIRL-PROGRAM.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-program.o `test -f 'girl-program.c' || echo 
'$(srcdir)/'`girl-program.c
 
-girl-GIRL-PROGRAM.obj: GIRL-PROGRAM.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-PROGRAM.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-PROGRAM.Tpo -c -o 
girl-GIRL-PROGRAM.obj `if test -f 'GIRL-PROGRAM.c'; then $(CYGPATH_W) 'GIRL-PROGRAM.c'; else $(CYGPATH_W) 
'$(srcdir)/GIRL-PROGRAM.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-PROGRAM.Tpo $(DEPDIR)/girl-GIRL-PROGRAM.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-PROGRAM.c' object='girl-GIRL-PROGRAM.obj' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-program.obj: girl-program.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-program.obj -MD -MP -MF $(DEPDIR)/girl-girl-program.Tpo -c -o 
girl-girl-program.obj `if test -f 'girl-program.c'; then $(CYGPATH_W) 'girl-program.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-program.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-program.Tpo $(DEPDIR)/girl-girl-program.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-program.c' object='girl-girl-program.obj' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-PROGRAM.obj `if test -f 'GIRL-PROGRAM.c'; then 
$(CYGPATH_W) 'GIRL-PROGRAM.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-PROGRAM.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-program.obj `if test -f 'girl-program.c'; then 
$(CYGPATH_W) 'girl-program.c'; else $(CYGPATH_W) '$(srcdir)/girl-program.c'; fi`
 
-girl-GIRL-RUNNERS.o: GIRL-RUNNERS.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-RUNNERS.o -MD -MP -MF $(DEPDIR)/girl-GIRL-RUNNERS.Tpo -c -o 
girl-GIRL-RUNNERS.o `test -f 'GIRL-RUNNERS.c' || echo '$(srcdir)/'`GIRL-RUNNERS.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-RUNNERS.Tpo $(DEPDIR)/girl-GIRL-RUNNERS.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-RUNNERS.c' object='girl-GIRL-RUNNERS.o' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-player.o: girl-player.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-player.o -MD -MP -MF $(DEPDIR)/girl-girl-player.Tpo -c -o 
girl-girl-player.o `test -f 'girl-player.c' || echo '$(srcdir)/'`girl-player.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-player.Tpo $(DEPDIR)/girl-girl-player.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-player.c' object='girl-girl-player.o' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-RUNNERS.o `test -f 'GIRL-RUNNERS.c' || echo 
'$(srcdir)/'`GIRL-RUNNERS.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-player.o `test -f 'girl-player.c' || echo 
'$(srcdir)/'`girl-player.c
 
-girl-GIRL-RUNNERS.obj: GIRL-RUNNERS.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-RUNNERS.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-RUNNERS.Tpo -c -o 
girl-GIRL-RUNNERS.obj `if test -f 'GIRL-RUNNERS.c'; then $(CYGPATH_W) 'GIRL-RUNNERS.c'; else $(CYGPATH_W) 
'$(srcdir)/GIRL-RUNNERS.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-RUNNERS.Tpo $(DEPDIR)/girl-GIRL-RUNNERS.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-RUNNERS.c' object='girl-GIRL-RUNNERS.obj' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-player.obj: girl-player.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-player.obj -MD -MP -MF $(DEPDIR)/girl-girl-player.Tpo -c -o 
girl-girl-player.obj `if test -f 'girl-player.c'; then $(CYGPATH_W) 'girl-player.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-player.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-player.Tpo $(DEPDIR)/girl-girl-player.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-player.c' object='girl-girl-player.obj' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-RUNNERS.obj `if test -f 'GIRL-RUNNERS.c'; then 
$(CYGPATH_W) 'GIRL-RUNNERS.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-RUNNERS.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-player.obj `if test -f 'girl-player.c'; then 
$(CYGPATH_W) 'girl-player.c'; else $(CYGPATH_W) '$(srcdir)/girl-player.c'; fi`
 
-girl-GIRL-STATION.o: GIRL-STATION.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-STATION.o -MD -MP -MF $(DEPDIR)/girl-GIRL-STATION.Tpo -c -o 
girl-GIRL-STATION.o `test -f 'GIRL-STATION.c' || echo '$(srcdir)/'`GIRL-STATION.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-STATION.Tpo $(DEPDIR)/girl-GIRL-STATION.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-STATION.c' object='girl-GIRL-STATION.o' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-player-backend.o: girl-player-backend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-player-backend.o -MD -MP -MF $(DEPDIR)/girl-girl-player-backend.Tpo -c 
-o girl-girl-player-backend.o `test -f 'girl-player-backend.c' || echo '$(srcdir)/'`girl-player-backend.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-player-backend.Tpo 
$(DEPDIR)/girl-girl-player-backend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-player-backend.c' 
object='girl-girl-player-backend.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-STATION.o `test -f 'GIRL-STATION.c' || echo 
'$(srcdir)/'`GIRL-STATION.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-player-backend.o `test -f 'girl-player-backend.c' || 
echo '$(srcdir)/'`girl-player-backend.c
 
-girl-GIRL-STATION.obj: GIRL-STATION.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-STATION.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-STATION.Tpo -c -o 
girl-GIRL-STATION.obj `if test -f 'GIRL-STATION.c'; then $(CYGPATH_W) 'GIRL-STATION.c'; else $(CYGPATH_W) 
'$(srcdir)/GIRL-STATION.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-STATION.Tpo $(DEPDIR)/girl-GIRL-STATION.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-STATION.c' object='girl-GIRL-STATION.obj' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-player-backend.obj: girl-player-backend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-player-backend.obj -MD -MP -MF $(DEPDIR)/girl-girl-player-backend.Tpo 
-c -o girl-girl-player-backend.obj `if test -f 'girl-player-backend.c'; then $(CYGPATH_W) 
'girl-player-backend.c'; else $(CYGPATH_W) '$(srcdir)/girl-player-backend.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-player-backend.Tpo 
$(DEPDIR)/girl-girl-player-backend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-player-backend.c' 
object='girl-girl-player-backend.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-STATION.obj `if test -f 'GIRL-STATION.c'; then 
$(CYGPATH_W) 'GIRL-STATION.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-STATION.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-player-backend.obj `if test -f 'girl-player-backend.c'; 
then $(CYGPATH_W) 'girl-player-backend.c'; else $(CYGPATH_W) '$(srcdir)/girl-player-backend.c'; fi`
 
-girl-GIRL-STATIONS-MAP.o: GIRL-STATIONS-MAP.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-STATIONS-MAP.o -MD -MP -MF $(DEPDIR)/girl-GIRL-STATIONS-MAP.Tpo -c -o 
girl-GIRL-STATIONS-MAP.o `test -f 'GIRL-STATIONS-MAP.c' || echo '$(srcdir)/'`GIRL-STATIONS-MAP.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-STATIONS-MAP.Tpo 
$(DEPDIR)/girl-GIRL-STATIONS-MAP.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-STATIONS-MAP.c' 
object='girl-GIRL-STATIONS-MAP.o' libtool=no @AMDEPBACKSLASH@
+girl-girl-player-frontend.o: girl-player-frontend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-player-frontend.o -MD -MP -MF $(DEPDIR)/girl-girl-player-frontend.Tpo 
-c -o girl-girl-player-frontend.o `test -f 'girl-player-frontend.c' || echo 
'$(srcdir)/'`girl-player-frontend.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-player-frontend.Tpo 
$(DEPDIR)/girl-girl-player-frontend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-player-frontend.c' 
object='girl-girl-player-frontend.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-STATIONS-MAP.o `test -f 'GIRL-STATIONS-MAP.c' || echo 
'$(srcdir)/'`GIRL-STATIONS-MAP.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-player-frontend.o `test -f 'girl-player-frontend.c' || 
echo '$(srcdir)/'`girl-player-frontend.c
 
-girl-GIRL-STATIONS-MAP.obj: GIRL-STATIONS-MAP.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-STATIONS-MAP.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-STATIONS-MAP.Tpo -c 
-o girl-GIRL-STATIONS-MAP.obj `if test -f 'GIRL-STATIONS-MAP.c'; then $(CYGPATH_W) 'GIRL-STATIONS-MAP.c'; 
else $(CYGPATH_W) '$(srcdir)/GIRL-STATIONS-MAP.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-STATIONS-MAP.Tpo 
$(DEPDIR)/girl-GIRL-STATIONS-MAP.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-STATIONS-MAP.c' 
object='girl-GIRL-STATIONS-MAP.obj' libtool=no @AMDEPBACKSLASH@
+girl-girl-player-frontend.obj: girl-player-frontend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-player-frontend.obj -MD -MP -MF 
$(DEPDIR)/girl-girl-player-frontend.Tpo -c -o girl-girl-player-frontend.obj `if test -f 
'girl-player-frontend.c'; then $(CYGPATH_W) 'girl-player-frontend.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-player-frontend.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-player-frontend.Tpo 
$(DEPDIR)/girl-girl-player-frontend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-player-frontend.c' 
object='girl-girl-player-frontend.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-STATIONS-MAP.obj `if test -f 'GIRL-STATIONS-MAP.c'; then 
$(CYGPATH_W) 'GIRL-STATIONS-MAP.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-STATIONS-MAP.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-player-frontend.obj `if test -f 
'girl-player-frontend.c'; then $(CYGPATH_W) 'girl-player-frontend.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-player-frontend.c'; fi`
 
-girl-GIRL-STREAMS.o: GIRL-STREAMS.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-STREAMS.o -MD -MP -MF $(DEPDIR)/girl-GIRL-STREAMS.Tpo -c -o 
girl-GIRL-STREAMS.o `test -f 'GIRL-STREAMS.c' || echo '$(srcdir)/'`GIRL-STREAMS.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-STREAMS.Tpo $(DEPDIR)/girl-GIRL-STREAMS.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-STREAMS.c' object='girl-GIRL-STREAMS.o' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-record.o: girl-record.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-record.o -MD -MP -MF $(DEPDIR)/girl-girl-record.Tpo -c -o 
girl-girl-record.o `test -f 'girl-record.c' || echo '$(srcdir)/'`girl-record.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-record.Tpo $(DEPDIR)/girl-girl-record.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-record.c' object='girl-girl-record.o' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-STREAMS.o `test -f 'GIRL-STREAMS.c' || echo 
'$(srcdir)/'`GIRL-STREAMS.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-record.o `test -f 'girl-record.c' || echo 
'$(srcdir)/'`girl-record.c
 
-girl-GIRL-STREAMS.obj: GIRL-STREAMS.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-STREAMS.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-STREAMS.Tpo -c -o 
girl-GIRL-STREAMS.obj `if test -f 'GIRL-STREAMS.c'; then $(CYGPATH_W) 'GIRL-STREAMS.c'; else $(CYGPATH_W) 
'$(srcdir)/GIRL-STREAMS.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-STREAMS.Tpo $(DEPDIR)/girl-GIRL-STREAMS.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-STREAMS.c' object='girl-GIRL-STREAMS.obj' 
libtool=no @AMDEPBACKSLASH@
+girl-girl-record.obj: girl-record.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-record.obj -MD -MP -MF $(DEPDIR)/girl-girl-record.Tpo -c -o 
girl-girl-record.obj `if test -f 'girl-record.c'; then $(CYGPATH_W) 'girl-record.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-record.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-record.Tpo $(DEPDIR)/girl-girl-record.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-record.c' object='girl-girl-record.obj' 
libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-STREAMS.obj `if test -f 'GIRL-STREAMS.c'; then 
$(CYGPATH_W) 'GIRL-STREAMS.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-STREAMS.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-record.obj `if test -f 'girl-record.c'; then 
$(CYGPATH_W) 'girl-record.c'; else $(CYGPATH_W) '$(srcdir)/girl-record.c'; fi`
 
-girl-GIRL-TZ.o: GIRL-TZ.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-TZ.o -MD -MP -MF $(DEPDIR)/girl-GIRL-TZ.Tpo -c -o girl-GIRL-TZ.o `test 
-f 'GIRL-TZ.c' || echo '$(srcdir)/'`GIRL-TZ.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-TZ.Tpo $(DEPDIR)/girl-GIRL-TZ.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-TZ.c' object='girl-GIRL-TZ.o' libtool=no 
@AMDEPBACKSLASH@
+girl-girl-record-backend.o: girl-record-backend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-record-backend.o -MD -MP -MF $(DEPDIR)/girl-girl-record-backend.Tpo -c 
-o girl-girl-record-backend.o `test -f 'girl-record-backend.c' || echo '$(srcdir)/'`girl-record-backend.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-record-backend.Tpo 
$(DEPDIR)/girl-girl-record-backend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-record-backend.c' 
object='girl-girl-record-backend.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-TZ.o `test -f 'GIRL-TZ.c' || echo '$(srcdir)/'`GIRL-TZ.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-record-backend.o `test -f 'girl-record-backend.c' || 
echo '$(srcdir)/'`girl-record-backend.c
 
-girl-GIRL-TZ.obj: GIRL-TZ.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL-TZ.obj -MD -MP -MF $(DEPDIR)/girl-GIRL-TZ.Tpo -c -o girl-GIRL-TZ.obj 
`if test -f 'GIRL-TZ.c'; then $(CYGPATH_W) 'GIRL-TZ.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-TZ.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL-TZ.Tpo $(DEPDIR)/girl-GIRL-TZ.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL-TZ.c' object='girl-GIRL-TZ.obj' libtool=no 
@AMDEPBACKSLASH@
+girl-girl-record-backend.obj: girl-record-backend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-record-backend.obj -MD -MP -MF $(DEPDIR)/girl-girl-record-backend.Tpo 
-c -o girl-girl-record-backend.obj `if test -f 'girl-record-backend.c'; then $(CYGPATH_W) 
'girl-record-backend.c'; else $(CYGPATH_W) '$(srcdir)/girl-record-backend.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-record-backend.Tpo 
$(DEPDIR)/girl-girl-record-backend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-record-backend.c' 
object='girl-girl-record-backend.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL-TZ.obj `if test -f 'GIRL-TZ.c'; then $(CYGPATH_W) 
'GIRL-TZ.c'; else $(CYGPATH_W) '$(srcdir)/GIRL-TZ.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-record-backend.obj `if test -f 'girl-record-backend.c'; 
then $(CYGPATH_W) 'girl-record-backend.c'; else $(CYGPATH_W) '$(srcdir)/girl-record-backend.c'; fi`
 
-girl-GIRL.o: GIRL.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL.o -MD -MP -MF $(DEPDIR)/girl-GIRL.Tpo -c -o girl-GIRL.o `test -f 
'GIRL.c' || echo '$(srcdir)/'`GIRL.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL.Tpo $(DEPDIR)/girl-GIRL.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL.c' object='girl-GIRL.o' libtool=no 
@AMDEPBACKSLASH@
+girl-girl-record-frontend.o: girl-record-frontend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-record-frontend.o -MD -MP -MF $(DEPDIR)/girl-girl-record-frontend.Tpo 
-c -o girl-girl-record-frontend.o `test -f 'girl-record-frontend.c' || echo 
'$(srcdir)/'`girl-record-frontend.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-record-frontend.Tpo 
$(DEPDIR)/girl-girl-record-frontend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-record-frontend.c' 
object='girl-girl-record-frontend.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL.o `test -f 'GIRL.c' || echo '$(srcdir)/'`GIRL.c
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-record-frontend.o `test -f 'girl-record-frontend.c' || 
echo '$(srcdir)/'`girl-record-frontend.c
 
-girl-GIRL.obj: GIRL.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-GIRL.obj -MD -MP -MF $(DEPDIR)/girl-GIRL.Tpo -c -o girl-GIRL.obj `if test 
-f 'GIRL.c'; then $(CYGPATH_W) 'GIRL.c'; else $(CYGPATH_W) '$(srcdir)/GIRL.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-GIRL.Tpo $(DEPDIR)/girl-GIRL.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='GIRL.c' object='girl-GIRL.obj' libtool=no 
@AMDEPBACKSLASH@
+girl-girl-record-frontend.obj: girl-record-frontend.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-record-frontend.obj -MD -MP -MF 
$(DEPDIR)/girl-girl-record-frontend.Tpo -c -o girl-girl-record-frontend.obj `if test -f 
'girl-record-frontend.c'; then $(CYGPATH_W) 'girl-record-frontend.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-record-frontend.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-record-frontend.Tpo 
$(DEPDIR)/girl-girl-record-frontend.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-record-frontend.c' 
object='girl-girl-record-frontend.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-GIRL.obj `if test -f 'GIRL.c'; then $(CYGPATH_W) 'GIRL.c'; 
else $(CYGPATH_W) '$(srcdir)/GIRL.c'; fi`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-record-frontend.obj `if test -f 
'girl-record-frontend.c'; then $(CYGPATH_W) 'girl-record-frontend.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-record-frontend.c'; fi`
+
+girl-girl-runners.o: girl-runners.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-runners.o -MD -MP -MF $(DEPDIR)/girl-girl-runners.Tpo -c -o 
girl-girl-runners.o `test -f 'girl-runners.c' || echo '$(srcdir)/'`girl-runners.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-runners.Tpo $(DEPDIR)/girl-girl-runners.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-runners.c' object='girl-girl-runners.o' 
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-runners.o `test -f 'girl-runners.c' || echo 
'$(srcdir)/'`girl-runners.c
+
+girl-girl-runners.obj: girl-runners.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-runners.obj -MD -MP -MF $(DEPDIR)/girl-girl-runners.Tpo -c -o 
girl-girl-runners.obj `if test -f 'girl-runners.c'; then $(CYGPATH_W) 'girl-runners.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-runners.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-runners.Tpo $(DEPDIR)/girl-girl-runners.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-runners.c' object='girl-girl-runners.obj' 
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-runners.obj `if test -f 'girl-runners.c'; then 
$(CYGPATH_W) 'girl-runners.c'; else $(CYGPATH_W) '$(srcdir)/girl-runners.c'; fi`
+
+girl-girl-station.o: girl-station.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-station.o -MD -MP -MF $(DEPDIR)/girl-girl-station.Tpo -c -o 
girl-girl-station.o `test -f 'girl-station.c' || echo '$(srcdir)/'`girl-station.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-station.Tpo $(DEPDIR)/girl-girl-station.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-station.c' object='girl-girl-station.o' 
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-station.o `test -f 'girl-station.c' || echo 
'$(srcdir)/'`girl-station.c
+
+girl-girl-station.obj: girl-station.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-station.obj -MD -MP -MF $(DEPDIR)/girl-girl-station.Tpo -c -o 
girl-girl-station.obj `if test -f 'girl-station.c'; then $(CYGPATH_W) 'girl-station.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-station.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-station.Tpo $(DEPDIR)/girl-girl-station.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-station.c' object='girl-girl-station.obj' 
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-station.obj `if test -f 'girl-station.c'; then 
$(CYGPATH_W) 'girl-station.c'; else $(CYGPATH_W) '$(srcdir)/girl-station.c'; fi`
+
+girl-girl-stations-map.o: girl-stations-map.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-stations-map.o -MD -MP -MF $(DEPDIR)/girl-girl-stations-map.Tpo -c -o 
girl-girl-stations-map.o `test -f 'girl-stations-map.c' || echo '$(srcdir)/'`girl-stations-map.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-stations-map.Tpo 
$(DEPDIR)/girl-girl-stations-map.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-stations-map.c' 
object='girl-girl-stations-map.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-stations-map.o `test -f 'girl-stations-map.c' || echo 
'$(srcdir)/'`girl-stations-map.c
+
+girl-girl-stations-map.obj: girl-stations-map.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-stations-map.obj -MD -MP -MF $(DEPDIR)/girl-girl-stations-map.Tpo -c 
-o girl-girl-stations-map.obj `if test -f 'girl-stations-map.c'; then $(CYGPATH_W) 'girl-stations-map.c'; 
else $(CYGPATH_W) '$(srcdir)/girl-stations-map.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-stations-map.Tpo 
$(DEPDIR)/girl-girl-stations-map.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-stations-map.c' 
object='girl-girl-stations-map.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-stations-map.obj `if test -f 'girl-stations-map.c'; then 
$(CYGPATH_W) 'girl-stations-map.c'; else $(CYGPATH_W) '$(srcdir)/girl-stations-map.c'; fi`
+
+girl-girl-streams.o: girl-streams.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-streams.o -MD -MP -MF $(DEPDIR)/girl-girl-streams.Tpo -c -o 
girl-girl-streams.o `test -f 'girl-streams.c' || echo '$(srcdir)/'`girl-streams.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-streams.Tpo $(DEPDIR)/girl-girl-streams.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-streams.c' object='girl-girl-streams.o' 
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-streams.o `test -f 'girl-streams.c' || echo 
'$(srcdir)/'`girl-streams.c
+
+girl-girl-streams.obj: girl-streams.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-streams.obj -MD -MP -MF $(DEPDIR)/girl-girl-streams.Tpo -c -o 
girl-girl-streams.obj `if test -f 'girl-streams.c'; then $(CYGPATH_W) 'girl-streams.c'; else $(CYGPATH_W) 
'$(srcdir)/girl-streams.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-streams.Tpo $(DEPDIR)/girl-girl-streams.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-streams.c' object='girl-girl-streams.obj' 
libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-streams.obj `if test -f 'girl-streams.c'; then 
$(CYGPATH_W) 'girl-streams.c'; else $(CYGPATH_W) '$(srcdir)/girl-streams.c'; fi`
+
+girl-girl-tz.o: girl-tz.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-tz.o -MD -MP -MF $(DEPDIR)/girl-girl-tz.Tpo -c -o girl-girl-tz.o `test 
-f 'girl-tz.c' || echo '$(srcdir)/'`girl-tz.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-tz.Tpo $(DEPDIR)/girl-girl-tz.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-tz.c' object='girl-girl-tz.o' libtool=no 
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-tz.o `test -f 'girl-tz.c' || echo '$(srcdir)/'`girl-tz.c
+
+girl-girl-tz.obj: girl-tz.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl-tz.obj -MD -MP -MF $(DEPDIR)/girl-girl-tz.Tpo -c -o girl-girl-tz.obj 
`if test -f 'girl-tz.c'; then $(CYGPATH_W) 'girl-tz.c'; else $(CYGPATH_W) '$(srcdir)/girl-tz.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl-tz.Tpo $(DEPDIR)/girl-girl-tz.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl-tz.c' object='girl-girl-tz.obj' libtool=no 
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl-tz.obj `if test -f 'girl-tz.c'; then $(CYGPATH_W) 
'girl-tz.c'; else $(CYGPATH_W) '$(srcdir)/girl-tz.c'; fi`
+
+girl-girl.o: girl.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl.o -MD -MP -MF $(DEPDIR)/girl-girl.Tpo -c -o girl-girl.o `test -f 
'girl.c' || echo '$(srcdir)/'`girl.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl.Tpo $(DEPDIR)/girl-girl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl.c' object='girl-girl.o' libtool=no 
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl.o `test -f 'girl.c' || echo '$(srcdir)/'`girl.c
+
+girl-girl.obj: girl.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(girl_CFLAGS) $(CFLAGS) -MT girl-girl.obj -MD -MP -MF $(DEPDIR)/girl-girl.Tpo -c -o girl-girl.obj `if test 
-f 'girl.c'; then $(CYGPATH_W) 'girl.c'; else $(CYGPATH_W) '$(srcdir)/girl.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/girl-girl.Tpo $(DEPDIR)/girl-girl.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='girl.c' object='girl-girl.obj' libtool=no 
@AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS) $(girl_CFLAGS) $(CFLAGS) -c -o girl-girl.obj `if test -f 'girl.c'; then $(CYGPATH_W) 'girl.c'; 
else $(CYGPATH_W) '$(srcdir)/girl.c'; fi`
 
 test_endianess-test-endianess.o: test-endianess.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(test_endianess_CFLAGS) $(CFLAGS) -MT test_endianess-test-endianess.o -MD -MP -MF 
$(DEPDIR)/test_endianess-test-endianess.Tpo -c -o test_endianess-test-endianess.o `test -f 'test-endianess.c' 
|| echo '$(srcdir)/'`test-endianess.c
diff --git a/src/girl.c b/src/girl.c
index 92eaac6..3686e5e 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -869,186 +869,6 @@ void about_streams(GtkWidget * a, gpointer user_data)
 
 }
 
-GtkWidget *create_search_selector(void) {
-
-       GirlStationInfo *stationinfo, *localstation;
-       GtkWidget *search_selector, *content_area;
-       GtkWidget *align, *textentry;
-       GtkEntryCompletion *completion;
-       GtkListStore *model;
-       GtkTreeIter iter;
-       
-       gchar *world_station_xml_filename, *local_station_xml_file;
-
-       /* int i = 0, search_selection = -1; */
-
-       GStatBuf stats;
-
-       memset(&stats, 0, sizeof(stats));
-
-       /* The Stations dialog */
-       search_selector = gtk_dialog_new_with_buttons(_("Search by location"), GTK_WINDOW(girl_app), 0, /* 
flags */
-                                                       GTK_STOCK_CLOSE,
-                                                       GTK_RESPONSE_ACCEPT,
-                                                       NULL);
-       content_area = gtk_dialog_get_content_area (GTK_DIALOG (search_selector));
-       gtk_container_set_border_width
-           (GTK_CONTAINER(GTK_DIALOG(search_selector)->vbox), 6);
-
-       align = gtk_alignment_new(0.5, 0.5, 0, 0);
-       gtk_container_add(GTK_CONTAINER
-                         (GTK_DIALOG(search_selector)->vbox), align);
-       gtk_container_set_border_width(GTK_CONTAINER(align), 6);
-       gtk_widget_show(align);
-
-       textentry = gtk_entry_new();
-       completion = gtk_entry_completion_new();
-       gtk_entry_completion_set_text_column(completion, STATION_NAME);
-       gtk_entry_completion_set_text_column(completion, STATION_LOCATION);
-       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, 
G_TYPE_STRING);
-
-       world_station_xml_filename = g_strconcat(GIRL_DATADIR, "/girl.xml", NULL);
-       GIRL_DEBUG_MSG("world_station_xml_filename = %s\n",
-           world_station_xml_filename);
-
-       if (world_station_xml_filename == NULL) {
-               g_warning(("Failed to open %s.  Please install it.\n"),
-                         world_station_xml_filename);
-       }
-
-       local_station_xml_file =
-           g_strconcat(g_get_home_dir(), "/.girl/girl.xml", NULL);
-
-       if (!g_stat(local_station_xml_file, &stats)) {
-               localstation = girl_station_load_from_file(NULL, local_station_xml_file);
-       } else {
-               localstation = NULL;
-       }
-
-       if (localstation == NULL) {
-               g_warning(_("Failed to open %s.\n"), local_station_xml_file);
-       }
-
-/*   g_free (local_station_xml_file); */
-
-       stationinfo =
-           girl_station_load_from_file(localstation,
-                                       world_station_xml_filename);
-
-       girl_stations = NULL;
-
-       while (stationinfo != NULL) {
-
-               gtk_list_store_append(model, &iter);
-               gtk_list_store_set(model,
-                                  &iter,
-                                  STATION_NAME,
-                                  stationinfo->name,
-                                  STATION_LOCATION,
-                                  stationinfo->location,
-                                  STATION_URI,
-                                  stationinfo->stream->uri,
-                                  STATION_DESCRIPTION,
-                                  stationinfo->description,
-                                  STATION_FREQUENCY,
-                                  stationinfo->frequency,
-                                  STATION_BAND,
-                                  stationinfo->band,
-                                  STATION_TYPE,
-                                  stationinfo->type,
-                                  STATION_RANK,
-                                  stationinfo->rank,
-                                  STATION_BITRATE,
-                                  stationinfo->bitrate,
-                                  STATION_SAMPLERATE,
-                                  stationinfo->samplerate,
-                                  STATION_ID,
-                                  stationinfo->id,
-                                  -1);
-
-               stationinfo = stationinfo->next;
-       }
-
-       gtk_entry_completion_set_model(completion, GTK_TREE_MODEL(model));
-
-       gtk_widget_show(textentry);     
-       gtk_container_add(GTK_CONTAINER(content_area), textentry);
-       
-#if 0
-       /* label = */
-               /*     g_strconcat(stationinfo->name, " (", */
-               /*              stationinfo->location, ")", NULL); */
-               /* station_uri = g_strdup(stationinfo->stream->uri); */
-               /* station_name = g_strdup(stationinfo->name); */
-               /* station_location = g_strdup(stationinfo->location); */
-               /* station_band = g_strdup(stationinfo->band); */
-               /* station_description = g_strdup(stationinfo->description); */
-               /* station_website = g_strdup(stationinfo->uri); */
-               
-               /* girl_stations = g_list_append(girl_stations,(GirlStationInfo *)stationinfo); */
-
-               if (label != NULL) {
-                       /* item = gtk_menu_item_new_with_label(label); */
-                       /* gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); */
-                       g_signal_connect(G_OBJECT(item), "activate",
-                                        G_CALLBACK
-                                        (on_stations_selector_changed),
-                                        NULL);
-                       g_object_set_data(G_OBJECT(item), "station_uri",
-                                         (gpointer) station_uri);
-                       g_object_set_data(G_OBJECT(item), "station_name",
-                                         (gpointer) station_name);
-                       g_object_set_data(G_OBJECT(item),
-                                         "station_location",
-                                         (gpointer) station_location);
-                       g_object_set_data(G_OBJECT(item),
-                                         "station_band",
-                                         (gpointer) station_band);
-                       g_object_set_data(G_OBJECT(item),
-                                         "station_description",
-                                         (gpointer) station_description);
-                       g_object_set_data(G_OBJECT(item),
-                                         "station_website",
-                                         (gpointer) station_website);
-                       gtk_widget_show(item);
-                       g_free(label);
-
-                       /* selection */
-#if 0 /* FIXME */
-                       if (selected_station_uri != NULL && 
-                           !strcmp(selected_station_uri, station_uri))
-                               search_selection = i;
-#endif
-               } else {
-                       g_free(station_uri);
-                       g_free(station_name);
-                       g_free(station_location);
-                       g_free(station_band);
-                       g_free(station_description);
-               }
-               i++;
-       }
-       
-       /* drop_down = gtk_option_menu_new(); */
-       /* gtk_widget_show(drop_down); */
-       /* gtk_option_menu_set_menu(GTK_OPTION_MENU(drop_down), menu); */
-       /* gtk_container_add(GTK_CONTAINER(align), drop_down); */
-
-       /* if (selection != -1) */
-       /*      gtk_option_menu_set_history(GTK_OPTION_MENU(drop_down), selection); */
-#endif 
-       g_signal_connect(G_OBJECT(search_selector), "response",
-                        G_CALLBACK(gtk_widget_hide),
-                        (gpointer) search_selector);
-       g_signal_connect(G_OBJECT(search_selector), "delete-event",
-                        G_CALLBACK(gtk_widget_hide),
-                        (gpointer) search_selector);
-
-       return search_selector;
-}
 
 void on_search_button_clicked(GtkWidget *a, gpointer user_data)
 {
@@ -1060,8 +880,6 @@ void on_search_button_clicked(GtkWidget *a, gpointer user_data)
        appbar_send_msg(_("Search radio station by location"));
 }
 
-
-
 void on_listen_button_clicked(GtkWidget *a, gpointer user_data)
 {
 
diff --git a/src/girl.xml b/src/girl.xml
index caf424b..70baf01 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="girl.xsl" ?>
-<!DOCTYPE girl SYSTEM "girl-9.9.dtd">
-<girl version="9.9.0">
+<!DOCTYPE girl SYSTEM "girl-9.8.dtd">
+<girl version="9.8.1">
   <station band="91.3FM" id="kced" lang="en" name="KCED - Centralia College's Radio" rank="1.0" type="edu">
     <frequency uri="http://www.centralia.edu/kced/";>91.3FM in Centralia, DC</frequency>
     <location>Centralia, DC</location>


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