Added: support for translating the sky condition (description).

Cleaned up header includes (Old svn revision: 578)

Added: support for translating the sky condition (description).
Cleaned up header includes (Old svn revision: 578)
a7d95f62 · Bob Schlärmann · cbb0a5e3 · a7d95f62 · a7d95f62 · a7d95f62
Commit a7d95f62 authored Oct 16, 2004 by Bob Schlärmann
26 changed files
--- a/config.guess
+++ b/config.guess
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

-timestamp='2004-03-12'
+timestamp='2004-08-13'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
 GNU config.guess ($timestamp)

 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@@ -203,15 +203,15 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
    cats:OpenBSD:*:*)
 	echo arm-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    luna88k:OpenBSD:*:*)
+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
    mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -227,21 +227,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    pegasos:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+	echo mips64-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
    sun3:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
    *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -307,9 +298,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
    Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -764,7 +752,7 @@ EOF
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -787,21 +775,7 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -1096,9 +1070,9 @@ EOF
    M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
 	exit 0 ;;
-    M68*:*:R3V[567]*:*)
+    M68*:*:R3V[5678]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1196,9 +1170,10 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
    *:Darwin:*:*)
-	case `uname -p` in
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
 	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
@@ -1260,6 +1235,13 @@ EOF
    *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms && exit 0 ;;
+	    I*) echo ia64-dec-vms && exit 0 ;;
+	    V*) echo vax-dec-vms && exit 0 ;;
+	esac
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2

--- a/config.sub
+++ b/config.sub
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

-timestamp='2004-03-12'
+timestamp='2004-06-24'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
@@ -145,7 +145,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
@@ -300,7 +300,7 @@ case $basic_machine in
 	| avr-* \
 	| bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
+	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -326,8 +326,9 @@ case $basic_machine in
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
 	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -445,6 +446,10 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
 	cr16c)
 		basic_machine=cr16c-unknown
 		os=-elf
@@ -659,10 +664,6 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -743,10 +744,6 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -1059,6 +1056,9 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1374,6 +1374,9 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
+    	*-knuth)
+		os=-mmixware
+		;;
 	*-wec)
 		os=-proelf
 		;;

--- a/libtool
+++ b/libtool
@@ -319,7 +319,7 @@ link_all_deplibs=no
 sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.4/ /usr/lib/gcc/i486-linux/3.3.4/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../../i486-linux/lib/i486-linux/3.3.4/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../i486-linux/3.3.4/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../ /lib/i486-linux/3.3.4/ /lib/ /usr/lib/i486-linux/3.3.4/ /usr/lib/"

 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/mplayer /usr/lib /opt/lib /usr/local/lib /opt//lib /usr/lib/phoenix /usr/games/planeshift /usr/lib/mozilla-firebird/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib "

 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -7045,7 +7045,7 @@ link_all_deplibs=no
 sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.4/ /usr/lib/gcc/i486-linux/3.3.4/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../../i486-linux/lib/i486-linux/3.3.4/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../i486-linux/3.3.4/ /usr/lib/gcc-lib/i486-linux/3.3.4/../../../ /lib/i486-linux/3.3.4/ /lib/ /usr/lib/i486-linux/3.3.4/ /usr/lib/"

 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/mplayer /usr/lib /opt/lib /usr/local/lib /opt//lib /usr/lib/phoenix /usr/games/planeshift /usr/lib/mozilla-firebird/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/local/lib "

 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""

--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -28,7 +28,10 @@ libweather_la_SOURCES =							\
 				icon.h											\
 				search_dialog.c							\
 				search_dialog.h							\
-				debug_print.h
+				debug_print.h								\
+				translate.c									\
+				translate.h									
+

 libweather_la_CFLAGS =							\
 	@XFCE4_PANEL_CFLAGS@ 							\

--- a/panel-plugin/Makefile.in
+++ b/panel-plugin/Makefile.in
@@ -187,7 +187,9 @@ libweather_la_SOURCES = \
 				icon.h											\
 				search_dialog.c							\
 				search_dialog.h							\
-				debug_print.h
+				debug_print.h								\
+				translate.c									\
+				translate.h									


 libweather_la_CFLAGS = \
@@ -212,7 +214,8 @@ am_libweather_la_OBJECTS = libweather_la-config_dialog.lo \
 	libweather_la-get_data.lo libweather_la-http_client.lo \
 	libweather_la-parsers.lo libweather_la-plugin.lo \
 	libweather_la-scrollbox.lo libweather_la-summary_window.lo \
-	libweather_la-icon.lo libweather_la-search_dialog.lo
+	libweather_la-icon.lo libweather_la-search_dialog.lo \
+	libweather_la-translate.lo
 libweather_la_OBJECTS = $(am_libweather_la_OBJECTS)

 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
