Hello community,
here is the log from the commit of package evolution-webcal
checked in at Sat Feb 2 01:35:50 CET 2008.
--------
--- GNOME/evolution-webcal/evolution-webcal.changes 2007-09-17 16:25:38.000000000 +0200
+++ evolution-webcal/evolution-webcal.changes 2008-02-01 20:46:43.436280000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 1 20:48:15 CET 2008 - maw@suse.de
+
+- Update to version 2.13.90:
+ + Now build with libsoup 2.4.
+
+-------------------------------------------------------------------
Old:
----
evolution-webcal-2.12.0.tar.bz2
New:
----
evolution-webcal-2.13.90.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-webcal.spec ++++++
--- /var/tmp/diff_new_pack.k15042/_old 2008-02-02 01:27:11.000000000 +0100
+++ /var/tmp/diff_new_pack.k15042/_new 2008-02-02 01:27:11.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package evolution-webcal (Version 2.12.0)
+# spec file for package evolution-webcal (Version 2.13.90)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,9 +12,9 @@
Name: evolution-webcal
BuildRequires: evolution-data-server-devel fdupes gnome-common intltool libgnomeui-devel perl-XML-Parser update-desktop-files
-License: GPL v2 or later, Other uncritical OpenSource License
+License: GPL v2 or later; Other uncritical OpenSource License; X11/MIT
Group: Productivity/Office/Organizers
-Version: 2.12.0
+Version: 2.13.90
Release: 1
Summary: Evolution Webcal
Source: http://ftp.gnome.org/pub/gnome/sources/evolution-webcal/1.0/evolution-webcal-%{version}.tar.bz2
@@ -64,76 +64,79 @@
%files lang -f %{name}.lang
%changelog
-* Mon Sep 17 2007 - gekker@suse.de
+* Fri Feb 01 2008 maw@suse.de
+- Update to version 2.13.90:
+ + Now build with libsoup 2.4.
+* Mon Sep 17 2007 gekker@suse.de
- Update to version 2.12.0
- Translation Updates
-* Mon Sep 10 2007 - maw@suse.de
+* Mon Sep 10 2007 maw@suse.de
- Update to version 2.11.91 to match other evolution components'
version numbers.
-* Wed Aug 08 2007 - maw@suse.de
+* Wed Aug 08 2007 maw@suse.de
- Use %%fdupes
- Split off a -lang subpackage.
-* Mon Jul 23 2007 - maw@suse.de
+* Mon Jul 23 2007 maw@suse.de
- Update to version 2.10.0.
* updated translations
-* Mon Apr 02 2007 - maw@suse.de
+* Mon Apr 02 2007 maw@suse.de
- Update to version 2.9.92
- b.g.o 336290 and 337994.
-* Fri Jan 12 2007 - sbrabec@suse.cz
+* Fri Jan 12 2007 sbrabec@suse.cz
- Spec file cleanup.
-* Mon Dec 18 2006 - maw@suse.de
+* Mon Dec 18 2006 maw@suse.de
- Move to /usr.
-* Tue Oct 03 2006 - aj@suse.de
+* Tue Oct 03 2006 aj@suse.de
- Cleanup BuildRequires.
-* Wed Sep 06 2006 - dobey@suse.de
+* Thu Sep 07 2006 dobey@suse.de
- Update to version 2.8.0
mostly translation updates
-* Tue Mar 21 2006 - dobey@suse.de
+* Tue Mar 21 2006 dobey@suse.de
- Remove Conflicts for mozilla-calendar
Fixes https://bugzilla.novell.com/show_bug.cgi?id=159663
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Thu Oct 13 2005 - gekker@suse.de
+* Thu Oct 13 2005 gekker@suse.de
- Update to version 2.4.1
-* Mon Sep 05 2005 - gekker@suse.de
+* Mon Sep 05 2005 gekker@suse.de
- Update to version 2.4.0.1 (GNOME 2.12)
-* Mon Aug 22 2005 - gekker@suse.de
+* Mon Aug 22 2005 gekker@suse.de
- Update to version 2.4.0
-* Sat Aug 13 2005 - aj@suse.de
+* Sat Aug 13 2005 aj@suse.de
- Add lzo and lzo-devel to neededforbuild.
-* Fri Aug 12 2005 - gekker@suse.de
+* Fri Aug 12 2005 gekker@suse.de
- Update to 2.3.91
-* Wed Aug 10 2005 - gekker@suse.de
+* Wed Aug 10 2005 gekker@suse.de
- Remove -rpath and fix nfb (95673)
-* Tue Aug 02 2005 - gekker@suse.de
+* Tue Aug 02 2005 gekker@suse.de
- Update to version 2.3.90
-* Fri Jul 01 2005 - gekker@suse.de
+* Fri Jul 01 2005 gekker@suse.de
- Update to version 2.2.1
-* Thu Apr 14 2005 - sbrabec@suse.cz
+* Thu Apr 14 2005 sbrabec@suse.cz
- Added audiofile-devel to neededforbuild.
-* Tue Mar 08 2005 - gekker@suse.de
+* Wed Mar 09 2005 gekker@suse.de
- Update to version 2.2.0 (GNOME 2.10).
-* Mon Mar 07 2005 - gekker@suse.de
+* Mon Mar 07 2005 gekker@suse.de
- add -rpath for mozilla libs
-* Wed Mar 02 2005 - gekker@suse.de
+* Wed Mar 02 2005 gekker@suse.de
- Update to 2.1.92
-* Sun Feb 27 2005 - ro@suse.de
+* Mon Feb 28 2005 ro@suse.de
- added mozilla to nfb
-* Thu Feb 10 2005 - gekker@suse.de
+* Thu Feb 10 2005 gekker@suse.de
- Update to 2.1.91
-* Sat Feb 05 2005 - gekker@suse.de
+* Sat Feb 05 2005 gekker@suse.de
- Update to version 2.1.4
-* Mon Jan 17 2005 - clahey@suse.de
+* Mon Jan 17 2005 clahey@suse.de
- Updated to version 2.1.3.
-* Fri Jan 07 2005 - gekker@suse.de
+* Fri Jan 07 2005 gekker@suse.de
- Update to version 2.1.2
-* Sat Oct 30 2004 - ro@suse.de
+* Sat Oct 30 2004 ro@suse.de
- locale rename: no -> nb
-* Wed Aug 25 2004 - dobey@suse.de
+* Wed Aug 25 2004 dobey@suse.de
- Update to version 1.0.9
- Add conflicts for mozilla-calendar
-* Thu Aug 05 2004 - dobey@suse.de
+* Thu Aug 05 2004 dobey@suse.de
- Update to version 1.0.8
- Add build deps for gnutls libs from libsoup
-* Wed Jul 28 2004 - dobey@suse.de
+* Thu Jul 29 2004 dobey@suse.de
- Initial build of Evolution Webcal for NLD
++++++ evolution-webcal-2.12.0.tar.bz2 -> evolution-webcal-2.13.90.tar.bz2 ++++++
++++ 5101 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/ChangeLog new/evolution-webcal-2.13.90/ChangeLog
--- old/evolution-webcal-2.12.0/ChangeLog 2007-09-15 20:13:06.000000000 +0200
+++ new/evolution-webcal-2.13.90/ChangeLog 2008-01-31 01:55:46.000000000 +0100
@@ -1,3 +1,14 @@
+2008-01-30 Rodney Dawes
+
+ * configure.ac: Up version to 2.13.90 for release
+
+2008-01-15 Dan Winship
+
+ * configure.ac: Require libsoup 2.4
+
+ * src/evolution-webcal-notify.c:
+ * src/evolution-webcal-main.c: Minor updates for libsoup 2.4
+
2007-09-15 Rodney Dawes
* configure.ac: Up version to 2.12.0 for release
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/configure.ac new/evolution-webcal-2.13.90/configure.ac
--- old/evolution-webcal-2.12.0/configure.ac 2007-09-15 20:12:33.000000000 +0200
+++ new/evolution-webcal-2.13.90/configure.ac 2008-01-31 01:55:46.000000000 +0100
@@ -1,9 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.53)
-AC_INIT([evolution-webcal], [2.12.0])
+AC_INIT([evolution-webcal], [2.13.90])
AC_CONFIG_SRCDIR(config.h.in)
-AC_COPYRIGHT([Copyright 2007 Rodney Dawes])
+AC_COPYRIGHT([Copyright 2008 Rodney Dawes])
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
@@ -28,10 +28,7 @@
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
AM_GCONF_SOURCE_2
-# Check for libsoup-2.4 and fall back to 2.2 if not found
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, LIBSOUP_API=2.4, LIBSOUP_API=2.2)
-
-PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.4 libgnome-2.0 >= 2.14 libgnomeui-2.0 libecal-1.2 >= 1.1.0 libsoup-$LIBSOUP_API >= 2.1.8)
+PKG_CHECK_MODULES(EVOLUTION_WEBCAL, glib-2.0 >= 2.8 gtk+-2.0 >= 2.4 libgnome-2.0 >= 2.14 libgnomeui-2.0 libecal-1.2 >= 1.1.0 libsoup-2.4 >= 2.3.0)
AC_SUBST(EVOLUTION_WEBCAL_CFLAGS)
AC_SUBST(EVOLUTION_WEBCAL_LIBS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/INSTALL new/evolution-webcal-2.13.90/INSTALL
--- old/evolution-webcal-2.12.0/INSTALL 2007-03-13 20:51:14.000000000 +0100
+++ new/evolution-webcal-2.13.90/INSTALL 2008-01-31 01:57:58.000000000 +0100
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +87,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +188,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/intltool-extract.in new/evolution-webcal-2.13.90/intltool-extract.in
--- old/evolution-webcal-2.12.0/intltool-extract.in 2007-09-15 20:14:04.000000000 +0200
+++ new/evolution-webcal-2.13.90/intltool-extract.in 2008-01-31 01:57:52.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.1";
+my $VERSION = "0.37.0";
## Loaded modules
use strict;
@@ -161,7 +161,8 @@
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
- "gettext/scheme", "gettext/xml", "gettext/quoted"
+ "gettext/scheme", "gettext/xml", "gettext/quoted",
+ "gettext/quotedxml"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
@@ -218,6 +219,7 @@
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
&type_quoted if $gettext_type eq "quoted";
+ &type_quotedxml if $gettext_type eq "quotedxml";
}
sub entity_decode_minimal
@@ -731,6 +733,18 @@
}
}
+sub type_quotedxml {
+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+ my $message = $1;
+ my $before = $`;
+ $message =~ s/\\\"/\"/g;
+ $message = entity_decode($message);
+ $before =~ s/[^\n]//g;
+ $messages{$message} = [];
+ $loc{$message} = length ($before) + 2;
+ }
+}
+
sub type_glade {
### For translatable Glade XML files ###
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/intltool-merge.in new/evolution-webcal-2.13.90/intltool-merge.in
--- old/evolution-webcal-2.12.0/intltool-merge.in 2007-09-15 20:14:04.000000000 +0200
+++ new/evolution-webcal-2.13.90/intltool-merge.in 2008-01-31 01:57:52.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.36.1";
+my $VERSION = "0.37.0";
## Loaded modules
use strict;
@@ -61,6 +61,7 @@
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
my $QUOTED_STYLE_ARG = 0;
+my $QUOTEDXML_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -81,6 +82,7 @@
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
"quoted-style" => \$QUOTED_STYLE_ARG,
+ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -100,7 +102,7 @@
{
my ($file) = @_;
# If either a file exists, or when run it returns 0 exit status
- return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
+ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
return 0;
}
@@ -148,7 +150,7 @@
&utf8_sanity_check;
&preparation;
&print_message;
- &keys_merge_translations;
+ &keys_merge_translations;
&finalize;
}
elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
@@ -174,12 +176,12 @@
&rfc822deb_merge_translations;
&finalize;
}
-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
{
&utf8_sanity_check;
&preparation;
&print_message;
- "ed_merge_translations;
+ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
&finalize;
}
else
@@ -219,6 +221,7 @@
-s, --schemas-style includes translations in the schemas style
-r, --rfc822deb-style includes translations in the RFC822 style
--quoted-style includes translations in the quoted string style
+ --quotedxml-style includes translations in the quoted xml string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -292,10 +295,9 @@
{
next if /^#/;
- if (/([-a-zA-Z_@.]+)\n/)
+ for my $lang (split)
{
- my $lang = $1;
-
+ chomp ($lang);
my $po_file = $PO_DIR . "/" . $lang . ".po";
if (-e $po_file) {
$po_files_by_lang{$lang} = $po_file;
@@ -576,6 +578,7 @@
return "&" if $_ == 38;
return "'" if $_ == 39;
return "<" if $_ == 60;
+ return ">" if $_ == 62;
return chr $_;
}
@@ -1076,43 +1079,74 @@
close OUTPUT;
print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
}
- }
- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
- my $tree = readXml($FILE);
- print_header($FILE, \*OUTPUT);
- parseTree(\*OUTPUT, $tree);
- close OUTPUT;
- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+ if ( ! -d "C" ) {
+ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
+ }
+ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ my $tree = readXml($FILE);
+ print_header($FILE, \*OUTPUT);
+ parseTree(\*OUTPUT, $tree);
+ close OUTPUT;
+ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
+ } else {
+ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ my $tree = readXml($FILE);
+ print_header($FILE, \*OUTPUT);
+ parseTree(\*OUTPUT, $tree);
+ close OUTPUT;
+ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
+ }
}
-sub keys_merge_translations
+sub keys_merge_translation
{
- open INPUT, "<${FILE}" or die;
- open OUTPUT, ">${OUTFILE}" or die;
+ my ($lang) = @_;
+
+ if ( ! -d $lang && $MULTIPLE_OUTPUT)
+ {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+
+ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
binmode (OUTPUT) if $^O eq 'MSWin32';
- while (<INPUT>)
+ while (<INPUT>)
{
- if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
{
- my $string = $3;
+ my $string = $3;
- print OUTPUT;
+ if (!$MULTIPLE_OUTPUT)
+ {
+ print OUTPUT;
- my $non_translated_line = $_;
+ my $non_translated_line = $_;
- for my $lang (sort keys %po_files_by_lang)
+ for my $lang (sort keys %po_files_by_lang)
+ {
+ my $translation = $translations{$lang, $string};
+ next if !$translation;
+
+ $_ = $non_translated_line;
+ s/(\w+)=.*/[$lang]$1=$translation/;
+ print OUTPUT;
+ }
+ }
+ else
{
- my $translation = $translations{$lang, $string};
- next if !$translation;
+ my $non_translated_line = $_;
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
$_ = $non_translated_line;
- s/(\w+)=.*/[$lang]$1=$translation/;
+ s/(\w+)=.*/$1=$translation/;
print OUTPUT;
}
- }
- else
+ }
+ else
{
print OUTPUT;
}
@@ -1120,6 +1154,24 @@
close OUTPUT;
close INPUT;
+
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+}
+
+sub keys_merge_translations
+{
+ if ($MULTIPLE_OUTPUT)
+ {
+ for my $lang (sort keys %po_files_by_lang)
+ {
+ keys_merge_translation ($lang);
+ }
+ keys_merge_translation ("C");
+ }
+ else
+ {
+ keys_merge_translation (".");
+ }
}
sub desktop_merge_translations
@@ -1415,19 +1467,22 @@
sub quoted_translation
{
- my ($lang, $string) = @_;
+ my ($xml_mode, $lang, $string) = @_;
+ $string = entity_decode($string) if $xml_mode;
$string =~ s/\\\"/\"/g;
my $translation = $translations{$lang, $string};
$translation = $string if !$translation;
-
+ $translation = entity_encode($translation) if $xml_mode;
$translation =~ s/\"/\\\"/g;
return $translation
}
sub quoted_merge_translations
{
+ my ($xml_mode) = @_;
+
if (!$MULTIPLE_OUTPUT) {
print "Quoted only supports Multiple Output.\n";
exit(1);
@@ -1442,7 +1497,7 @@
binmode (OUTPUT) if $^O eq 'MSWin32';
while (<INPUT>)
{
- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
print OUTPUT;
}
close OUTPUT;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/intltool-update.in new/evolution-webcal-2.13.90/intltool-update.in
--- old/evolution-webcal-2.12.0/intltool-update.in 2007-09-15 20:14:04.000000000 +0200
+++ new/evolution-webcal-2.13.90/intltool-update.in 2008-01-31 01:57:52.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.36.1";
+my $VERSION = "0.37.0";
my $PACKAGE = "intltool";
## Loaded modules
@@ -124,10 +124,7 @@
&Console_Write_IntltoolHelp if $arg_count > 1;
-my $PKGNAME = FindPackageName ();
-
-# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown";
if ($POT_ARG)
{
@@ -334,7 +331,7 @@
push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
- }, "$SRCDIR/..";
+ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
@@ -434,8 +431,8 @@
last;
}
- ## N_ Q_ and _ are the three macros defined in gi8n.h
- if (/[NQ]?_ *\(QUOTEDTEXT/)
+ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
+ if (/[CNQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -777,7 +774,7 @@
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
push @xgettext_argument, $XGETTEXT_KEYWORDS;
my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/as.po new/evolution-webcal-2.13.90/po/as.po
--- old/evolution-webcal-2.12.0/po/as.po 2007-03-13 19:59:25.000000000 +0100
+++ new/evolution-webcal-2.13.90/po/as.po 2008-01-30 05:42:43.000000000 +0100
@@ -1,20 +1,23 @@
-# translation of evolution-webcal.HEAD.as.po to Assamese
+# translation of as.po to Assamese
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Amitakhya Phukan , 2006.
#
+# Amitakhya Phukan , 2006.
+# Amitakhya Phukan , 2008.
+# Amitakhya Phukan , 2008.
msgid ""
msgstr ""
-"Project-Id-Version: evolution-webcal.HEAD.as\n"
+"Project-Id-Version: as\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-29 07:59+0200\n"
-"PO-Revision-Date: 2006-08-30 15:49+0530\n"
-"Last-Translator: Amitakhya Phukan \n"
+"POT-Creation-Date: 2007-01-02 03:13+0000\n"
+"PO-Revision-Date: 2008-01-14 16:29+0530\n"
+"Last-Translator: Amitakhya Phukan \n"
"Language-Team: Assamese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1)\n"
#: ../evolution-webcal.schemas.in.in.h:1
msgid "How to handle webcal URLs"
@@ -26,7 +29,9 @@
#: ../evolution-webcal.schemas.in.in.h:3
msgid "Set to true to have a program specified in command handle webcal URLs"
-msgstr"কাৰ্য়্যক্ৰ্মটো অাদেশমতে নিয়ন্ত্ৰ্ণ কৰা webcal URLসমূহত নিৰ্দিষ্ট কৰিবৰ বাবে trueলৈ উপবিষ্ট কৰক ।"
+msgstr ""
+"কাৰ্য়্যক্ৰ্মটো অাদেশমতে নিয়ন্ত্ৰ্ণ কৰা webcal URLসমূহত নিৰ্দিষ্ট কৰিবৰ বাবে trueলৈ "
+"উপবিষ্ট কৰক ।"
#: ../evolution-webcal.schemas.in.in.h:4
msgid "True if the program to handle this URL should be run in a terminal"
@@ -41,11 +46,13 @@
msgid ""
"There was an error parsing the calendar, \"%s\". Please verify that it is a "
"valid calendar, and try again."
-msgstr "\"%s\" কেলেণ্ডাৰখন বিশ্লেষণ কৰোতে ভূল হল । অনুগ্ৰ্হ কৰি কেলেণ্ডাৰখন বৈধ হোৱাটো পৰীক্ষা কৰি পুনৰ চেষ্টা কৰক ।"
+msgstr ""
+"\"%s\" কেলেণ্ডাৰখন বিশ্লেষণ কৰোতে ভূল হ'ল । অনুগ্ৰ্হ কৰি কেলেণ্ডাৰখন বৈধ হোৱাটো "
+"পৰীক্ষা কৰি পুনৰ চেষ্টা কৰক ।"
#: ../src/evolution-webcal-main.c:59
msgid "Error Parsing Calendar"
-msgstr "কেলেণ্ডাৰ বিশ্লেষণ কৰোতে ভূল হল ।"
+msgstr "কেলেণ্ডাৰ বিশ্লেষণ কৰোঁতে ভূল হ'ল ।"
#: ../src/evolution-webcal-main.c:127
#, c-format
@@ -88,7 +95,13 @@
msgid ""
"No URI to load was specified. You need to pass the URI of the calendar to "
"subscribe to, as an argument on the command line."
-msgstr "লোড কৰিবলৈ কোনো URI নিৰ্দিষ্ট কৰা হোৱা নাই । অাপুনি ক্ৰেতা হব খোজা কেলেণ্ডাৰৰ URIটো অাদেশ শাৰীত যুক্তি দৰে হস্তান্তৰ কৰক ।"
+msgstr ""
+"লোড কৰিবলৈ কোনো URI নিৰ্দিষ্ট কৰা হোৱা নাই । অাপুনি ক্ৰেতা হব খোজা কেলেণ্ডাৰৰ "
+"URIটো অাদেশ শাৰীত যুক্তি দৰে হস্তান্তৰ কৰক ।"
+
+#: ../src/evolution-webcal-main.c:250
+msgid "- Evolution webcal: URI Handler"
+msgstr "- Evolution webcal: URI Handler"
#: ../src/evolution-webcal-notify.c:272
#, c-format
@@ -104,7 +117,9 @@
msgid ""
"You are already subscribed to the calendar \"%s\". Please subscribe to "
"another calendar."
-msgstr "অাপুনি ইয়াৰ পূব্ৰেই \"%s\" কেলেণ্ডাৰৰ ক্ৰেতা। অনুগ্ৰ্হ কৰি কোনো বেলেগ এখন কেলেণ্ডাৰৰ ক্ৰেতা হ'ক ।"
+msgstr ""
+"অাপুনি ইয়াৰ পূব্ৰেই \"%s\" কেলেণ্ডাৰৰ ক্ৰেতা। অনুগ্ৰ্হ কৰি কোনো বেলেগ এখন কেলেণ্ডাৰৰ "
+"ক্ৰেতা হ'ক ।"
#: ../src/evolution-webcal-notify.c:334
msgid "<b>Already Subscribed</b>"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/ChangeLog new/evolution-webcal-2.13.90/po/ChangeLog
--- old/evolution-webcal-2.12.0/po/ChangeLog 2007-09-15 20:11:40.000000000 +0200
+++ new/evolution-webcal-2.13.90/po/ChangeLog 2008-01-30 05:42:43.000000000 +0100
@@ -1,3 +1,36 @@
+2008-01-14 Amitakhya Phukan
+
+ * as.po: Updated assamese translations.
+
+2008-01-05 Inaki Larranaga Murgoitio
+
+ * eu.po: Updated Basque translation.
+
+2007-12-31 Yannig Marchegay
+
+ * oc.po: Updated Occitan translation.
+
+2007-12-08 Kjartan Maraas
+
+ * nn.po: Added Norwegian nynorsk translation from
+ Eskild Hustvedt <eskilr at zerodogg org>
+
+2007-10-23 Djihed Afifi
+
+ * ar.po: Updated Arabic Translation by Ahmad Farghal.
+
+2007-10-21 Djihed Afifi
+
+ * ar.po: Updated Arabic Translation by Ahmad Farghal.
+
+2007-10-21 Djihed Afifi
+
+ * ar.po: Updated Arabic Translation by Ahmad Farghal.
+
+2007-09-30 Ignacio Casal Quinteiro
+
+ * gl.po: Updated Galician Translation.
+
2007-09-13 Djihed Afifi
* ar.po: Updated Arabic Translation by Ahmad Farghal.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/eu.po new/evolution-webcal-2.13.90/po/eu.po
--- old/evolution-webcal-2.12.0/po/eu.po 2007-07-30 02:51:52.000000000 +0200
+++ new/evolution-webcal-2.13.90/po/eu.po 2008-01-30 05:42:43.000000000 +0100
@@ -1,17 +1,17 @@
-# translation of eu.po to Basque
+# translation of evolution-webcal.HEAD.po to Basque
# Copyright (C) 2004 Rodney Dawes
# This file is distributed under the same license as the evolution-webcal package.
#
-# Iñaki Larrañaga Murgoitio , 2004, 2006.
+# Iñaki Larrañaga Murgoitio , 2004, 2006, 2008.
# Iñaki Larrañaga Murgoitio , 2007.
msgid ""
msgstr ""
-"Project-Id-Version: eu\n"
+"Project-Id-Version: evolution-webcal.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-28 16:42+0200\n"
-"PO-Revision-Date: 2007-07-28 16:42+0200\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio \n"
-"Language-Team: Basque \n"
+"POT-Creation-Date: 2008-01-05 18:01+0100\n"
+"PO-Revision-Date: 2008-01-02 17:27+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio \n"
+"Language-Team: Basque \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -29,12 +29,13 @@
#: ../evolution-webcal.schemas.in.in.h:3
msgid "Set to true to have a program specified in command handle webcal URLs"
msgstr ""
-"Ezarri egi gisa komandoan programa bat zehaztuta edukitzeko webcal URLak "
+"Ezarri EGIA gisa komandoan programa bat zehaztuta edukitzeko webcal URLak "
"kudeatzeko"
#: ../evolution-webcal.schemas.in.in.h:4
msgid "True if the program to handle this URL should be run in a terminal"
-msgstr "Egiazkoa URL hau kudeatzeko programa terminal batean exekutatu behar bada."
+msgstr ""
+"Egiazkoa URL hau kudeatzeko programa terminal batean exekutatu behar bada."
#: ../evolution-webcal.schemas.in.in.h:5
msgid "URL handler for webcal uris"
@@ -80,7 +81,7 @@
#: ../src/evolution-webcal-main.c:178
#, c-format
msgid "The URI \"%s\" is invalid."
-msgstr "\"%s\" URILa baliogabea da."
+msgstr "\"%s\" URIa baliogabea da."
#: ../src/evolution-webcal-main.c:179
msgid "Invalid URI Specified"
@@ -95,7 +96,7 @@
"No URI to load was specified. You need to pass the URI of the calendar to "
"subscribe to, as an argument on the command line."
msgstr ""
-"Ez da URIrik zehazttu kargatzeko. Idatzi harpidetzea nahi duzun egutegiraren "
+"Ez da URIrik zehaztu kargatzeko. Idatzi harpidetzea nahi duzun egutegiraren "
"URIa, komando lerroko argumentu gisa."
#: ../src/evolution-webcal-main.c:250
@@ -116,7 +117,8 @@
msgid ""
"You are already subscribed to the calendar \"%s\". Please subscribe to "
"another calendar."
-msgstr "\"%s\" egutegian harpidetuta zaude jadanik. Harpidetu beste egutegi batean."
+msgstr ""
+"\"%s\" egutegian harpidetuta zaude jadanik. Harpidetu beste egutegi batean."
#: ../src/evolution-webcal-notify.c:334
msgid "<b>Already Subscribed</b>"
@@ -160,4 +162,3 @@
#: ../src/evolution-webcal-notify.c:508
msgid "Weeks"
msgstr "Asteak"
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/gl.po new/evolution-webcal-2.13.90/po/gl.po
--- old/evolution-webcal-2.12.0/po/gl.po 2007-03-13 19:59:25.000000000 +0100
+++ new/evolution-webcal-2.13.90/po/gl.po 2008-01-30 05:42:43.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: evolution-webcal.gnome-2-10\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-20 12:58+0200\n"
+"POT-Creation-Date: 2007-09-30 20:38+0200\n"
"PO-Revision-Date: 2005-06-20 12:53+0200\n"
"Last-Translator: Ignacio Casal Quinteiro \n"
"Language-Team: Galego\n"
@@ -18,27 +18,26 @@
#: ../evolution-webcal.schemas.in.in.h:1
msgid "How to handle webcal URLs"
-msgstr "Cómo manipular as URLs webcal"
+msgstr "Como manipular os URL webcal"
#: ../evolution-webcal.schemas.in.in.h:2
msgid "Run program in terminal"
-msgstr "Executar o programa en terminal"
+msgstr "Executar o programa nun terminal"
#: ../evolution-webcal.schemas.in.in.h:3
msgid "Set to true to have a program specified in command handle webcal URLs"
msgstr ""
-"Establecer a verdadeiro para ter un programa especificado no comando para "
-"manipular as URLs webcal"
+"Definir como verdadeiro para ter un programa especificado no comando para "
+"manipular os URL webcal"
#: ../evolution-webcal.schemas.in.in.h:4
msgid "True if the program to handle this URL should be run in a terminal"
msgstr ""
-"Verdadeiro se o programa para manipular esta URL debería executarse nun "
-"terminal"
+"Verdadeiro se o programa para manipular este URL debe executarse nun terminal"
#: ../evolution-webcal.schemas.in.in.h:5
msgid "URL handler for webcal uris"
-msgstr "Manipulador URL para uirs webcal"
+msgstr "Manipulador URL para os URI webcal"
#: ../src/evolution-webcal-main.c:54
#, c-format
@@ -47,7 +46,7 @@
"valid calendar, and try again."
msgstr ""
"Houbo un erro ao analizar o calendario \"%s\". Verifique que é un calendario "
-"válido, e inténteo outra vez."
+"válido e ténteo outra vez."
#: ../src/evolution-webcal-main.c:59
msgid "Error Parsing Calendar"
@@ -61,12 +60,12 @@
#: ../src/evolution-webcal-main.c:132
#, c-format
msgid "The calendar, \"%s\", was not found on the server."
-msgstr "O calendario, \"%s\", non se atopou no servidor."
+msgstr "O calendario, \"%s\", non se localizou no servidor."
#: ../src/evolution-webcal-main.c:137
#, c-format
msgid "There was an internal server error while trying to load \"%s\"."
-msgstr "Houbo un erro interno do servidor ao intentar cargar \"%s\"."
+msgstr "Houbo un erro interno do servidor ao tentar cargar \"%s\"."
#: ../src/evolution-webcal-main.c:142
#, c-format
@@ -80,34 +79,38 @@
#: ../src/evolution-webcal-main.c:178
#, c-format
msgid "The URI \"%s\" is invalid."
-msgstr "A URI \"%s\" é inválida."
+msgstr "O URI \"%s\" non é válido."
#: ../src/evolution-webcal-main.c:179
msgid "Invalid URI Specified"
-msgstr "URI especificada inválida"
+msgstr "O URI especificado non é válido"
-#: ../src/evolution-webcal-main.c:222
+#: ../src/evolution-webcal-main.c:227
msgid "No URI Specified"
-msgstr "Non se especificou URI"
+msgstr "Non se especificou un URI"
-#: ../src/evolution-webcal-main.c:223
+#: ../src/evolution-webcal-main.c:228
msgid ""
"No URI to load was specified. You need to pass the URI of the calendar to "
"subscribe to, as an argument on the command line."
msgstr ""
-"Non se especificou unha URI para cargar. Necesita pasar a URI do calendario "
-"ao que suscribirse, como un argumento na liña de comandos."
+"Non se especificou un URI para cargar. Necesita indicar o URI do calendario "
+"ao que subscribirse como un argumento na liña de comandos."
-#: ../src/evolution-webcal-notify.c:271
+#: ../src/evolution-webcal-main.c:250
+msgid "- Evolution webcal: URI Handler"
+msgstr "- Evolution webcal: manipulador URI"
+
+#: ../src/evolution-webcal-notify.c:272
#, c-format
msgid "No events or tasks were found in the calendar \"%s\"."
-msgstr "Non se atoparon eventos nin tarefas no calendario \"%s\"."
+msgstr "Non se encontraron eventos nin tarefas no calendario \"%s\"."
-#: ../src/evolution-webcal-notify.c:274
+#: ../src/evolution-webcal-notify.c:275
msgid "<b>No Tasks or Events Found</b>"
-msgstr "<b>Non se atoparon eventos ou tarefas</b>"
+msgstr "<b>Non se encontraron eventos ou tarefas</b>"
-#: ../src/evolution-webcal-notify.c:330
+#: ../src/evolution-webcal-notify.c:331
#, c-format
msgid ""
"You are already subscribed to the calendar \"%s\". Please subscribe to "
@@ -115,45 +118,45 @@
msgstr ""
"Xa está subscrito ao calendario \"%s\". Subscríbase a outro calendario."
-#: ../src/evolution-webcal-notify.c:333
+#: ../src/evolution-webcal-notify.c:334
msgid "<b>Already Subscribed</b>"
-msgstr "<b>Xa subscrito</b>"
+msgstr "<b>Xa está subscrito</b>"
-#: ../src/evolution-webcal-notify.c:358
+#: ../src/evolution-webcal-notify.c:359
msgid "Subscribe to Calendar"
msgstr "Subscribirse a un calendario"
-#: ../src/evolution-webcal-notify.c:403
+#: ../src/evolution-webcal-notify.c:404
msgid "_Subscribe"
msgstr "_Subscribirse"
#. Description
-#: ../src/evolution-webcal-notify.c:442
+#: ../src/evolution-webcal-notify.c:443
msgid "No Description"
-msgstr "Sen descripción"
+msgstr "Sen descrición"
#. Refresh entry label
-#: ../src/evolution-webcal-notify.c:460
+#: ../src/evolution-webcal-notify.c:461
msgid "_Refresh Every:"
-msgstr "_Refrescar cada:"
+msgstr "_Actualizar cada:"
#. Color picker label
-#: ../src/evolution-webcal-notify.c:466
+#: ../src/evolution-webcal-notify.c:467
msgid "C_olor:"
msgstr "C_or:"
-#: ../src/evolution-webcal-notify.c:495
+#: ../src/evolution-webcal-notify.c:496
msgid "Days"
msgstr "Días"
-#: ../src/evolution-webcal-notify.c:499
+#: ../src/evolution-webcal-notify.c:500
msgid "Hours"
msgstr "Horas"
-#: ../src/evolution-webcal-notify.c:503
+#: ../src/evolution-webcal-notify.c:504
msgid "Minutes"
msgstr "Minutos"
-#: ../src/evolution-webcal-notify.c:507
+#: ../src/evolution-webcal-notify.c:508
msgid "Weeks"
msgstr "Semanas"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/LINGUAS new/evolution-webcal-2.13.90/po/LINGUAS
--- old/evolution-webcal-2.12.0/po/LINGUAS 2007-09-02 22:45:47.000000000 +0200
+++ new/evolution-webcal-2.13.90/po/LINGUAS 2008-01-30 05:42:43.000000000 +0100
@@ -40,6 +40,7 @@
nb
ne
nl
+nn
oc
or
pa
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/nn.po new/evolution-webcal-2.13.90/po/nn.po
--- old/evolution-webcal-2.12.0/po/nn.po 1970-01-01 01:00:00.000000000 +0100
+++ new/evolution-webcal-2.13.90/po/nn.po 2008-01-30 05:42:43.000000000 +0100
@@ -0,0 +1,148 @@
+# Norwegian translation of evolution-webcal (nynorsk dialect).
+# Copyright (C) 1998-2004 Free Software Foundation, Inc.
+# Kjartan Maraas , 1998-2004.
+# Eskild Hustvedt , 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: evolution-webcal 1.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-02 03:13+0000\n"
+"PO-Revision-Date: 2007-12-07 22:10+0100\n"
+"Last-Translator: Eskild Hustvedt \n"
+"Language-Team: Norwegian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../evolution-webcal.schemas.in.in.h:1
+msgid "How to handle webcal URLs"
+msgstr "Korleis handterast webcal-URLer"
+
+#: ../evolution-webcal.schemas.in.in.h:2
+msgid "Run program in terminal"
+msgstr "Køyra program i terminal"
+
+#: ../evolution-webcal.schemas.in.in.h:3
+msgid "Set to true to have a program specified in command handle webcal URLs"
+msgstr "Set til «true» for å la eit program oppgjeven i kommando handtere webcal URLer"
+
+#: ../evolution-webcal.schemas.in.in.h:4
+msgid "True if the program to handle this URL should be run in a terminal"
+msgstr "«True» viss programmet som handsamar denne type URLer skal kjøres i ein terminal"
+
+#: ../evolution-webcal.schemas.in.in.h:5
+msgid "URL handler for webcal uris"
+msgstr "URL-handsamar for webcal-URIer"
+
+#: ../src/evolution-webcal-main.c:54
+#, c-format
+msgid "There was an error parsing the calendar, \"%s\". Please verify that it is a valid calendar, and try again."
+msgstr "Det oppsto eit problem ved lesing av kalender «%s». Vennligst sjekk at dette er ein gyldig kalender og prøv att."
+
+#: ../src/evolution-webcal-main.c:59
+msgid "Error Parsing Calendar"
+msgstr "Feil ved lesing av kalender"
+
+#: ../src/evolution-webcal-main.c:127
+#, c-format
+msgid "Access to the calendar, \"%s\", is forbidden."
+msgstr "Tilgang til kalender «%s» er nekta."
+
+#: ../src/evolution-webcal-main.c:132
+#, c-format
+msgid "The calendar, \"%s\", was not found on the server."
+msgstr "Kalender «%s» vart ikkje funne på tenaren."
+
+#: ../src/evolution-webcal-main.c:137
+#, c-format
+msgid "There was an internal server error while trying to load \"%s\"."
+msgstr "Det oppsto ein intern feil på tenaren ved forsøk på lasting av «%s»."
+
+#: ../src/evolution-webcal-main.c:142
+#, c-format
+msgid "There was an error loading the calendar, \"%s\"."
+msgstr "Det oppsto ein feil ved lasting av kalender, «%s»."
+
+#: ../src/evolution-webcal-main.c:147
+msgid "Error Loading Calendar"
+msgstr "Feil ved lasting av kalender"
+
+#: ../src/evolution-webcal-main.c:178
+#, c-format
+msgid "The URI \"%s\" is invalid."
+msgstr "URI «%s» er ugyldig."
+
+#: ../src/evolution-webcal-main.c:179
+msgid "Invalid URI Specified"
+msgstr "Ugyldig URI oppgjeven"
+
+#: ../src/evolution-webcal-main.c:227
+msgid "No URI Specified"
+msgstr "Inga URI oppgjeven"
+
+#: ../src/evolution-webcal-main.c:228
+msgid "No URI to load was specified. You need to pass the URI of the calendar to subscribe to, as an argument on the command line."
+msgstr "Inga URI vart oppgjeven. Du må oppgje ein URI du vil at kalenderen skal abonnere på som eit argument på kommandolinja."
+
+#: ../src/evolution-webcal-main.c:250
+msgid "- Evolution webcal: URI Handler"
+msgstr "- Evolution webcal: URI-handsamar"
+
+#: ../src/evolution-webcal-notify.c:272
+#, c-format
+msgid "No events or tasks were found in the calendar \"%s\"."
+msgstr "Inga hendingar eller oppgaver vart funne i kalender «%s»."
+
+#: ../src/evolution-webcal-notify.c:275
+msgid "<b>No Tasks or Events Found</b>"
+msgstr "<b>Inga oppgaver eller hendingar funne</b>"
+
+#: ../src/evolution-webcal-notify.c:331
+#, c-format
+msgid "You are already subscribed to the calendar \"%s\". Please subscribe to another calendar."
+msgstr "Du abonnerer allereie på kalender «%s». Vennligst abonner på ein annan kalender."
+
+#: ../src/evolution-webcal-notify.c:334
+msgid "<b>Already Subscribed</b>"
+msgstr "<b>Allereie abonnert</b>"
+
+#: ../src/evolution-webcal-notify.c:359
+msgid "Subscribe to Calendar"
+msgstr "Abonner på kalender"
+
+#: ../src/evolution-webcal-notify.c:404
+msgid "_Subscribe"
+msgstr "_Abonner"
+
+#. Description
+#: ../src/evolution-webcal-notify.c:443
+msgid "No Description"
+msgstr "Inga skildring:"
+
+#. Refresh entry label
+#: ../src/evolution-webcal-notify.c:461
+msgid "_Refresh Every:"
+msgstr "Oppdate_r kvar:"
+
+#. Color picker label
+#: ../src/evolution-webcal-notify.c:467
+msgid "C_olor:"
+msgstr "F_arge:"
+
+#: ../src/evolution-webcal-notify.c:496
+msgid "Days"
+msgstr "Dagar"
+
+#: ../src/evolution-webcal-notify.c:500
+msgid "Hours"
+msgstr "Timar"
+
+#: ../src/evolution-webcal-notify.c:504
+msgid "Minutes"
+msgstr "Minutt"
+
+#: ../src/evolution-webcal-notify.c:508
+msgid "Weeks"
+msgstr "Veker"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/po/oc.po new/evolution-webcal-2.13.90/po/oc.po
--- old/evolution-webcal-2.12.0/po/oc.po 2007-09-02 22:45:47.000000000 +0200
+++ new/evolution-webcal-2.13.90/po/oc.po 2008-01-30 05:42:43.000000000 +0100
@@ -1,20 +1,20 @@
+# Translation of oc.po to Occitan
# Occitan translation of evolution-webcal.HEAD.pot.
-# Copyright (C) 2004, Free Software Foundation, Inc.
-# This file is distributed under the same license as the evolution-webcal package.
-# Yannig MARCHEGAY (yannig@marchegay.org) - 2006-2007
-#
+# Copyright (C) 2004, 2007, Free Software Foundation, Inc.
+# This file is distributed under the same license as the evolution-webcal package.#
+# Yannig Marchegay (Kokoyaya) , 2006-2008
msgid ""
msgstr ""
-"Project-Id-Version: evolution-webcal.HEAD.or\n"
+"Project-Id-Version: oc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-21 11:57+0100\n"
-"PO-Revision-Date: 2007-08-20 23:48+0200\n"
-"Last-Translator: Yannig MARCHEGAY (Kokoyaya) \n"
-"Language-Team: Occitan (post 1500) \n"
+"POT-Creation-Date: 2007-12-27 13:21+0100\n"
+"PO-Revision-Date: 2007-12-27 18:41+0100\n"
+"Last-Translator: Yannig Marchegay (Kokoyaya) \n"
+"Language-Team: Occitan \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"
+"Plural-Forms: nplurals=2; plural=(n > 1);"
#: ../evolution-webcal.schemas.in.in.h:1
msgid "How to handle webcal URLs"
@@ -22,7 +22,7 @@
#: ../evolution-webcal.schemas.in.in.h:2
msgid "Run program in terminal"
-msgstr ""
+msgstr "Aviar lo programa dins un terminal"
#: ../evolution-webcal.schemas.in.in.h:3
msgid "Set to true to have a program specified in command handle webcal URLs"
@@ -55,7 +55,7 @@
#: ../src/evolution-webcal-main.c:132
#, c-format
msgid "The calendar, \"%s\", was not found on the server."
-msgstr ""
+msgstr "Impossible de trobar lo calendièr \"%s\" sul servidor."
#: ../src/evolution-webcal-main.c:137
#, c-format
@@ -152,3 +152,4 @@
#: ../src/evolution-webcal-notify.c:508
msgid "Weeks"
msgstr "Setmanas"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/src/evolution-webcal-main.c new/evolution-webcal-2.13.90/src/evolution-webcal-main.c
--- old/evolution-webcal-2.12.0/src/evolution-webcal-main.c 2007-03-13 19:59:24.000000000 +0100
+++ new/evolution-webcal-2.13.90/src/evolution-webcal-main.c 2008-01-30 05:42:43.000000000 +0100
@@ -45,7 +45,7 @@
comp = icalparser_parse_string (body);
if (comp == NULL) {
- SoupUri * tmpuri;
+ SoupURI * tmpuri;
gchar * message, * tmpname;
tmpuri = soup_uri_new (uri);
@@ -100,16 +100,15 @@
bonobo_main_quit ();
}
-static void e_webcal_read (SoupMessage * msg, gpointer data) {
- const SoupUri * tmpuri;
+static void e_webcal_read (SoupSession *session, SoupMessage * msg, gpointer data) {
+ const SoupURI * tmpuri;
const gchar * uri = (const gchar *) data;
const gchar * header;
- gchar * body;
tmpuri = soup_message_get_uri (msg);
if (SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
- header = soup_message_get_header (msg->response_headers, "Location");
+ header = soup_message_headers_get (msg->response_headers, "Location");
if (header) {
e_webcal_open_cal_http (header, uri);
}
@@ -154,9 +153,7 @@
return;
}
- body = g_strndup (msg->response.body, msg->response.length);
- e_webcal_load (body, uri);
- g_free (body);
+ e_webcal_load (msg->response_body->data, uri);
g_free (data);
}
@@ -188,7 +185,7 @@
soup_message_set_flags (message, SOUP_MESSAGE_NO_REDIRECT);
soup_session_queue_message (session, message,
- (SoupMessageCallbackFn) e_webcal_read,
+ (SoupSessionCallback) e_webcal_read,
(gpointer) olduri);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-webcal-2.12.0/src/evolution-webcal-notify.c new/evolution-webcal-2.13.90/src/evolution-webcal-notify.c
--- old/evolution-webcal-2.12.0/src/evolution-webcal-notify.c 2007-07-30 02:52:35.000000000 +0200
+++ new/evolution-webcal-2.13.90/src/evolution-webcal-notify.c 2008-01-30 05:42:43.000000000 +0100
@@ -249,7 +249,7 @@
GtkWidget * rlabel, * clabel;
GtkWidget * cbutton;
GtkWidget * label, * button;
- SoupUri * tmpuri;
+ SoupURI * tmpuri;
gchar * tmpname;
gchar * icofile, * mrkname, * ref_str;
gint ref_timeout, ref_multi;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
