Hello community, here is the log from the commit of package libgnomekbd for openSUSE:Factory checked in at Wed Mar 25 18:14:20 CET 2009. -------- --- GNOME/libgnomekbd/libgnomekbd.changes 2009-02-22 17:52:14.000000000 +0100 +++ libgnomekbd/libgnomekbd.changes 2009-03-16 14:50:16.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 16 14:46:16 CET 2009 - sbrabec@suse.cz + +- Added support for translation-update-upstream (FATE#301344). + +------------------------------------------------------------------- +Sat Mar 14 19:56:29 CET 2009 - vuntz@novell.com + +- Update to version 2.26.0: + + Two bugs related to deprecated APIs fixed. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgnomekbd-2.25.91.tar.bz2 New: ---- libgnomekbd-2.26.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnomekbd.spec ++++++ --- /var/tmp/diff_new_pack.Qj6296/_old 2009-03-25 18:13:49.000000000 +0100 +++ /var/tmp/diff_new_pack.Qj6296/_new 2009-03-25 18:13:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgnomekbd (Version 2.25.91) +# spec file for package libgnomekbd (Version 2.26.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,8 +25,9 @@ BuildRequires: intltool BuildRequires: libglade2-devel BuildRequires: libxklavier-devel +BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Version: 2.25.91 +Version: 2.26.0 Release: 1 Url: http://www.gnome.org/ Group: System/GUI/GNOME @@ -64,6 +65,7 @@ %lang_package %prep %setup -q +translation-update-upstream %build %configure --disable-static --with-pic @@ -108,6 +110,11 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 16 2009 sbrabec@suse.cz +- Added support for translation-update-upstream (FATE#301344). +* Sat Mar 14 2009 vuntz@novell.com +- Update to version 2.26.0: + + Two bugs related to deprecated APIs fixed. * Sun Feb 22 2009 vuntz@novell.com - Update to version 2.25.91: + Several small bugs/build issues ar closed ++++++ libgnomekbd-2.25.91.tar.bz2 -> libgnomekbd-2.26.0.tar.bz2 ++++++ ++++ 4763 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/libgnomekbd-2.25.91/capplet/gkbd-indicator-plugins-capplet.c new/libgnomekbd-2.26.0/capplet/gkbd-indicator-plugins-capplet.c --- old/libgnomekbd-2.25.91/capplet/gkbd-indicator-plugins-capplet.c 2008-09-13 02:26:55.000000000 +0200 +++ new/libgnomekbd-2.26.0/capplet/gkbd-indicator-plugins-capplet.c 2009-03-14 00:01:13.000000000 +0100 @@ -297,7 +297,7 @@ gipc->capplet = capplet = glade_xml_get_widget (data, "gkbd_indicator_plugins"); - gtk_object_set_data (GTK_OBJECT (capplet), "gladeData", data); + g_object_set_data (G_OBJECT (capplet), "gladeData", data); g_signal_connect_swapped (GTK_OBJECT (capplet), "destroy", G_CALLBACK (g_object_unref), data); @@ -308,20 +308,20 @@ "response", G_CALLBACK (CappletResponse), NULL); glade_xml_signal_connect_data (data, "on_btnUp_clicked", - GTK_SIGNAL_FUNC + G_CALLBACK (CappletPromotePlugin), gipc); glade_xml_signal_connect_data (data, "on_btnDown_clicked", - GTK_SIGNAL_FUNC + G_CALLBACK (CappletDemotePlugin), gipc); glade_xml_signal_connect_data (data, "on_btnAdd_clicked", - GTK_SIGNAL_FUNC + G_CALLBACK (CappletEnablePlugin), gipc); glade_xml_signal_connect_data (data, "on_btnRemove_clicked", - GTK_SIGNAL_FUNC + G_CALLBACK (CappletDisablePlugin), gipc); glade_xml_signal_connect_data (data, "on_btnProperties_clicked", - GTK_SIGNAL_FUNC + G_CALLBACK (CappletConfigurePlugin), gipc); activePlugins = CappletGetGladeWidget (gipc, "activePlugins"); 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/libgnomekbd-2.25.91/ChangeLog new/libgnomekbd-2.26.0/ChangeLog --- old/libgnomekbd-2.25.91/ChangeLog 2009-02-20 00:22:38.000000000 +0100 +++ new/libgnomekbd-2.26.0/ChangeLog 2009-03-14 00:06:49.000000000 +0100 @@ -1,3 +1,14 @@ +2009-03-13 svu + + * configure.in, NEWS: preparing 2.26.0 + +2009-02-25 svu + + * libgnomekbd/gkbd-indicator.c: use updated tooltips API, closing + #550212 + * capplet/gkbd-indicator-plugins-capplet.c: fixed signal API, closing + #572661 + 2009-02-19 svu * configure.in, NEWS: preparing 2.25.91 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/libgnomekbd-2.25.91/configure.in new/libgnomekbd-2.26.0/configure.in --- old/libgnomekbd-2.25.91/configure.in 2009-02-20 00:17:41.000000000 +0100 +++ new/libgnomekbd-2.26.0/configure.in 2009-03-14 00:04:31.000000000 +0100 @@ -1,7 +1,7 @@ dnl *************************************************************************** dnl *** configure.in for libgnomekbd *** dnl *************************************************************************** -AC_INIT(libgnomekbd, 2.25.91, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd]) +AC_INIT(libgnomekbd, 2.26.0, [http://bugzilla.gnome.org/enter_bug.cgi?product=libgnomekbd]) AC_PREREQ(2.59) VERSION_INFO=3:0:0 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/libgnomekbd-2.25.91/intltool-extract.in new/libgnomekbd-2.26.0/intltool-extract.in --- old/libgnomekbd-2.25.91/intltool-extract.in 2009-02-20 00:17:49.000000000 +0100 +++ new/libgnomekbd-2.26.0/intltool-extract.in 2008-05-11 23:14:56.000000000 +0200 @@ -32,7 +32,7 @@ ## Release information my $PROGRAM = "intltool-extract"; my $PACKAGE = "intltool"; -my $VERSION = "0.36.2"; +my $VERSION = "0.37.1"; ## 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 ### @@ -750,7 +764,7 @@ } ## handle new glade files - while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) { + while ($input =~ /<(property|atkproperty|col)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) { $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/; if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) { $comments{entity_decode($3)} = entity_decode($2) ; 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/libgnomekbd-2.25.91/intltool-merge.in new/libgnomekbd-2.26.0/intltool-merge.in --- old/libgnomekbd-2.25.91/intltool-merge.in 2009-02-20 00:17:49.000000000 +0100 +++ new/libgnomekbd-2.26.0/intltool-merge.in 2008-05-11 23:14:56.000000000 +0200 @@ -35,7 +35,7 @@ ## Release information my $PROGRAM = "intltool-merge"; my $PACKAGE = "intltool"; -my $VERSION = "0.36.2"; +my $VERSION = "0.37.1"; ## 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, @@ -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/libgnomekbd-2.25.91/intltool-update.in new/libgnomekbd-2.26.0/intltool-update.in --- old/libgnomekbd-2.25.91/intltool-update.in 2009-02-20 00:17:49.000000000 +0100 +++ new/libgnomekbd-2.26.0/intltool-update.in 2008-05-11 23:14:56.000000000 +0200 @@ -30,7 +30,7 @@ ## Release information my $PROGRAM = "intltool-update"; -my $VERSION = "0.36.2"; +my $VERSION = "0.37.1"; my $PACKAGE = "intltool"; ## Loaded modules @@ -334,7 +334,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 +434,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 +777,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; @@ -1118,6 +1118,8 @@ close IN; } + # unwrap lines split with a trailing \ + $make_source =~ s/\\ $ \n/ /mxg; $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m; return $keywords; 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/libgnomekbd-2.25.91/libgnomekbd/gkbd-indicator.c new/libgnomekbd-2.26.0/libgnomekbd/gkbd-indicator.c --- old/libgnomekbd-2.25.91/libgnomekbd/gkbd-indicator.c 2008-11-09 21:16:18.000000000 +0100 +++ new/libgnomekbd-2.26.0/libgnomekbd/gkbd-indicator.c 2009-03-14 00:01:12.000000000 +0100 @@ -87,32 +87,16 @@ void gkbd_indicator_set_tooltips (GkbdIndicator * gki, const char *str) { - GtkTooltips *tooltips; + g_assert (str == NULL || g_utf8_validate (str, -1, NULL)); - if (str == NULL) - return; - tooltips = gtk_tooltips_new (); - g_object_ref (G_OBJECT (tooltips)); - gtk_object_sink (GTK_OBJECT (tooltips)); - g_object_set_data_full (G_OBJECT (gki), "tooltips", - tooltips, (GDestroyNotify) g_object_unref); - gtk_tooltips_set_tip (tooltips, GTK_WIDGET (gki), str, NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (gki), str); if (gki->priv->set_parent_tooltips) { - GtkWidget *parent = - gtk_widget_get_parent (GTK_WIDGET (gki)); - if (parent != NULL) { - gtk_tooltips_set_tip (tooltips, - GTK_WIDGET (parent), str, - NULL); - g_object_ref (G_OBJECT (tooltips)); - g_object_set_data_full (G_OBJECT (parent), - "gnome-kbd-indicator.tooltips", - tooltips, (GDestroyNotify) - g_object_unref); - } - } - gtk_tooltips_enable (tooltips); + GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (gki)); + if (parent) { + gtk_widget_set_tooltip_text (parent, str); + } + } } void @@ -628,7 +612,7 @@ return; } - gkbd_indicator_set_tooltips (gki, ""); + gkbd_indicator_set_tooltips (gki, NULL); gkbd_indicator_fill (gki); gkbd_indicator_set_current_page (gki); 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/libgnomekbd-2.25.91/m4/intltool.m4 new/libgnomekbd-2.26.0/m4/intltool.m4 --- old/libgnomekbd-2.25.91/m4/intltool.m4 2009-02-20 00:17:49.000000000 +0100 +++ new/libgnomekbd-2.26.0/m4/intltool.m4 2008-09-04 00:02:25.000000000 +0200 @@ -24,9 +24,8 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) # serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl +AC_DEFUN([IT_PROG_INTLTOOL], +[AC_PREREQ([2.50])dnl case "$am__api_version" in 1.[01234]) @@ -99,7 +98,6 @@ AC_PATH_PROG(XGETTEXT, xgettext) AC_PATH_PROG(MSGMERGE, msgmerge) AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) fi @@ -171,9 +169,6 @@ dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" >"$1/stamp-it.tmp" [sed '/^#/d @@ -182,17 +177,22 @@ '"s|^| $ac_top_srcdir/|" \ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ] + if test ! -f "$1/Makefile"; then + AC_MSG_ERROR([$1/Makefile is not ready.]) + fi + mv "$1/Makefile" "$1/Makefile.tmp" [sed '/^POTFILES =/,/[^\\]$/ { /^POTFILES =/!d r $1/POTFILES } - ' "$1/Makefile.in" >"$1/Makefile"] + ' "$1/Makefile.tmp" >"$1/Makefile"] rm -f "$1/Makefile.tmp" mv "$1/stamp-it.tmp" "$1/stamp-it" ]) ])dnl ]) + # deprecated macros AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) # A hint is needed for aclocal from Automake <= 1.9.4: 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/libgnomekbd-2.25.91/missing new/libgnomekbd-2.26.0/missing --- old/libgnomekbd-2.25.91/missing 2009-02-20 00:18:07.000000000 +0100 +++ new/libgnomekbd-2.26.0/missing 2008-09-04 00:02:33.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,8 +33,6 @@ fi run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -46,7 +44,7 @@ msg="missing on your system" -case $1 in +case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -79,7 +77,6 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -109,7 +106,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case $1 in +case "$1" in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -138,7 +135,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case "$1" in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -167,7 +164,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case $f in + case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -195,8 +192,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file else @@ -217,25 +214,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if test ! -f y.tab.h; then + if [ ! -f y.tab.h ]; then echo >y.tab.h fi - if test ! -f y.tab.c; then + if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -247,18 +244,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if test ! -f lex.yy.c; then + if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -270,9 +267,11 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then touch $file else test -z "$file" || exec >$file @@ -290,17 +289,11 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -324,13 +317,13 @@ fi firstarg="$1" if shift; then - case $firstarg in + case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case $firstarg in + case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 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/libgnomekbd-2.25.91/NEWS new/libgnomekbd-2.26.0/NEWS --- old/libgnomekbd-2.25.91/NEWS 2009-02-20 00:22:18.000000000 +0100 +++ new/libgnomekbd-2.26.0/NEWS 2009-03-14 00:05:24.000000000 +0100 @@ -1,3 +1,6 @@ +2.26.0: + 2 bugs related to deprecated APIs fixed. + 2.25.91: Several small bugs/build issues ar closed First release for GNOME 2.25/2.26. 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/libgnomekbd-2.25.91/po/ChangeLog new/libgnomekbd-2.26.0/po/ChangeLog --- old/libgnomekbd-2.25.91/po/ChangeLog 2009-02-19 23:26:34.000000000 +0100 +++ new/libgnomekbd-2.26.0/po/ChangeLog 2009-03-14 00:01:13.000000000 +0100 @@ -1,3 +1,11 @@ +2009-03-13 Kostas Papadimas <pkst@gnome.org> + + * el.po: Updated Greek Translation by Jennie Petoumenou. + +2009-02-22 Praveen Arimbrathodiyil <pravi.a@gmail.com> + + * ml.po: Updated Malayalam translation (Hari Vishnu) + 2009-02-19 Jani Monoses <jani@ubuntu.com> * LINGUAS: 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/libgnomekbd-2.25.91/po/el.po new/libgnomekbd-2.26.0/po/el.po --- old/libgnomekbd-2.25.91/po/el.po 2008-06-06 22:35:50.000000000 +0200 +++ new/libgnomekbd-2.26.0/po/el.po 2009-03-14 00:01:13.000000000 +0100 @@ -5,21 +5,22 @@ # # Nikos Charonitakis <nikosx@gmail.com>, 2007. # Athanasios Lefteris <alefteris@gmail.com>, 2007. +# Jennie Petoumenou <epetoumenou@gmail.com>, 2009. msgid "" msgstr "" "Project-Id-Version: libgnomekbd 2.19.91\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-16 17:05+0000\n" -"PO-Revision-Date: 2007-09-02 17:07+0300\n" -"Last-Translator: Athanasios Lefteris <alefteris@gmail.com>\n" -"Language-Team: Greek <team@lists.gnome.gr>\n" +"POT-Creation-Date: 2008-11-07 14:33+0100\n" +"PO-Revision-Date: 2009-03-01 15:25+0100\n" +"Last-Translator: Jennie Petoumenou <epetoumenou@gmail.com>\n" +"Language-Team: Greek <team@gnome.gr>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.2\n" -#: ../libgnomekbd/gkbd-keyboard-drawing.c:2380 +#: ../libgnomekbd/gkbd-keyboard-drawing.c:2376 #, c-format msgid "" "Keyboard layout \"%s\"\n" @@ -27,10 +28,11 @@ "For licensing see package metadata" msgstr "" "Διάταξη πληκτρολογίου \"%s\"\n" -"Πνευματικά δικαιώματα © X.Org Foundation και συντελεστές XKeyboardConfig\n" +"Πνευματικά δικαιώματα © X.Org Foundation και συντελεστές " +"XKeyboardConfig\n" "Για πληροφορίες για την άδεια διάθεσης, δείτε τα μεταδεδομένα του πακέτου" -#: ../libgnomekbd/gkbd-indicator.c:617 +#: ../libgnomekbd/gkbd-indicator.c:627 msgid "XKB initialization error" msgstr "Σφάλμα αρχικοποίησης XKB" @@ -39,34 +41,30 @@ msgid "There was an error loading an image: %s" msgstr "Υπήρξε σφάλμα κατά την φόρτωση της εικόνας:·%s" -#. Translators: The count is related to the number of options. The %s -#. * format specifier should not be modified, left "as is". -#: ../libgnomekbd/gkbd-keyboard-config.c:796 +#: ../libgnomekbd/gkbd-keyboard-config.c:752 #, c-format msgid "layout \"%s\"" msgid_plural "layouts \"%s\"" msgstr[0] "διάταξη \"%s\"" msgstr[1] "διατάξεις \"%s\"" -#. Translators: The count is related to the number of options. The %s -#. * format specifier should not be modified, left "as is". -#: ../libgnomekbd/gkbd-keyboard-config.c:813 +#: ../libgnomekbd/gkbd-keyboard-config.c:771 #, c-format msgid "option \"%s\"" msgid_plural "options \"%s\"" msgstr[0] "επιλογή \"%s\"" msgstr[1] "επιλογές \"%s\"" -#: ../libgnomekbd/gkbd-keyboard-config.c:821 +#: ../libgnomekbd/gkbd-keyboard-config.c:779 #, c-format msgid "model \"%s\", %s and %s" msgstr "μοντέλο \"%s\", %s και %s" -#: ../libgnomekbd/gkbd-keyboard-config.c:822 +#: ../libgnomekbd/gkbd-keyboard-config.c:780 msgid "no layout" msgstr "χωρίς διάταξη" -#: ../libgnomekbd/gkbd-keyboard-config.c:823 +#: ../libgnomekbd/gkbd-keyboard-config.c:781 msgid "no options" msgstr "χωρίς επιλογές" @@ -108,34 +106,26 @@ msgstr "Επιλογές πληκτρολογίου" #: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9 -msgid "" -"Keyboard settings in gconf will be overridden from the system ASAP " -"(deprecated)" -msgstr "" -"Οι ρυθμίσεις πληκτρολογίου στο gconf θα αντικατασταθούν από το σύστημα το " -"συντομότερο δυνατό. (ξεπερασμένο)" - -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10 msgid "Save/restore indicators together with layout groups" msgstr "Αποθήκευση/επαναφορά των ενδείξεων μαζί με τις ομάδες διατάξεων" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10 msgid "Secondary groups" msgstr "Δευτερεύουσες ομάδες" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11 msgid "Show flags in the applet" msgstr "Εμφάνιση σημαιών στο εφαρμογίδιο" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12 msgid "Show flags in the applet to indicate the current layout" msgstr "Εμφάνιση σημαιών στο εφαρμογίδιο ως ένδειξη της τρέχουσας διάταξης" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13 msgid "Show layout names instead of group names" msgstr "Εμφάνιση ονομάτων διάταξης αντί ονομάτων ομάδας" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14 msgid "" "Show layout names instead of group names (only for versions of XFree " "supporting multiple layouts)" @@ -143,51 +133,40 @@ "Εμφάνιση ονομάτων διάταξης αντί ονομάτων ομάδας (μόνο για εκδόσεις του XFree " "με υποστήριξη πολλαπλών διατάξεων)" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:16 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15 msgid "Suppress the \"X sysconfig changed\" warning message" msgstr "" "Καταστολή του μηνύματος προειδοποίησης \"Το X sysconfig τροποποιήθηκε\"" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:17 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:16 msgid "The Keyboard Preview, X offset" msgstr "Προεπισκόπηση πληκτρολογίου, μετατόπιση X" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:18 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:17 msgid "The Keyboard Preview, Y offset" msgstr "Προεπισκόπηση πληκτρολογίου, μετατόπιση Y" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:19 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:18 msgid "The Keyboard Preview, height" msgstr "Προεπισκόπηση πληκτρολογίου, ύψος" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:20 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:19 msgid "The Keyboard Preview, width" msgstr "Προεπισκόπηση πληκτρολογίου, πλάτος" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:21 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:20 msgid "The list of enabled Keyboard Indicator plugins" msgstr "Λίστα των ενεργών πρόσθετων λειτουργιών ένδειξης πληκτρολογίου" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:22 -msgid "" -"Very soon, keyboard settings in gconf will be overridden (from the system " -"configuration) This key has been deprecated since GNOME 2.12, please unset " -"the model, layouts and options keys to get the default system configuration." -msgstr "" -"Πολύ σύντομα, οι ρυθμίσεις πληκτρολογίου στο gconf θα αντικατασταθούν (από " -"τις ρυθμίσεις συστήματος). Αυτό το κλειδί είναι παρωχημένο μετά από το GNOME " -"2.12, παρακαλούμε απορυθμίστε τα κλειδιά μοντέλου, διάταξης και επιλογών για " -"να αποκτήσετε την προκαθορισμένη ρύθμιση του συστήματος." - -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:23 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:21 msgid "keyboard layout" msgstr "διάταξη πληκτρολογίου" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:24 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:22 msgid "keyboard model" msgstr "μοντέλο πληκτρολογίου" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:25 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:23 msgid "modmap file list" msgstr "λίστα αρχείων modmap" @@ -235,12 +214,16 @@ msgid "_Available plugins:" msgstr "Δι_αθέσιμες πρόσθετες λειτουργίες:" -#: ../capplet/gkbd-indicator-plugins-capplet.c:122 +#: ../capplet/gkbd-indicator-plugins-capplet.c:120 #: ../capplet/gkbd-indicator-plugins-add.c:106 msgid "No description." msgstr "Χωρίς περιγραφή." -#: ../capplet/gkbd-indicator-plugins-capplet.c:344 +#: ../capplet/gkbd-indicator-plugins-capplet.c:258 +msgid "Unable to open help file" +msgstr "Αδύνατο το άνοιγμα του αρχείου βοήθειας" + +#: ../capplet/gkbd-indicator-plugins-capplet.c:360 #, c-format msgid "Failed to init GConf: %s\n" msgstr "Αποτυχία αρχικοποίησης GConf: %s\n" @@ -261,3 +244,22 @@ #: ../test/gkbd-indicator-test.c:68 msgid "Indicator:" msgstr "Ένδειξη:" + +#~ msgid "" +#~ "Keyboard settings in gconf will be overridden from the system ASAP " +#~ "(deprecated)" +#~ msgstr "" +#~ "Οι ρυθμίσεις πληκτρολογίου στο gconf θα αντικατασταθούν από το σύστημα το " +#~ "συντομότερο δυνατό. (ξεπερασμένο)" + +#~ msgid "" +#~ "Very soon, keyboard settings in gconf will be overridden (from the system " +#~ "configuration) This key has been deprecated since GNOME 2.12, please " +#~ "unset the model, layouts and options keys to get the default system " +#~ "configuration." +#~ msgstr "" +#~ "Πολύ σύντομα, οι ρυθμίσεις πληκτρολογίου στο gconf θα αντικατασταθούν " +#~ "(από τις ρυθμίσεις συστήματος). Αυτό το κλειδί είναι παρωχημένο μετά από " +#~ "το GNOME 2.12, παρακαλούμε απορυθμίστε τα κλειδιά μοντέλου, διάταξης και " +#~ "επιλογών για να αποκτήσετε την προκαθορισμένη ρύθμιση του συστήματος." + 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/libgnomekbd-2.25.91/po/fi.po new/libgnomekbd-2.26.0/po/fi.po --- old/libgnomekbd-2.25.91/po/fi.po 2008-09-13 02:23:27.000000000 +0200 +++ new/libgnomekbd-2.26.0/po/fi.po 2009-03-14 00:01:13.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: libgnomekbd\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-08-27 11:56+0300\n" -"PO-Revision-Date: 2007-03-06 20:34+0300\n" +"PO-Revision-Date: 2009-03-02 20:54+0200\n" "Last-Translator: Ilkka Tuohela <hile@iki.fi>\n" "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ #, c-format msgid "layout \"%s\"" msgid_plural "layouts \"%s\"" -msgstr[0] "asetttelu \"%s\"" +msgstr[0] "asettelu \"%s\"" msgstr[1] "asettelut \"%s\"" #: ../libgnomekbd/gkbd-keyboard-config.c:770 @@ -101,7 +101,7 @@ #: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9 msgid "Save/restore indicators together with layout groups" -msgstr "Tallenna ja palauta ilmaisimet asettuluryhmien mukana" +msgstr "Tallenna ja palauta ilmaisimet asetteluryhmien mukana" #: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10 msgid "Secondary groups" 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/libgnomekbd-2.25.91/po/Makefile.in.in new/libgnomekbd-2.26.0/po/Makefile.in.in --- old/libgnomekbd-2.25.91/po/Makefile.in.in 2009-02-20 00:17:49.000000000 +0100 +++ new/libgnomekbd-2.26.0/po/Makefile.in.in 2008-09-04 00:02:25.000000000 +0200 @@ -54,16 +54,16 @@ ALL_LINGUAS = @ALL_LINGUAS@ -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) +POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS POTFILES = \ # This comment gets stripped out @@ -101,6 +101,7 @@ install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all + $(mkdir_p) $(DESTDIR)$(itlocaledir) linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ 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/libgnomekbd-2.25.91/po/ml.po new/libgnomekbd-2.26.0/po/ml.po --- old/libgnomekbd-2.25.91/po/ml.po 2008-06-06 22:35:50.000000000 +0200 +++ new/libgnomekbd-2.26.0/po/ml.po 2009-03-14 00:01:13.000000000 +0100 @@ -2,22 +2,23 @@ # Copyright (C) 2008 THE libgnomekbd'S COPYRIGHT HOLDER # This file is distributed under the same license as the libgnomekbd package. # Santhosh Thottingal <santhosh.thottingal@gmail.com>, 2008. -# +# Hari Vishnu <harivishnu@gmail.com>, 2008 msgid "" msgstr "" "Project-Id-Version: libgnomekbd ml\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-09 03:54+0000\n" -"PO-Revision-Date: 2008-03-8 23:12+0530\n" -"Last-Translator: Santhosh Thottingal <santhosh.thottingal@gmail.com>\n" -"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-discuss@googlegroups.com>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=libgnomekbd&component=general\n" +"POT-Creation-Date: 2009-02-19 23:34+0000\n" +"PO-Revision-Date: 2008-09-27 03:07+0530\n" +"Last-Translator: Hari Vishnu <harivishnu@gmail.com>\n" +"Language-Team: Swathanthra|സ്വതന്ത്ര Malayalam|മലയാളം Computing|കമ്പ്യൂട്ടിങ്ങ് <smc-" +"discuss@googlegroups.com>\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" -"\n" -#: ../libgnomekbd/gkbd-keyboard-drawing.c:2380 +#: ../libgnomekbd/gkbd-keyboard-drawing.c:2376 #, c-format msgid "" "Keyboard layout \"%s\"\n" @@ -28,8 +29,7 @@ "Copyright © X.Org Foundation and XKeyboardConfig contributors\n" "For licensing see package metadata" - -#: ../libgnomekbd/gkbd-indicator.c:617 +#: ../libgnomekbd/gkbd-indicator.c:627 msgid "XKB initialization error" msgstr "XKB തുടങ്ങുന്നതില്‍ പിശകു്" @@ -38,34 +38,30 @@ msgid "There was an error loading an image: %s" msgstr "ചിത്രം %s ലോഡ് ചെയ്യുന്നതില്‍ പിശകു് പറ്റി" -#. Translators: The count is related to the number of options. The %s -#. * format specifier should not be modified, left "as is". -#: ../libgnomekbd/gkbd-keyboard-config.c:796 +#: ../libgnomekbd/gkbd-keyboard-config.c:752 #, c-format msgid "layout \"%s\"" msgid_plural "layouts \"%s\"" msgstr[0] "വിന്യാസം \"%s\"" msgstr[1] "വിന്യാസങ്ങള്‍ \"%s\"" -#. Translators: The count is related to the number of options. The %s -#. * format specifier should not be modified, left "as is". -#: ../libgnomekbd/gkbd-keyboard-config.c:813 +#: ../libgnomekbd/gkbd-keyboard-config.c:771 #, c-format msgid "option \"%s\"" msgid_plural "options \"%s\"" msgstr[0] "ഐച്ഛികം \"%s\"" msgstr[1] "ഐച്ഛികങ്ങള്‍ \"%s\"" -#: ../libgnomekbd/gkbd-keyboard-config.c:821 +#: ../libgnomekbd/gkbd-keyboard-config.c:779 #, c-format msgid "model \"%s\", %s and %s" msgstr "മോഡല്‍ \"%s\", %s and %s" -#: ../libgnomekbd/gkbd-keyboard-config.c:822 +#: ../libgnomekbd/gkbd-keyboard-config.c:780 msgid "no layout" msgstr "വിന്യാസം ലഭ്യമല്ല" -#: ../libgnomekbd/gkbd-keyboard-config.c:823 +#: ../libgnomekbd/gkbd-keyboard-config.c:781 msgid "no options" msgstr "ഐച്ഛികങ്ങളില്ല" @@ -74,6 +70,8 @@ "A collection of scripts to run whenever the keyboard state is reloaded. " "Useful for re-applying xmodmap based adjustments" msgstr "" +"കീബോര്‍ഡ് സ്ഥിതി റീലോഡ് ചെയ്യുംബോള്‍ പ്രവര്‍ത്തിപ്പിക്കേണ്ട സ്ക്രിപ്റ്റുകളുടെ പട്ടിക. xmodmap-ഇനെ " +"അടിസ്ഥാനമാക്കിയുള്ള മാറ്റങ്ങള്‍ വീണ്ടും വരുത്താന്‍ സഹായകരമാണു്‌" #: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:2 msgid "A list of modmap files available in the $HOME directory." @@ -104,77 +102,66 @@ msgstr "കീബോര്‍ഡ് ഐച്ഛികങ്ങള്‍" #: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:9 -msgid "" -"Keyboard settings in gconf will be overridden from the system ASAP " -"(deprecated)" -msgstr "" - -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10 msgid "Save/restore indicators together with layout groups" -msgstr "" +msgstr "വിന്യാസ കൂട്ടങ്ങള്‍ക്കൊപ്പം സൂചികകള്‍ സൂക്ഷിക്കുക/തിരികെ കൊണ്ടു വരുക" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:10 msgid "Secondary groups" msgstr "ദ്വിതീയ ഗ്രൂപ്പുകള്‍" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:11 msgid "Show flags in the applet" msgstr "ലഘുപ്രയോഗത്തില്‍ പതാകകള്‍ കാണിയ്ക്കുക" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:12 msgid "Show flags in the applet to indicate the current layout" msgstr "ഇപ്പോളത്തെ വിന്യാസം കാണീയ്ക്കാന്‍ ലഘുപ്രയോഗത്തില്‍ പതാകകള്‍ കാണിയ്ക്കുക" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:13 msgid "Show layout names instead of group names" msgstr "ഗ്രൂപ്പ് പേരിനുപകരം വിന്യാസത്തിന്റെ പേരു് കാണിയ്ക്കുക" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:14 msgid "" "Show layout names instead of group names (only for versions of XFree " "supporting multiple layouts)" msgstr "" +"കൂട്ട പേരുകള്‍ക്കു പകരം വിന്യാസം പേരു്‌ ഉപയോഗിക്കുക (ഒന്നിലേറെ വിന്യാസങ്ങള്‍ താങ്ങുന്ന XFree-യുടെ " +"പതിപ്പുകള്‍ക്കു്‌ മാത്രം)" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:16 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:15 msgid "Suppress the \"X sysconfig changed\" warning message" msgstr "\"X sysconfig changed\" മുന്നറിയിപ്പു സന്ദേശങ്ങള്‍ അടക്കിവെയ്ക്കുക" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:17 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:16 msgid "The Keyboard Preview, X offset" msgstr "കീബോര്‍ഡ് തിരനോട്ടം, X offset" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:18 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:17 msgid "The Keyboard Preview, Y offset" msgstr "കീബോര്‍ഡ് തിരനോട്ടം, Y offset" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:19 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:18 msgid "The Keyboard Preview, height" msgstr "കീബോര്‍ഡ് തിരനോട്ടം, ഉയരം" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:20 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:19 msgid "The Keyboard Preview, width" msgstr "കീബോര്‍ഡ് തിരനോട്ടം, വീതി" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:21 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:20 msgid "The list of enabled Keyboard Indicator plugins" msgstr "കീബോര്‍ഡ് സൂചക പ്ലഗ്ഗിനുകളുടെ ലിസ്റ്റ്" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:22 -msgid "" -"Very soon, keyboard settings in gconf will be overridden (from the system " -"configuration) This key has been deprecated since GNOME 2.12, please unset " -"the model, layouts and options keys to get the default system configuration." -msgstr "" - -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:23 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:21 msgid "keyboard layout" msgstr "കീബോര്‍ഡ് വിന്യാസം" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:24 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:22 msgid "keyboard model" msgstr "കീബോര്‍ഡ് മോഡല്‍" -#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:25 +#: ../libgnomekbd/desktop_gnome_peripherals_keyboard_xkb.schemas.in.h:23 msgid "modmap file list" msgstr "മോഡ്മാപ്പ് ഫയല്‍ പട്ടിക" @@ -222,19 +209,23 @@ msgid "_Available plugins:" msgstr "ലഭ്യമായ പ്ലഗ്ഗിനുകള്‍" -#: ../capplet/gkbd-indicator-plugins-capplet.c:122 +#: ../capplet/gkbd-indicator-plugins-capplet.c:120 #: ../capplet/gkbd-indicator-plugins-add.c:106 msgid "No description." msgstr "വിവരണമില്ല" -#: ../capplet/gkbd-indicator-plugins-capplet.c:344 +#: ../capplet/gkbd-indicator-plugins-capplet.c:258 +msgid "Unable to open help file" +msgstr "സഹായ ഫയല്‍ തുറക്കാന്‍ കഴിയുന്നില്ല" + +#: ../capplet/gkbd-indicator-plugins-capplet.c:360 #, c-format msgid "Failed to init GConf: %s\n" -msgstr "" +msgstr "തുടങ്ങാന്‍ സാധിച്ചില്ല ജി-കോണ്‍ഫ് : %s\n" #: ../capplet/gkbd-indicator-plugins-capplet.desktop.in.in.h:1 msgid "Enable/disable installed plugins" -msgstr "" +msgstr "ഇന്‍സ്റ്റാള്‍ ചെയ്ത സംയോജകങ്ങള്‍ പ്രാവര്‍ത്തികം/അപ്രാവര്‍ത്തികം ആക്കുക" #: ../capplet/gkbd-indicator-plugins-capplet.desktop.in.in.h:2 msgid "Keyboard Indicator plugins" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org