@@ -226,7 +229,8 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/libweather_la-plugin.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libweather_la-scrollbox.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/libweather_la-search_dialog.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/libweather_la-summary_window.Plo
+@AMDEP_TRUE@	./$(DEPDIR)/libweather_la-summary_window.Plo \
+@AMDEP_TRUE@	./$(DEPDIR)/libweather_la-translate.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -293,6 +297,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweather_la-scrollbox.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweather_la-search_dialog.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweather_la-summary_window.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweather_la-translate.Plo@am__quote@

 .c.o:
 @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@@ -624,6 +629,39 @@ libweather_la-search_dialog.lo: search_dialog.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -c -o libweather_la-search_dialog.lo `test -f 'search_dialog.c' || echo '$(srcdir)/'`search_dialog.c

+libweather_la-translate.o: translate.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -MT libweather_la-translate.o -MD -MP -MF "$(DEPDIR)/libweather_la-translate.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o libweather_la-translate.o `test -f 'translate.c' || echo '$(srcdir)/'`translate.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libweather_la-translate.Tpo" "$(DEPDIR)/libweather_la-translate.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libweather_la-translate.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='translate.c' object='libweather_la-translate.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libweather_la-translate.Po' tmpdepfile='$(DEPDIR)/libweather_la-translate.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -c -o libweather_la-translate.o `test -f 'translate.c' || echo '$(srcdir)/'`translate.c
+
+libweather_la-translate.obj: translate.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -MT libweather_la-translate.obj -MD -MP -MF "$(DEPDIR)/libweather_la-translate.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o libweather_la-translate.obj `if test -f 'translate.c'; then $(CYGPATH_W) 'translate.c'; else $(CYGPATH_W) '$(srcdir)/translate.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libweather_la-translate.Tpo" "$(DEPDIR)/libweather_la-translate.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libweather_la-translate.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='translate.c' object='libweather_la-translate.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libweather_la-translate.Po' tmpdepfile='$(DEPDIR)/libweather_la-translate.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -c -o libweather_la-translate.obj `if test -f 'translate.c'; then $(CYGPATH_W) 'translate.c'; else $(CYGPATH_W) '$(srcdir)/translate.c'; fi`
+
+libweather_la-translate.lo: translate.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -MT libweather_la-translate.lo -MD -MP -MF "$(DEPDIR)/libweather_la-translate.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o libweather_la-translate.lo `test -f 'translate.c' || echo '$(srcdir)/'`translate.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libweather_la-translate.Tpo" "$(DEPDIR)/libweather_la-translate.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/libweather_la-translate.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='translate.c' object='libweather_la-translate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libweather_la-translate.Plo' tmpdepfile='$(DEPDIR)/libweather_la-translate.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweather_la_CFLAGS) $(CFLAGS) -c -o libweather_la-translate.lo `test -f 'translate.c' || echo '$(srcdir)/'`translate.c
+
 mostlyclean-libtool:
 	-rm -f *.lo


--- a/panel-plugin/config_dialog.c
+++ b/panel-plugin/config_dialog.c
+#include <config.h>
+
 #include "config_dialog.h"
 #include "debug_print.h"
+#include "parsers.h"
+#include "get_data.h"
+
 #include <libxfce4util/i18n.h>
