[girl] GIRL 8.4.1
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [girl] GIRL 8.4.1
- Date: Wed, 27 Apr 2016 15:50:15 +0000 (UTC)
commit be60bf6c56fd5fe749e3fd0a04a8a04994f8e071
Author: Ole Aamot <oka oka no>
Date: Wed Apr 27 17:49:53 2016 +0200
GIRL 8.4.1
AUTHORS | 1 +
README | 14 ++
THANKS | 1 +
configure | 20 ++--
configure.ac | 2 +-
debian/changelog | 6 +
girl.spec.in | 3 +
src/girl-gui.c | 10 +-
src/girl-station.c | 6 +-
src/girl-stations-map.c | 378 +++++++++++++++++++++++-----------------------
src/girl.c | 7 +-
src/girl.xml | 26 +++-
12 files changed, 262 insertions(+), 212 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index f48c815..deb88e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -23,3 +23,4 @@ Mathilde Agostini <mathilde agostini outlook com> (Icon design)
Necdet Yücel <necdetyucel gmail com> (Turkish translation)
Andy Daniel Cruz Campos <god_of_war_2 hotmail com> (Spanish translation)
MироÑлав Ðиколић <miroslavnikolic rocketmail com> (Serbian translation)
+Balázs Meskó <meskobalazs gmail com> (Hungarian translation)
diff --git a/README b/README
index 5ad4149..2676717 100644
--- a/README
+++ b/README
@@ -1,4 +1,18 @@
================
+GIRL 8.4.1 notes
+================
+
+GIRL 8.4.1 was released April 27th, 2016 with support for Radio USP
+at Universidade de São Paulo in Brazil and Radio UChile in Santiago,
+Chile.
+
+Updated translations for Polish (Piotr DrÄ…g), Serbian (МироÑлав
+Ðиколић), Hungarian (Balázs Meskó), Brazilian Portuguese (Rafael
+Fontenelle), German (Mario Blättermann), added GUI credits by
+translator Rafael Fontenelle, and documenter Daniel Mustieles.
+
+
+================
GIRL 8.4.0 notes
================
diff --git a/THANKS b/THANKS
index 6e04a77..7ca60e1 100644
--- a/THANKS
+++ b/THANKS
@@ -28,3 +28,4 @@ Necdet Yücel for Turkish translation.
Rafael Fontenelle for Brazilian Portuguese translation.
Andy Daniel Cruz Campos for Spanish translation.
MироÑлав Ðиколић for Serbian translation.
+Balázs Meskó for Hungarian translation.
diff --git a/configure b/configure
index 24c9b1b..f4cf259 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 8.4.0.
+# Generated by GNU Autoconf 2.69 for girl 8.4.1.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='girl'
PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='8.4.0'
-PACKAGE_STRING='girl 8.4.0'
+PACKAGE_VERSION='8.4.1'
+PACKAGE_STRING='girl 8.4.1'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures girl 8.4.0 to adapt to many kinds of systems.
+\`configure' configures girl 8.4.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of girl 8.4.0:";;
+ short | recursive ) echo "Configuration of girl 8.4.1:";;
esac
cat <<\_ACEOF
@@ -1545,7 +1545,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-girl configure 8.4.0
+girl configure 8.4.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1910,7 +1910,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by girl $as_me 8.4.0, which was
+It was created by girl $as_me 8.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2773,7 +2773,7 @@ fi
# Define the identity of the package.
PACKAGE='girl'
- VERSION='8.4.0'
+ VERSION='8.4.1'
cat >>confdefs.h <<_ACEOF
@@ -7457,7 +7457,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 8.4.0, which was
+This file was extended by girl $as_me 8.4.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7523,7 +7523,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-girl config.status 8.4.0
+girl config.status 8.4.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 2743145..5c1a739 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(girl, 8.4.0)
+AC_INIT(girl, 8.4.1)
AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/girl.c])
AC_CONFIG_HEADER([config.h])
diff --git a/debian/changelog b/debian/changelog
index a1bbac9..c13abfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+girl (8.4.1-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Ole Aamot <ole src gnome org> Wed, 27 Apr 2016 17:28:00 +0000
+
girl (8.4.0-1) unstable; urgency=medium
* New upstream release
diff --git a/girl.spec.in b/girl.spec.in
index 3da2ccc..66eb6dc 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -70,6 +70,9 @@ fi
%{_datadir}/help/*/%{name}
%changelog
+* Wed Apr 27 2016 Ole Aamot - 8.4.1-1.fc23
+- Girl 8.4.1 build on Fedora Linux 23
+
* Tue Mar 08 2016 Ole Aamot - 8.4.0-1.fc23
- Girl 8.4.0 build on Fedora Linux 23
diff --git a/src/girl-gui.c b/src/girl-gui.c
index 8e8bc7c..ded826a 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
+#include <locale.h>
#include <sys/stat.h>
#ifdef HAVE_CONFIG_H
@@ -764,21 +765,20 @@ on_location_matches(GtkEntryCompletion *widget,
GtkWidget *create_new_station_selector(void) {
- GirlStationInfo *stationinfo, *localstation;
- GtkWidget *station_selector, *content_area, *item;
+ GirlStationInfo *localstation, *stationinfo;
+ GtkWidget *station_selector, *content_area;
GtkWidget *align;
GtkWidget *bandentry, *descriptionentry, *nameentry, *locationentry, *urientry, *websiteentry;
GtkEntryCompletion *completion;
GtkListStore *location_model;
GtkTreeIter iter;
-
+ gint retval;
TzDB *db;
GPtrArray *locs;
guint i;
char *pixmap_dir;
- int retval = 0;
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, "C");
gchar *world_station_xml_filename, *local_station_xml_file;
diff --git a/src/girl-station.c b/src/girl-station.c
index 1ab2fe0..88e40de 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -618,11 +618,10 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
/* Open ~/.girl/girl.xml. Parse structure. Insert new item. Save structure. */
GirlStationInfo *new_station;
GirlStationInfo *stationinfo;
- GList *girl_local_stations = NULL;
+ /* GList *girl_local_stations = NULL; */
gchar *local_station_uri, *local_station_name, *local_station_location, *local_station_band,
*local_station_description, *local_station_website;
- gchar *label, *world_station_xml_filename, *local_station_xml_file;
gchar *stations = g_strconcat(g_get_home_dir(), "/.girl/girl.xml", NULL);
- GList *l = NULL;
+ /* GList *l = NULL; */
stationinfo = girl_station_load_from_file(NULL, stations);
@@ -656,4 +655,5 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
g_free(stations);
g_free(new_station);
g_free(stationinfo);
+ return (0);
}
diff --git a/src/girl-stations-map.c b/src/girl-stations-map.c
index c690165..abe1af1 100644
--- a/src/girl-stations-map.c
+++ b/src/girl-stations-map.c
@@ -185,99 +185,99 @@ girl_stations_map_finalize (GObject *object)
}
/* GtkWidget functions */
-static void
-girl_stations_map_get_preferred_width (GtkWidget *widget,
- gint *minimum,
- gint *natural)
-{
- GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv;
- gint size;
-
- size = gdk_pixbuf_get_width (priv->orig_background);
-
- if (minimum != NULL)
- *minimum = size;
- if (natural != NULL)
- *natural = size;
-}
-
-static void
-girl_stations_map_get_preferred_height (GtkWidget *widget,
- gint *minimum,
- gint *natural)
-{
- GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv;
- gint size;
-
- size = gdk_pixbuf_get_height (priv->orig_background);
-
- if (minimum != NULL)
- *minimum = size;
- if (natural != NULL)
- *natural = size;
-}
-
-static void
-girl_stations_map_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
-{
- GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv;
- GdkPixbuf *pixbuf;
-
- if (priv->background)
- g_object_unref (priv->background);
-
- if (!gtk_widget_is_sensitive (widget))
- pixbuf = priv->orig_background_dim;
- else
- pixbuf = priv->orig_background;
-
- priv->background = gdk_pixbuf_scale_simple (pixbuf,
- allocation->width,
- allocation->height,
- GDK_INTERP_BILINEAR);
-
- if (priv->color_map)
- g_object_unref (priv->color_map);
-
- priv->color_map = gdk_pixbuf_scale_simple (priv->orig_color_map,
- allocation->width,
- allocation->height,
- GDK_INTERP_BILINEAR);
-
- priv->visible_map_pixels = gdk_pixbuf_get_pixels (priv->color_map);
- priv->visible_map_rowstride = gdk_pixbuf_get_rowstride (priv->color_map);
-
- GTK_WIDGET_CLASS (girl_stations_map_parent_class)->size_allocate (widget,
- allocation);
-}
-
-static void
-girl_stations_map_realize (GtkWidget *widget)
-{
- GdkWindowAttr attr = { 0, };
- GtkAllocation allocation;
- GdkWindow *window;
-
- gtk_widget_get_allocation (widget, &allocation);
-
- gtk_widget_set_realized (widget, TRUE);
-
- attr.window_type = GDK_WINDOW_CHILD;
- attr.wclass = GDK_INPUT_OUTPUT;
- attr.width = allocation.width;
- attr.height = allocation.height;
- attr.x = allocation.x;
- attr.y = allocation.y;
- attr.event_mask = gtk_widget_get_events (widget)
- | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK;
-
- window = gdk_window_new (gtk_widget_get_parent_window (widget), &attr,
- GDK_WA_X | GDK_WA_Y);
-
- gdk_window_set_user_data (window, widget);
- gtk_widget_set_window (widget, window);
-}
+/* static void */
+/* girl_stations_map_get_preferred_width (GtkWidget *widget, */
+/* gint *minimum, */
+/* gint *natural) */
+/* { */
+/* GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv; */
+/* gint size; */
+
+/* size = gdk_pixbuf_get_width (priv->orig_background); */
+
+/* if (minimum != NULL) */
+/* *minimum = size; */
+/* if (natural != NULL) */
+/* *natural = size; */
+/* } */
+
+/* static void */
+/* girl_stations_map_get_preferred_height (GtkWidget *widget, */
+/* gint *minimum, */
+/* gint *natural) */
+/* { */
+/* GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv; */
+/* gint size; */
+
+/* size = gdk_pixbuf_get_height (priv->orig_background); */
+
+/* if (minimum != NULL) */
+/* *minimum = size; */
+/* if (natural != NULL) */
+/* *natural = size; */
+/* } */
+
+/* static void */
+/* girl_stations_map_size_allocate (GtkWidget *widget, */
+/* GtkAllocation *allocation) */
+/* { */
+/* GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv; */
+/* GdkPixbuf *pixbuf; */
+
+/* if (priv->background) */
+/* g_object_unref (priv->background); */
+
+/* if (!gtk_widget_is_sensitive (widget)) */
+/* pixbuf = priv->orig_background_dim; */
+/* else */
+/* pixbuf = priv->orig_background; */
+
+/* priv->background = gdk_pixbuf_scale_simple (pixbuf, */
+/* allocation->width, */
+/* allocation->height, */
+/* GDK_INTERP_BILINEAR); */
+
+/* if (priv->color_map) */
+/* g_object_unref (priv->color_map); */
+
+/* priv->color_map = gdk_pixbuf_scale_simple (priv->orig_color_map, */
+/* allocation->width, */
+/* allocation->height, */
+/* GDK_INTERP_BILINEAR); */
+
+/* priv->visible_map_pixels = gdk_pixbuf_get_pixels (priv->color_map); */
+/* priv->visible_map_rowstride = gdk_pixbuf_get_rowstride (priv->color_map); */
+
+/* GTK_WIDGET_CLASS (girl_stations_map_parent_class)->size_allocate (widget, */
+/* allocation); */
+/* } */
+
+/* static void */
+/* girl_stations_map_realize (GtkWidget *widget) */
+/* { */
+/* GdkWindowAttr attr = { 0, }; */
+/* GtkAllocation allocation; */
+/* GdkWindow *window; */
+
+/* gtk_widget_get_allocation (widget, &allocation); */
+
+/* gtk_widget_set_realized (widget, TRUE); */
+
+/* attr.window_type = GDK_WINDOW_CHILD; */
+/* attr.wclass = GDK_INPUT_OUTPUT; */
+/* attr.width = allocation.width; */
+/* attr.height = allocation.height; */
+/* attr.x = allocation.x; */
+/* attr.y = allocation.y; */
+/* attr.event_mask = gtk_widget_get_events (widget) */
+/* | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK; */
+
+/* window = gdk_window_new (gtk_widget_get_parent_window (widget), &attr, */
+/* GDK_WA_X | GDK_WA_Y); */
+
+/* gdk_window_set_user_data (window, widget); */
+/* gtk_widget_set_window (widget, window); */
+/* } */
static gdouble
@@ -388,101 +388,101 @@ draw_text_bubble (cairo_t *cr,
cairo_restore (cr);
}
-static gboolean
-girl_stations_map_draw (GtkWidget *widget,
- cairo_t *cr)
-{
- GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv;
- GdkPixbuf *hilight, *orig_hilight;
- GtkAllocation alloc;
- gchar *file;
- GError *err = NULL;
- gdouble pointx, pointy;
- char buf[16];
- const char *fmt;
-
- gtk_widget_get_allocation (widget, &alloc);
-
- /* paint background */
- gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0);
- cairo_paint (cr);
-
- /* paint hilight */
- if (gtk_widget_is_sensitive (widget))
- fmt = GIRL_RESOURCE_PATH "/timezone_%s.png";
- else
- fmt = GIRL_RESOURCE_PATH "/timezone_%s_dim.png";
-
- file = g_strdup_printf (fmt,
- g_ascii_formatd (buf, sizeof (buf),
- "%g", priv->selected_offset));
- orig_hilight = gdk_pixbuf_new_from_resource (file, &err);
- g_free (file);
- file = NULL;
-
- if (!orig_hilight)
- {
- g_warning ("Could not load hilight: %s",
- (err) ? err->message : "Unknown Error");
- if (err)
- g_clear_error (&err);
- }
- else
- {
-
- hilight = gdk_pixbuf_scale_simple (orig_hilight, alloc.width,
- alloc.height, GDK_INTERP_BILINEAR);
- gdk_cairo_set_source_pixbuf (cr, hilight, 0, 0);
-
- cairo_paint (cr);
- g_object_unref (hilight);
- g_object_unref (orig_hilight);
- }
-
- if (priv->location)
- {
- pointx = convert_longitude_to_x (priv->location->longitude, alloc.width);
- pointy = convert_latitude_to_y (priv->location->latitude, alloc.height);
-
- pointx = CLAMP (floor (pointx), 0, alloc.width);
- pointy = CLAMP (floor (pointy), 0, alloc.height);
-
- draw_text_bubble (cr, widget, pointx, pointy);
-
- if (priv->pin)
- {
- gdk_cairo_set_source_pixbuf (cr, priv->pin,
- pointx - PIN_HOT_POINT_X,
- pointy - PIN_HOT_POINT_Y);
- cairo_paint (cr);
- }
- }
-
- return TRUE;
-}
-
-static void
-update_cursor (GtkWidget *widget)
-{
- GdkWindow *window;
- GdkCursor *cursor = NULL;
-
- if (!gtk_widget_get_realized (widget))
- return;
-
- if (gtk_widget_is_sensitive (widget))
- {
- GdkDisplay *display;
- display = gtk_widget_get_display (widget);
- cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
- }
-
- window = gtk_widget_get_window (widget);
- gdk_window_set_cursor (window, cursor);
-
- if (cursor)
- g_object_unref (cursor);
-}
+/* static gboolean */
+/* girl_stations_map_draw (GtkWidget *widget, */
+/* cairo_t *cr) */
+/* { */
+/* GirlStationsMapPrivate *priv = GIRL_STATIONS_MAP (widget)->priv; */
+/* GdkPixbuf *hilight, *orig_hilight; */
+/* GtkAllocation alloc; */
+/* gchar *file; */
+/* GError *err = NULL; */
+/* gdouble pointx, pointy; */
+/* char buf[16]; */
+/* const char *fmt; */
+
+/* gtk_widget_get_allocation (widget, &alloc); */
+
+/* /\* paint background *\/ */
+/* gdk_cairo_set_source_pixbuf (cr, priv->background, 0, 0); */
+/* cairo_paint (cr); */
+
+/* /\* paint hilight *\/ */
+/* if (gtk_widget_is_sensitive (widget)) */
+/* fmt = GIRL_RESOURCE_PATH "/timezone_%s.png"; */
+/* else */
+/* fmt = GIRL_RESOURCE_PATH "/timezone_%s_dim.png"; */
+
+/* file = g_strdup_printf (fmt, */
+/* g_ascii_formatd (buf, sizeof (buf), */
+/* "%g", priv->selected_offset)); */
+/* orig_hilight = gdk_pixbuf_new_from_resource (file, &err); */
+/* g_free (file); */
+/* file = NULL; */
+
+/* if (!orig_hilight) */
+/* { */
+/* g_warning ("Could not load hilight: %s", */
+/* (err) ? err->message : "Unknown Error"); */
+/* if (err) */
+/* g_clear_error (&err); */
+/* } */
+/* else */
+/* { */
+
+/* hilight = gdk_pixbuf_scale_simple (orig_hilight, alloc.width, */
+/* alloc.height, GDK_INTERP_BILINEAR); */
+/* gdk_cairo_set_source_pixbuf (cr, hilight, 0, 0); */
+
+/* cairo_paint (cr); */
+/* g_object_unref (hilight); */
+/* g_object_unref (orig_hilight); */
+/* } */
+
+/* if (priv->location) */
+/* { */
+/* pointx = convert_longitude_to_x (priv->location->longitude, alloc.width); */
+/* pointy = convert_latitude_to_y (priv->location->latitude, alloc.height); */
+
+/* pointx = CLAMP (floor (pointx), 0, alloc.width); */
+/* pointy = CLAMP (floor (pointy), 0, alloc.height); */
+
+/* draw_text_bubble (cr, widget, pointx, pointy); */
+
+/* if (priv->pin) */
+/* { */
+/* gdk_cairo_set_source_pixbuf (cr, priv->pin, */
+/* pointx - PIN_HOT_POINT_X, */
+/* pointy - PIN_HOT_POINT_Y); */
+/* cairo_paint (cr); */
+/* } */
+/* } */
+
+/* return TRUE; */
+/* } */
+
+/* static void */
+/* update_cursor (GtkWidget *widget) */
+/* { */
+/* GdkWindow *window; */
+/* GdkCursor *cursor = NULL; */
+
+/* if (!gtk_widget_get_realized (widget)) */
+/* return; */
+
+/* if (gtk_widget_is_sensitive (widget)) */
+/* { */
+/* GdkDisplay *display; */
+/* display = gtk_widget_get_display (widget); */
+/* cursor = gdk_cursor_new_for_display (display, GDK_HAND2); */
+/* } */
+
+/* window = gtk_widget_get_window (widget); */
+/* gdk_window_set_cursor (window, cursor); */
+
+/* if (cursor) */
+/* g_object_unref (cursor); */
+/* } */
#if 0
static void
@@ -500,7 +500,7 @@ static void
girl_stations_map_class_init (GirlStationsMapClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+ /* GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); */
g_type_class_add_private (klass, sizeof (GirlStationsMapPrivate));
diff --git a/src/girl.c b/src/girl.c
index 7a2aedb..e131613 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -636,6 +636,7 @@ void about_app(GtkWidget * a, gpointer user_data)
"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"
));
gchar* artists[] = { "Wiki Graphic Designer",
"Aly Raj",
@@ -643,14 +644,14 @@ void about_app(GtkWidget * a, gpointer user_data)
NULL };
gchar* comments = { _("Locate Internet Radio Stations") };
gchar* copyright = { _("Copyright (C) 2014, 2015, 2016 Ole Aamot Software") };
- gchar* documenters[] = { _("Mario Blättermann <mario blaettermann gmail com> (German translation)"),
_("Marek Černocký <marek manet cz> (Czech translation)"), NULL };
+ gchar* documenters[] = { _("Mario Blättermann <mario blaettermann gmail com> (German translation)"),
_("Marek Černocký <marek manet cz> (Czech translation)"), _("Daniel Mustieles <daniel mustieles gmail com>
(Spanish translation)"), NULL };
static GdkPixbuf* logo;
gchar* name = PACKAGE;
gchar* version = VERSION;
- gchar* website = "http://wiki.gnome.org/Apps/Girl";;
- gchar* website_label = "http://wiki.gnome.org/Apps/Girl";;
+ gchar* website = "https://people.gnome.org/~ole/girl/";;
+ gchar* website_label = "https://people.gnome.org/~ole/girl/";;
gchar* license = g_strdup(_("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 Software Foundation; either
version 2 of the License, or (at your option) any later version.\nThis program is distributed in the hope
that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\nYou should have
received a copy of the GNU General Public License along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."));
diff --git a/src/girl.xml b/src/girl.xml
index 54ed746..08ef375 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,7 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl" href="girl.xsl" ?>
<!DOCTYPE girl SYSTEM "girl-8.0.dtd">
-<girl version="8.0">
+<girl version="8.4.1">
+ <station band="102.5FM" id="radiouchile" lang="es" name="Radio Uchile" rank="1.0" type="edu">
+ <frequency uri="http://radio.uchile.cl/";>102.5 FM in Santiago, Chile</frequency>
+ <location>Santiago, Chile</location>
+ <description lang="en">
+ La Radio Universidad de Chile es una estación de radio ubicada en el 102.5 MHz del dial FM en Santiago
de Chile.
+ </description>
+ <stream mime="audio/mpeg" uri="http://stream.radio.uchile.cl/;stream/1"; codec="MPEG-1 Layer 3 (MP3)"
samplerate="44100 Hz" channels="Stereo" bitrate="82 kbps" />
+ <uri>http://radio.uchile.cl/</uri>
+ </station>
+ <station band="93.7FM" id="radiousp" lang="pt_BR" name="Radio USP" rank="1.0" type="edu">
+ <frequency uri="http://www.radio.usp.br/";>93.7 FM in São Paulo, Brazil</frequency>
+ <location>São Paulo, Brazil</location>
+ <description lang="en">
+ A Rádio USP de São Paulo foi criada em 11 de outubro de 1977, preenchendo o espaço vazio de emissoras
educativas em FM na Grande São Paulo e, ao mesmo tempo, proporcionando um canal de comunicação entre a
Universidade de São Paulo e a sociedade.
+
+ Ao longo de seus 39 anos, a emissora recebeu diversos prêmios por sua linha de trabalho diferenciada.
Em 2000, a Rádio USP recebeu o prêmio da APCA (Associação Paulista dos CrÃticos de Arte) como melhor
programação musical. Destacam-se da mesma maneira as premiações pela melhor programação de cultura geral,
melhor programa de variedades, conferidos também pela APCA, o Prêmio Jabuti da Câmara Brasileira do Livro e o
Terceiro Concurso Internacional de Programas de Rádio promovido pela Rádio Cubana (vencido pelo Clip
Atualidades).
+
+ A Rádio USP mantém uma programação jornalÃstica voltada à divulgação das atividades da Universidade e
um espaço aberto para debates sobre temas de interesse da sociedade e para prestação de serviços.
+ </description>
+ <stream mime="audio/ogg" uri="http://flow.emm.usp.br:8007/radiousp-48.ogg"; codec="Ogg Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="48 kbps" />
+ <stream mime="audio/ogg" uri="http://flow.emm.usp.br:8007/radiousp-64.ogg"; codec="Ogg Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="64 kbps" />
+ <stream mime="audio/ogg" uri="http://flow.emm.usp.br:8007/radiousp-128.ogg"; codec="Ogg Vorbis"
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+ <uri>http://www.radio.usp.br/</uri>
+ </station>
<station band="96.4FM" id="srib" lang="nb" name="Studentradioen i Bergen" rank="1.0" type="edu">
<frequency uri="http://srib.no/";>96.4 FM in Bergen, Norway</frequency>
<location>Bergen, Norway</location>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