-struct labeloption labeloptions[11] = { 
+
+#define BORDER 6
+
+struct labeloption labeloptions[OPTIONS_N] = { 
                {N_("Windchill (F)"), FLIK},
                {N_("Temperature (T)"), TEMP},
                {N_("Atmosphere pressure (P)"), BAR_R},

--- a/panel-plugin/config_dialog.h
+++ b/panel-plugin/config_dialog.h
 #ifndef CONFIG_DIALOG_H
 #define CONFIG_DIALOG_H

-#include "search_dialog.h"
-#include "plugin.h"
+
 #include <gtk/gtk.h>

-#include <config.h>
+#include "search_dialog.h"
+#include "plugin.h"

 #define OPTIONS_N 11


--- a/panel-plugin/debug_print.h
+++ b/panel-plugin/debug_print.h
@@ -2,6 +2,7 @@
 #define DEBUG_PRINT_H

 #ifdef DEBUG
+  #include <stdio.h>
  #define DEBUG_PRINT(s, i) fprintf(stderr, s, i);
 #else
  #define DEBUG_PRINT(s, i) do {} while(0);

--- a/panel-plugin/get_data.c
+++ b/panel-plugin/get_data.c
+#include <config.h>
+
 #include "get_data.h"
 #include "debug_print.h"
 #define KILL_RING_S 5

--- a/panel-plugin/http_client.c
+++ b/panel-plugin/http_client.c
+#include <config.h>
+
 #include "http_client.h"
 #include "debug_print.h"


--- a/panel-plugin/icon.c
+++ b/panel-plugin/icon.c
+#include <config.h>
+
 #include "icon.h"
 #include "debug_print.h"


--- a/panel-plugin/parsers.c
+++ b/panel-plugin/parsers.c
+#include <config.h>
+
 #include "parsers.h"
 #include "debug_print.h"


--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
-#include "plugin.h"
+#include <config.h>
+
 #include <sys/stat.h>
-#include "debug_print.h"
-#include <libxfce4util/i18n.h>
 #include <libxfce4util/util.h>
+#include <libxfce4util/i18n.h>
 #include <time.h>

+#include "debug_print.h"
+#include "translate.h"
+#include "plugin.h"
+#include "http_client.h"
+#include "summary_window.h"
+#include "config_dialog.h"
+#include "icon.h"
+#include "scrollbox.h"

 gint IconSizeSmall = 0;

@@ -177,7 +185,7 @@ void update_plugin (struct xfceweather_data *data, gboolean force)
       
        gtk_image_set_from_pixbuf(GTK_IMAGE(data->iconimage), icon);
       
-        add_tooltip(data->tooltipbox, get_data(data->weatherdata, TRANS));
+        add_tooltip(data->tooltipbox, translate_desc(get_data(data->weatherdata, TRANS)));
 }

 GArray *labels_clear (GArray *array)
@@ -436,7 +444,9 @@ gboolean xfceweather_create_control(Control *control)

        control->data = data;
        control->with_popup = FALSE;
-
+        
+        /* FIXME Without this the first label looks odd, because 
+         * the gc isn't created yet */
        gtk_scrollbox_set_label(GTK_SCROLLBOX(data->scrollbox), -1, "1");
        gtk_scrollbox_clear(GTK_SCROLLBOX(data->scrollbox));


--- a/panel-plugin/plugin.h
+++ b/panel-plugin/plugin.h
 #ifndef PLUGIN_H
 #define PLUGIN_H

-#include "scrollbox.h"
-#include "parsers.h"
-#include "get_data.h"
-#include "http_client.h"
-#include "summary_window.h"
-#include "config_dialog.h"
-#include "icon.h"
-
 #include <panel/plugins.h>
 #include <gdk/gdk.h>

-
-#include <config.h>
+#include "parsers.h"
+#include "get_data.h"

 #define XFCEWEATHER_ROOT "weather"
 #define DEFAULT_W_THEME "liquid"

--- a/panel-plugin/scrollbox.c
+++ b/panel-plugin/scrollbox.c
+#include <config.h>
+
 #include "scrollbox.h"
 #define LABEL_REFRESH 3000
 #define LABEL_SPEED 25

--- a/panel-plugin/search_dialog.c
+++ b/panel-plugin/search_dialog.c
+#include <config.h>
+
 #define BORDER 6
 #include "parsers.h"
 #include "search_dialog.h"

--- a/panel-plugin/search_dialog.h
+++ b/panel-plugin/search_dialog.h
 #include "http_client.h"

-#include <config.h>
-
 #include <libxml/parser.h>
 #include <gtk/gtk.h>
 #include <libxfcegui4/dialogs.h>

--- a/panel-plugin/summary_window.c
+++ b/panel-plugin/summary_window.c
+#include <config.h>
+
 #include "summary_window.h"
-#include "libxfcegui4/dialogs.h"
 #include "debug_print.h"
+#include "translate.h"
+
 #include <libxfce4util/i18n.h>
 #include <panel/xfce_support.h>
+#include <libxfcegui4/dialogs.h>

 #define APPEND_BTEXT(text) gtk_text_buffer_insert_with_tags(GTK_TEXT_BUFFER(buffer),\
                &iter, text, -1, btag, NULL);
@@ -54,7 +58,13 @@ GtkWidget *create_summary_tab (struct xml_weather *data, enum units unit)
        APPEND_BTEXT(_("\nTemperature\n"));
        APPEND_TEXT_ITEM(_("Temperature"), TEMP);
        APPEND_TEXT_ITEM(_("Windchill"), FLIK);
-        APPEND_TEXT_ITEM(_("Description"), TRANS);
+        
+        /* special case for TRANS because of translate_desc */
+        value = g_strdup_printf("\t%s: %s\n",
+                _("Description"), translate_desc(get_data(data, TRANS)));
+        APPEND_TEXT_ITEM_REAL(value); 
+        g_free(value);
+
        APPEND_TEXT_ITEM(_("Dew point"), DEWP);

        APPEND_BTEXT(_("\nWind\n"));
@@ -112,10 +122,10 @@ GtkWidget *make_forecast(struct xml_dayf *weatherdata, enum units unit)
        box_n = gtk_event_box_new();
        gtk_container_add(GTK_CONTAINER(box_n), icon_n);

-        str = g_strdup_printf(_("Day: %s"), get_data_f(weatherdata, TRANS_D));
+        str = g_strdup_printf(_("Day: %s"), translate_desc(get_data_f(weatherdata, TRANS_D)));
        add_tooltip(box_d, str);
        g_free(str);
-        str = g_strdup_printf(_("Night: %s"), get_data_f(weatherdata, TRANS_N));
+        str = g_strdup_printf(_("Night: %s"), translate_desc(get_data_f(weatherdata, TRANS_N)));
        add_tooltip(box_n, str);
        g_free(str);


--- a/panel-plugin/summary_window.h
+++ b/panel-plugin/summary_window.h
@@ -3,9 +3,5 @@
 #include <gtk/gtk.h>
 #include "icon.h"

-
-#include <config.h>
-
-
 #define BORDER 6
 GtkWidget *create_summary_window(struct xml_weather *data, enum units unit);
--- a/panel-plugin/translate.c
+++ b/panel-plugin/translate.c
+#include <config.h>
+
+#include "translate.h"
+
+#include <string.h> /* strlen() */
+#include <libxfce4util/i18n.h>
+
+#define SIZE_DESC_STRINGS 73
+const gchar *desc_strings[SIZE_DESC_STRINGS] = {
+        N_("Snow to Rain"),
+        N_("Becoming Cloudy"),
+        N_("Blizzard"),
+        N_("Blizzard Conditions"),
+        N_("Blowing Snow"),
+        N_("Chance of Rain"),
+        N_("Chance of Rain/Snow"),
+        N_("Chance of Showers"),
+        N_("Chance of Snow"),
+        N_("Chance of Snow/Rain"),
+        N_("Chance of T-Storm"),
+        N_("Clear"),
+        N_("Clearing"),
+        N_("Clouds"),
+        N_("Cloudy"),
+        N_("Cloudy Periods"),
+        N_("Continued Hot"),
+        N_("Cumulonimbus Clouds Observed"),
+        N_("Drifting Snow"),
+        N_("Drizzle"),
+        N_("Dry"),
+        N_("Fair"),
+        N_("Flurries"),
+        N_("Fog"),
+        N_("Freezing Drizzle"),
+        N_("Freezing Rain"),
+        N_("Freezing Rain/Snow"),
+        N_("Frozen Precip"),
+        N_("Hazy"),
+        N_("Heavy Rain"),
+        N_("Heavy Snow"),
+        N_("Hot And Humid"),
+        N_("Ice Crystals"),
+        N_("Ice/Snow Mixture"),
+        N_("Increasing Clouds"),
+        N_("Isolated Showers"),
+        N_("Light Rain"),
+        N_("Light Snow"),
+        N_("Lightning Observed"),
+        N_("mild and breezy"),
+        N_("Mist"),
+        N_("Mostly Clear"),
+        N_("Mostly Cloudy"),
+        N_("Mostly Sunny"),
+        N_("N/A"),
+        N_("Occasional Sunshine"),
+        N_("Overcast"),
+        N_("Partial Clearing"),
+        N_("Partial Sunshine"),
+        N_("Partly Cloudy"),
+        N_("Partly Sunny"),
+        N_("Rain"),
+        N_("Rain and Snow"),
+        N_("Rain or Snow"),
+        N_("Rain Showers"),
+        N_("Rain to Snow"),
+        N_("Rain/Snow Showers"),
+        N_("Showers"),
+        N_("Sleet"),
+        N_("Sleet and Snow"),
+        N_("Smoke"),
+        N_("Snow"),
+        N_("Snow and Rain"),
+        N_("Snow or Rain"),
+        N_("Snow Showers"),
+        N_("Sunny"),
+        N_("Thunder"),
+        N_("Thunder storms"),
+        N_("Variable Cloudiness"),
+        N_("Variable Clouds"),
+        N_("Windy"),
+        N_("Wintry Mix")
+};
+
+const gchar *translate_desc(const gchar *desc)
+{
+        int i;
+
+        if (desc == NULL)
+                return "?";
+
+        for (i = 0; i < SIZE_DESC_STRINGS; i++)
+        {
+                if (desc[0] != desc_strings[i][0])
+                        continue;
+
+                if (!g_ascii_strncasecmp(desc, desc_strings[i], strlen(desc_strings[i]))) 
+                        return _(desc_strings[i]);
+        }
+
+        return desc;
+}