diff -Nru gnome-desktop-2.22.1/ChangeLog gnome-desktop-2.22.2/ChangeLog --- gnome-desktop-2.22.1/ChangeLog 2008-04-07 23:26:52.000000000 +0200 +++ gnome-desktop-2.22.2/ChangeLog 2008-05-26 18:25:30.000000000 +0200 @@ -1,3 +1,20 @@ +2008-05-26 Vincent Untz + + * configure.in: + * NEWS: + * README: version 2.22.2 + +2008-05-05 Vincent Untz + + * autogen.sh: touch gnome-about/foundation-members.list when gvfs-copy + fails + +2008-04-07 Vincent Untz + + * configure.in: post-release bump to 2.22.2 + +==================== 2.22.1 ==================== + 2008-04-07 Vincent Untz * configure.in: diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/configure /tmp/9k1jLYNok4/gnome-desktop-2.22.2/configure --- gnome-desktop-2.22.1/configure 2008-04-07 23:27:22.000000000 +0200 +++ gnome-desktop-2.22.2/configure 2008-05-26 18:32:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gnome-desktop 2.22.1. +# Generated by GNU Autoconf 2.61 for gnome-desktop 2.22.2. # # Report bugs to . # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='gnome-desktop' PACKAGE_TARNAME='gnome-desktop' -PACKAGE_VERSION='2.22.1' -PACKAGE_STRING='gnome-desktop 2.22.1' +PACKAGE_VERSION='2.22.2' +PACKAGE_STRING='gnome-desktop 2.22.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop' ac_unique_file="libgnome-desktop" @@ -1498,7 +1498,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-desktop 2.22.1 to adapt to many kinds of systems. +\`configure' configures gnome-desktop 2.22.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1572,7 +1572,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-desktop 2.22.1:";; + short | recursive ) echo "Configuration of gnome-desktop 2.22.2:";; esac cat <<\_ACEOF @@ -1700,7 +1700,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-desktop configure 2.22.1 +gnome-desktop configure 2.22.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1714,7 +1714,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-desktop $as_me 2.22.1, which was +It was created by gnome-desktop $as_me 2.22.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2406,7 +2406,7 @@ # Define the identity of the package. PACKAGE='gnome-desktop' - VERSION='2.22.1' + VERSION='2.22.2' cat >>confdefs.h <<_ACEOF @@ -2569,7 +2569,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LT_VERSION=6:6:4 +LT_VERSION=6:7:4 { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 @@ -21130,7 +21130,7 @@ GNOME_PLATFORM=2 GNOME_MINOR=22 -GNOME_MICRO=1 +GNOME_MICRO=2 GNOME_DISTRIBUTOR="GNOME.Org" GNOME_DATE=`date +"%Y-%m-%d"` @@ -26478,7 +26478,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-desktop $as_me 2.22.1, which was +This file was extended by gnome-desktop $as_me 2.22.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26531,7 +26531,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gnome-desktop config.status 2.22.1 +gnome-desktop config.status 2.22.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/configure.in /tmp/9k1jLYNok4/gnome-desktop-2.22.2/configure.in --- gnome-desktop-2.22.1/configure.in 2008-04-07 23:27:00.000000000 +0200 +++ gnome-desktop-2.22.2/configure.in 2008-05-26 18:25:40.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([gnome-desktop], [2.22.1], +AC_INIT([gnome-desktop], [2.22.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop]) AC_CONFIG_SRCDIR([libgnome-desktop]) @@ -19,7 +19,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LT_VERSION=6:6:4 +LT_VERSION=6:7:4 AC_SUBST(LT_VERSION) AM_MAINTAINER_MODE @@ -35,7 +35,7 @@ GNOME_PLATFORM=2 GNOME_MINOR=22 -GNOME_MICRO=1 +GNOME_MICRO=2 GNOME_DISTRIBUTOR="GNOME.Org" GNOME_DATE=`date +"%Y-%m-%d"` diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/debian/changelog /tmp/9k1jLYNok4/gnome-desktop-2.22.2/debian/changelog --- gnome-desktop-2.22.1/debian/changelog 2008-05-26 22:47:37.000000000 +0200 +++ gnome-desktop-2.22.2/debian/changelog 2008-05-26 22:47:37.000000000 +0200 @@ -1,3 +1,19 @@ +gnome-desktop (1:2.22.2-0ubuntu1) hardy-updates; urgency=low + + * New upstream version (lp: #235073): + libgnome-desktop + - Fix leak in GnomeBG + gnome-about + - Don't skip the last description from gnome-version.xml + - Convert the strftime() output to UTF-8 + Misc + - Make sure gnome-about/foundation-members.list exists + * debian/patches/100_gd-add-randr-12.patch.orig: + - the serial number is an unsigned int, fix incorrect setup on next login + (lp: #227228) + + -- Sebastien Bacher Mon, 26 May 2008 22:20:23 +0200 + gnome-desktop (1:2.22.1-0ubuntu6.2) hardy-proposed; urgency=low * debian/patches/90_from_svn_zoomed_wallpaper_correctly_centered.patch: diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/debian/patches/100_gd-add-randr-12.patch /tmp/9k1jLYNok4/gnome-desktop-2.22.2/debian/patches/100_gd-add-randr-12.patch --- gnome-desktop-2.22.1/debian/patches/100_gd-add-randr-12.patch 2008-05-26 22:47:37.000000000 +0200 +++ gnome-desktop-2.22.2/debian/patches/100_gd-add-randr-12.patch 2008-05-26 22:47:37.000000000 +0200 @@ -1,6 +1,6 @@ -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/display-name.c gnome-desktop-2.22.1-modified/libgnome-desktop/display-name.c ---- gnome-desktop-2.22.1/libgnome-desktop/display-name.c 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/display-name.c 2008-04-08 15:25:18.000000000 -0700 +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/display-name.c gnome-desktop-2.22.2.new/libgnome-desktop/display-name.c +--- gnome-desktop-2.22.2/libgnome-desktop/display-name.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/display-name.c 2008-05-26 22:39:11.000000000 +0200 @@ -0,0 +1,252 @@ +/* + * Copyright 2007 Red Hat, Inc. @@ -254,9 +254,183 @@ + else + return g_strdup_printf ("%s\n", vendor); +} -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/edid-parse.c gnome-desktop-2.22.1-modified/libgnome-desktop/edid-parse.c ---- gnome-desktop-2.22.1/libgnome-desktop/edid-parse.c 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/edid-parse.c 2008-04-08 15:25:18.000000000 -0700 +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/edid.h gnome-desktop-2.22.2.new/libgnome-desktop/edid.h +--- gnome-desktop-2.22.2/libgnome-desktop/edid.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/edid.h 2008-05-26 22:39:11.000000000 +0200 +@@ -0,0 +1,170 @@ ++typedef unsigned char uchar; ++typedef struct MonitorInfo MonitorInfo; ++typedef struct Timing Timing; ++typedef struct DetailedTiming DetailedTiming; ++ ++typedef enum ++{ ++ UNDEFINED, ++ DVI, ++ HDMI_A, ++ HDMI_B, ++ MDDI, ++ DISPLAY_PORT ++} Interface; ++ ++typedef enum ++{ ++ UNDEFINED_COLOR, ++ MONOCHROME, ++ RGB, ++ OTHER_COLOR ++} ColorType; ++ ++typedef enum ++{ ++ NO_STEREO, ++ FIELD_RIGHT, ++ FIELD_LEFT, ++ TWO_WAY_RIGHT_ON_EVEN, ++ TWO_WAY_LEFT_ON_EVEN, ++ FOUR_WAY_INTERLEAVED, ++ SIDE_BY_SIDE ++} StereoType; ++ ++struct Timing ++{ ++ int width; ++ int height; ++ int frequency; ++}; ++ ++struct DisplayDescriptor ++{ ++}; ++ ++struct DetailedTiming ++{ ++ int pixel_clock; ++ int h_addr; ++ int h_blank; ++ int h_sync; ++ int h_front_porch; ++ int v_addr; ++ int v_blank; ++ int v_sync; ++ int v_front_porch; ++ int width_mm; ++ int height_mm; ++ int right_border; ++ int top_border; ++ int interlaced; ++ StereoType stereo; ++ ++ int digital_sync; ++ union ++ { ++ struct ++ { ++ int bipolar; ++ int serrations; ++ int sync_on_green; ++ } analog; ++ ++ struct ++ { ++ int composite; ++ int serrations; ++ int negative_vsync; ++ int negative_hsync; ++ } digital; ++ }; ++}; ++ ++struct MonitorInfo ++{ ++ int checksum; ++ char manufacturer_code[4]; ++ int product_code; ++ unsigned int serial_number; ++ ++ int production_week; /* -1 if not specified */ ++ int production_year; /* -1 if not specified */ ++ int model_year; /* -1 if not specified */ ++ ++ int major_version; ++ int minor_version; ++ ++ int is_digital; ++ ++ union ++ { ++ struct ++ { ++ int bits_per_primary; ++ Interface interface; ++ int rgb444; ++ int ycrcb444; ++ int ycrcb422; ++ } digital; ++ ++ struct ++ { ++ double video_signal_level; ++ double sync_signal_level; ++ double total_signal_level; ++ ++ int blank_to_black; ++ ++ int separate_hv_sync; ++ int composite_sync_on_h; ++ int composite_sync_on_green; ++ int serration_on_vsync; ++ ColorType color_type; ++ } analog; ++ }; ++ ++ int width_mm; /* -1 if not specified */ ++ int height_mm; /* -1 if not specified */ ++ double aspect_ratio; /* -1.0 if not specififed */ ++ ++ double gamma; /* -1.0 if not specified */ ++ ++ int standby; ++ int suspend; ++ int active_off; ++ ++ int srgb_is_standard; ++ int preferred_timing_includes_native; ++ int continuous_frequency; ++ ++ double red_x; ++ double red_y; ++ double green_x; ++ double green_y; ++ double blue_x; ++ double blue_y; ++ double white_x; ++ double white_y; ++ ++ Timing established[24]; /* Terminated by 0x0x0 */ ++ Timing standard[8]; ++ ++ int n_detailed_timings; ++ DetailedTiming detailed_timings[4]; /* If monitor has a preferred ++ * mode, it is the first one ++ * (whether it has, is ++ * determined by the ++ * preferred_timing_includes ++ * bit. ++ */ ++ ++ /* Optional product description */ ++ char dsc_serial_number[14]; ++ char dsc_product_name[14]; ++ char dsc_string[14]; /* Unspecified ASCII data */ ++}; ++ ++MonitorInfo *decode_edid (const uchar *data); ++char * make_display_name (const char *output_name, ++ const MonitorInfo *info); +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/edid-parse.c gnome-desktop-2.22.2.new/libgnome-desktop/edid-parse.c +--- gnome-desktop-2.22.2/libgnome-desktop/edid-parse.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/edid-parse.c 2008-05-26 22:39:11.000000000 +0200 @@ -0,0 +1,551 @@ +/* + * Copyright 2007 Red Hat, Inc. @@ -809,183 +983,9 @@ + + return info; +} -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/edid.h gnome-desktop-2.22.1-modified/libgnome-desktop/edid.h ---- gnome-desktop-2.22.1/libgnome-desktop/edid.h 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/edid.h 2008-04-08 15:25:18.000000000 -0700 -@@ -0,0 +1,170 @@ -+typedef unsigned char uchar; -+typedef struct MonitorInfo MonitorInfo; -+typedef struct Timing Timing; -+typedef struct DetailedTiming DetailedTiming; -+ -+typedef enum -+{ -+ UNDEFINED, -+ DVI, -+ HDMI_A, -+ HDMI_B, -+ MDDI, -+ DISPLAY_PORT -+} Interface; -+ -+typedef enum -+{ -+ UNDEFINED_COLOR, -+ MONOCHROME, -+ RGB, -+ OTHER_COLOR -+} ColorType; -+ -+typedef enum -+{ -+ NO_STEREO, -+ FIELD_RIGHT, -+ FIELD_LEFT, -+ TWO_WAY_RIGHT_ON_EVEN, -+ TWO_WAY_LEFT_ON_EVEN, -+ FOUR_WAY_INTERLEAVED, -+ SIDE_BY_SIDE -+} StereoType; -+ -+struct Timing -+{ -+ int width; -+ int height; -+ int frequency; -+}; -+ -+struct DisplayDescriptor -+{ -+}; -+ -+struct DetailedTiming -+{ -+ int pixel_clock; -+ int h_addr; -+ int h_blank; -+ int h_sync; -+ int h_front_porch; -+ int v_addr; -+ int v_blank; -+ int v_sync; -+ int v_front_porch; -+ int width_mm; -+ int height_mm; -+ int right_border; -+ int top_border; -+ int interlaced; -+ StereoType stereo; -+ -+ int digital_sync; -+ union -+ { -+ struct -+ { -+ int bipolar; -+ int serrations; -+ int sync_on_green; -+ } analog; -+ -+ struct -+ { -+ int composite; -+ int serrations; -+ int negative_vsync; -+ int negative_hsync; -+ } digital; -+ }; -+}; -+ -+struct MonitorInfo -+{ -+ int checksum; -+ char manufacturer_code[4]; -+ int product_code; -+ unsigned int serial_number; -+ -+ int production_week; /* -1 if not specified */ -+ int production_year; /* -1 if not specified */ -+ int model_year; /* -1 if not specified */ -+ -+ int major_version; -+ int minor_version; -+ -+ int is_digital; -+ -+ union -+ { -+ struct -+ { -+ int bits_per_primary; -+ Interface interface; -+ int rgb444; -+ int ycrcb444; -+ int ycrcb422; -+ } digital; -+ -+ struct -+ { -+ double video_signal_level; -+ double sync_signal_level; -+ double total_signal_level; -+ -+ int blank_to_black; -+ -+ int separate_hv_sync; -+ int composite_sync_on_h; -+ int composite_sync_on_green; -+ int serration_on_vsync; -+ ColorType color_type; -+ } analog; -+ }; -+ -+ int width_mm; /* -1 if not specified */ -+ int height_mm; /* -1 if not specified */ -+ double aspect_ratio; /* -1.0 if not specififed */ -+ -+ double gamma; /* -1.0 if not specified */ -+ -+ int standby; -+ int suspend; -+ int active_off; -+ -+ int srgb_is_standard; -+ int preferred_timing_includes_native; -+ int continuous_frequency; -+ -+ double red_x; -+ double red_y; -+ double green_x; -+ double green_y; -+ double blue_x; -+ double blue_y; -+ double white_x; -+ double white_y; -+ -+ Timing established[24]; /* Terminated by 0x0x0 */ -+ Timing standard[8]; -+ -+ int n_detailed_timings; -+ DetailedTiming detailed_timings[4]; /* If monitor has a preferred -+ * mode, it is the first one -+ * (whether it has, is -+ * determined by the -+ * preferred_timing_includes -+ * bit. -+ */ -+ -+ /* Optional product description */ -+ char dsc_serial_number[14]; -+ char dsc_product_name[14]; -+ char dsc_string[14]; /* Unspecified ASCII data */ -+}; -+ -+MonitorInfo *decode_edid (const uchar *data); -+char * make_display_name (const char *output_name, -+ const MonitorInfo *info); -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/monitor-db.h gnome-desktop-2.22.1-modified/libgnome-desktop/libgnomeui/monitor-db.h ---- gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/monitor-db.h 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/libgnomeui/monitor-db.h 2008-04-08 15:25:18.000000000 -0700 +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/libgnomeui/monitor-db.h gnome-desktop-2.22.2.new/libgnome-desktop/libgnomeui/monitor-db.h +--- gnome-desktop-2.22.2/libgnome-desktop/libgnomeui/monitor-db.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/libgnomeui/monitor-db.h 2008-05-26 22:39:11.000000000 +0200 @@ -0,0 +1,60 @@ +#ifdef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA +#define I_KNOW_THIS_IS_UNSTABLE_AND_NOT_IN_GNOME @@ -1047,9 +1047,9 @@ + RWScreen *screen); + +#endif -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/randrwrap.h gnome-desktop-2.22.1-modified/libgnome-desktop/libgnomeui/randrwrap.h ---- gnome-desktop-2.22.1/libgnome-desktop/libgnomeui/randrwrap.h 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/libgnomeui/randrwrap.h 2008-04-08 15:25:18.000000000 -0700 +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/libgnomeui/randrwrap.h gnome-desktop-2.22.2.new/libgnome-desktop/libgnomeui/randrwrap.h +--- gnome-desktop-2.22.2/libgnome-desktop/libgnomeui/randrwrap.h 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/libgnomeui/randrwrap.h 2008-05-26 22:39:11.000000000 +0200 @@ -0,0 +1,104 @@ +#ifdef I_KNOW_THIS_IS_UNSTABLE_AND_ONLY_IN_FEDORA +#define I_KNOW_THIS_IS_UNSTABLE_AND_NOT_IN_GNOME @@ -1155,10 +1155,10 @@ + RWRotation rotation); + +#endif -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/monitor-db.c gnome-desktop-2.22.1-modified/libgnome-desktop/monitor-db.c ---- gnome-desktop-2.22.1/libgnome-desktop/monitor-db.c 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/monitor-db.c 2008-04-08 15:25:18.000000000 -0700 -@@ -0,0 +1,1309 @@ +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/monitor-db.c gnome-desktop-2.22.2.new/libgnome-desktop/monitor-db.c +--- gnome-desktop-2.22.2/libgnome-desktop/monitor-db.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/monitor-db.c 2008-05-26 22:42:12.000000000 +0200 +@@ -0,0 +1,1315 @@ +#include +#include +#include @@ -1199,6 +1199,12 @@ + return strtol (text, NULL, 0); +} + ++static guint ++parse_uint (const char *text) ++{ ++ return strtoul (text, NULL, 0); ++} ++ +static gboolean +stack_is (Parser *parser, + const char *s1, @@ -1353,7 +1359,7 @@ + { + parser->output->connected = TRUE; + -+ parser->output->serial = parse_int (text); ++ parser->output->serial = parse_uint (text); + } + else if (stack_is (parser, "width", "output", "configuration", NULL)) + { @@ -2468,9 +2474,9 @@ + return NULL; + } +} -diff -Nurp gnome-desktop-2.22.1/libgnome-desktop/randrwrap.c gnome-desktop-2.22.1-modified/libgnome-desktop/randrwrap.c ---- gnome-desktop-2.22.1/libgnome-desktop/randrwrap.c 1969-12-31 16:00:00.000000000 -0800 -+++ gnome-desktop-2.22.1-modified/libgnome-desktop/randrwrap.c 2008-04-08 15:25:18.000000000 -0700 +diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.22.2/libgnome-desktop/randrwrap.c gnome-desktop-2.22.2.new/libgnome-desktop/randrwrap.c +--- gnome-desktop-2.22.2/libgnome-desktop/randrwrap.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-desktop-2.22.2.new/libgnome-desktop/randrwrap.c 2008-05-26 22:39:11.000000000 +0200 @@ -0,0 +1,1124 @@ +#define I_KNOW_THIS_IS_UNSTABLE_AND_NOT_IN_GNOME +#include "libgnomeui/randrwrap.h" diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/desktop-docs/ChangeLog /tmp/9k1jLYNok4/gnome-desktop-2.22.2/desktop-docs/ChangeLog --- gnome-desktop-2.22.1/desktop-docs/ChangeLog 2008-04-07 23:18:11.000000000 +0200 +++ gnome-desktop-2.22.2/desktop-docs/ChangeLog 2008-05-26 18:10:55.000000000 +0200 @@ -1,3 +1,5 @@ +==================== 2.22.1 ==================== + ==================== 2.22.0 ==================== ==================== 2.21.92 ==================== diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/docs/reference/gnome-desktop/html/ch01.html /tmp/9k1jLYNok4/gnome-desktop-2.22.2/docs/reference/gnome-desktop/html/ch01.html --- gnome-desktop-2.22.1/docs/reference/gnome-desktop/html/ch01.html 2008-04-07 23:28:27.000000000 +0200 +++ gnome-desktop-2.22.2/docs/reference/gnome-desktop/html/ch01.html 2008-05-26 18:33:28.000000000 +0200 @@ -23,7 +23,7 @@

-API reference

+API reference
GnomeDItemEdit diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/gnome-about/ChangeLog /tmp/9k1jLYNok4/gnome-desktop-2.22.2/gnome-about/ChangeLog --- gnome-desktop-2.22.1/gnome-about/ChangeLog 2008-04-07 23:18:17.000000000 +0200 +++ gnome-desktop-2.22.2/gnome-about/ChangeLog 2008-05-26 18:11:02.000000000 +0200 @@ -1,3 +1,17 @@ +2008-05-05 Vincent Untz + + * gnome-about.in: convert the strftime() output to UTF-8 + Fix bug #530382 + Patch by Takao Fujiwara + +2008-05-05 Vincent Untz + + * gnome-about.in: don't skip the last description from + gnome-version.xml. + Patch by Matt Keenan . Fix bug #530904. + +==================== 2.22.1 ==================== + ==================== 2.22.0 ==================== ==================== 2.21.92 ==================== diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/gnome-about/foundation-members.list /tmp/9k1jLYNok4/gnome-desktop-2.22.2/gnome-about/foundation-members.list --- gnome-desktop-2.22.1/gnome-about/foundation-members.list 2008-04-07 23:27:13.000000000 +0200 +++ gnome-desktop-2.22.2/gnome-about/foundation-members.list 2008-05-26 18:32:28.000000000 +0200 @@ -104,6 +104,7 @@ Hubert Figuiere Valek Filippov Andrew Michael Fitzsimon +Leonardo Fontenelle Glynn Foster Ivan Frade Gustavo Franco @@ -154,9 +155,11 @@ Philip Van Hoof Alan Horkan Curtis Hovey +Richard Hughes Richard Hult Eskild Hustvedt Juan Carlos Inostroza Oliva +Eitan Isaacson Khandakar Mujahidul Islam Johnny Jacob Raphael Jacquot @@ -164,16 +167,13 @@ Hans Petter Jansson William Jon McCann Jonathon Jongsma -Tomas Junnonen Theppitak Karoonboonyanan Guntupalli Karunakar -Bob Kashani Matt Keenan Christian Kellner Darren Kenny Thomas Keup Sara Khalatbari -Richard Kinder Christian Kirbach Andre Klapper Michael J. Knox @@ -181,6 +181,7 @@ Werner Koch Peter Korn Stefan Kost +Petr Kovář George Kraft IV Jorg "Josh" Kress Kevin Kubasik @@ -210,7 +211,6 @@ Paolo Maggi María Majadas López Roberto Majadas Lopez -David Malcolm Jordi Mallach Suman Manjunath Kjartan Maraas @@ -284,7 +284,6 @@ Roozbeh Pournader Julien Puydt Cai Qian -Aparecido Quesada Liam Quin Srinivasa Ragavan Goran Rakic @@ -293,6 +292,7 @@ Mart Raudsepp Andreas Røsdal Scott Reeves +Travis Reitter Hendrik Richter Felix Riemann Kristian Rietveld @@ -310,7 +310,6 @@ Arvind Samptur Fernando San Martín Woerner Damien Sandras -Laurent Sansonetti Jonh Wendell S Santana Amaya Rodrigo Sastre Sílvia Miranda Sánchez @@ -400,4 +399,5 @@ Rosanna Yuen Meelad Zakaria Lukasz Zalewski +Patryk Zawadzki David Zeuthen diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/gnome-about/gnome-about.in /tmp/9k1jLYNok4/gnome-desktop-2.22.2/gnome-about/gnome-about.in --- gnome-desktop-2.22.1/gnome-about/gnome-about.in 2008-04-07 23:18:17.000000000 +0200 +++ gnome-desktop-2.22.2/gnome-about/gnome-about.in 2008-05-26 18:11:02.000000000 +0200 @@ -38,7 +38,7 @@ import cairo from math import pi -import os, sys, random, time, gettext +import os, sys, random, time, gettext, locale import xml.dom.minidom @@ -83,7 +83,8 @@ def cleanup_date (date): '''Parse a date as found in gnome-version.xml and nicely format it''' try: - return time.strftime ("%x", time.strptime (date, "%Y-%m-%d")) + # FIXME: we don't have g_locale_to_utf8 in python. See bug #530382 + return unicode (time.strftime ("%x", time.strptime (date, "%Y-%m-%d")), locale.getpreferredencoding ()).encode ("utf-8") except: return False @@ -995,8 +996,11 @@ for desc in raw_descs: new_i = descs.index (desc) if i != - 1: + # Append the previous description translations.append (descs[i:new_i]) i = new_i + # Open ended to retrieve all translation for last description + translations.append (descs[i:]) messages = GettableList () for block in translations: sorted_descs = sorted (block, cmp = desc_sort_func, diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/gnome-version.xml /tmp/9k1jLYNok4/gnome-desktop-2.22.2/gnome-version.xml --- gnome-desktop-2.22.1/gnome-version.xml 2008-04-07 23:28:19.000000000 +0200 +++ gnome-desktop-2.22.2/gnome-version.xml 2008-05-26 18:33:19.000000000 +0200 @@ -2,9 +2,9 @@ 2 22 - 1 + 2 GNOME.Org - 2008-04-07 + 2008-05-26

GNOME is a Free, usable, stable, accessible desktop environment for the Unix-like family of operating systems.

@@ -13,7 +13,7 @@

GNOME, Unix-bənzəri əməliyyat sistemləri ailələri üçün sərbəst, işlədilməsi asand, güclü, yetişmə qabiliyyətli masa üstü mühitidir.

GNOME - вольнае, карыснае, магутнае, даступнае працоўнае асяродзьде для UNIX-падобных апэрацыйных сыстэм.

GNOME jość svabodnym, zručnym, stabilnym asiarodździem dla aperacyjnych systemaŭ ź siamji Unix.

-

GNOME е свободна, лесна, стабилна и достъпна работна среда за операционни системи сходни с UNIX.

+

GNOME е свободна, лесна, стабилна и достъпна работна среда за операционни системи сходни с Unix.

ইউনিক্স-পরিবারের মতো অপারেটিং সিস্টেমের জন্য গনোম বিনামূল্যে,ব্যবহার উপযোগী, প্রতিষ্ঠিত, সমর্থিত একটি ডেস্কটপ।

Unix-পরিবারের বিভিন্ন অপারেটিং সিস্টেমে ব্যবহারের জন্য GNOME একটি মুক্ত, ব্যবহারযোগ্য, স্থায়ী ও সহজলভ্য ডেস্কটপ।

Un endro gorretaol haezadus, divrall, frank hag arveradus eo GNOME evit savennoù ar familh Unix.

diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/libgnome-desktop/ChangeLog /tmp/9k1jLYNok4/gnome-desktop-2.22.2/libgnome-desktop/ChangeLog --- gnome-desktop-2.22.1/libgnome-desktop/ChangeLog 2008-04-07 23:18:13.000000000 +0200 +++ gnome-desktop-2.22.2/libgnome-desktop/ChangeLog 2008-05-26 18:10:57.000000000 +0200 @@ -1,3 +1,10 @@ +2008-05-17 Vincent Untz + + * gnome-bg.c: (create_thumbnail_for_uri): fix leak. + Patch by Kjartan Maraas . Fix bug #532152. + +==================== 2.22.1 ==================== + 2008-03-29 Matthias Clasen * gnome-bg.c (get_current_slide): Handle start times in diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/libgnome-desktop/gnome-bg.c /tmp/9k1jLYNok4/gnome-desktop-2.22.2/libgnome-desktop/gnome-bg.c --- gnome-desktop-2.22.1/libgnome-desktop/gnome-bg.c 2008-04-07 23:18:13.000000000 +0200 +++ gnome-desktop-2.22.2/libgnome-desktop/gnome-bg.c 2008-05-26 18:10:57.000000000 +0200 @@ -1814,7 +1814,8 @@ if (filename) { pixbuf = gdk_pixbuf_new_from_file (filename, NULL); - + g_free (filename); + return pixbuf; } diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/NEWS /tmp/9k1jLYNok4/gnome-desktop-2.22.2/NEWS --- gnome-desktop-2.22.1/NEWS 2008-04-07 23:26:29.000000000 +0200 +++ gnome-desktop-2.22.2/NEWS 2008-05-26 18:25:18.000000000 +0200 @@ -1,4 +1,25 @@ ============== +Version 2.22.2 +============== + + libgnome-desktop + + * Fix leak in GnomeBG (Kjartan Maraas) + + gnome-about + + * Don't skip the last description from gnome-version.xml (Matt Keenan) + * Convert the strftime() output to UTF-8 (Takao Fujiwara) + + Misc + + * Make sure gnome-about/foundation-members.list exists (Vincent) + + Translators + + * Yavor Doganov (bg) + +============== Version 2.22.1 ============== diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/po/bg.po /tmp/9k1jLYNok4/gnome-desktop-2.22.2/po/bg.po --- gnome-desktop-2.22.1/po/bg.po 2008-04-07 23:18:24.000000000 +0200 +++ gnome-desktop-2.22.2/po/bg.po 2008-05-26 18:11:15.000000000 +0200 @@ -1,137 +1,106 @@ # Bulgarian translation of gnome-desktop po-file -# Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. # Pavel Cholakov , 2001. # Yanko Kaneti , 2002. # Peter "Peshka" Slavov , 2004. # Vladimir "Kaladan" Petkov , 2004, 2007. # Alexander Shopov , 2006, 2007. +# Yavor Doganov , 2008. # msgid "" msgstr "" "Project-Id-Version: gnome-desktop trunk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-09-19 00:13+0300\n" -"PO-Revision-Date: 2007-09-19 00:13+0300\n" -"Last-Translator: Vladimir Petkov \n" +"POT-Creation-Date: 2008-04-15 22:44+0300\n" +"PO-Revision-Date: 2008-04-14 17:33+0300\n" +"Last-Translator: Yavor Doganov \n" "Language-Team: Bulgarian \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" -#: ../gnome-about/contributors.c:49 +#: ../gnome-about/gnome-about.desktop.in.in.h:1 +#: ../gnome-about/gnome-about.in:61 +msgid "About GNOME" +msgstr "Относно GNOME" + +#: ../gnome-about/gnome-about.desktop.in.in.h:2 +msgid "Learn more about GNOME" +msgstr "Научете повече за GNOME" + +#: ../gnome-about/gnome-about.in:62 +msgid "News" +msgstr "Новини" + +#: ../gnome-about/gnome-about.in:63 +msgid "GNOME Library" +msgstr "Библиотека на GNOME" + +#: ../gnome-about/gnome-about.in:64 +msgid "Friends of GNOME" +msgstr "Приятели на GNOME" + +#: ../gnome-about/gnome-about.in:65 +msgid "Contact" +msgstr "Контакти" + +#: ../gnome-about/gnome-about.in:69 msgid "The Mysterious GEGL" msgstr "Мистериозният GEGL" -#: ../gnome-about/contributors.c:50 +#: ../gnome-about/gnome-about.in:70 msgid "The Squeaky Rubber GNOME" msgstr "Скърцащият, гумен GNOME" -#: ../gnome-about/contributors.c:51 +#: ../gnome-about/gnome-about.in:71 msgid "Wanda The GNOME Fish" msgstr "Рибата Уанда" -#: ../gnome-about/gnome-about.c:419 -msgid "Could not locate the directory with header images." -msgstr "Папката със заглавните изображения не може да бъде намерена." +#: ../gnome-about/gnome-about.in:567 +msgid "_Open URL" +msgstr "_Отиване на адреса" + +#: ../gnome-about/gnome-about.in:574 +msgid "_Copy URL" +msgstr "_Копиране на адреса" -#: ../gnome-about/gnome-about.c:428 -#, c-format -msgid "Failed to open directory with header images: %s" -msgstr "Папката със заглавните изображения „%s“ не може да бъде отворена." - -#: ../gnome-about/gnome-about.c:461 -#, c-format -msgid "Unable to load header image: %s" -msgstr "Заглавното изображение „%s“ не може да бъде заредено." - -#: ../gnome-about/gnome-about.c:486 -msgid "Could not locate the GNOME logo." -msgstr "Логото на GNOME не може да бъде намерено." +#: ../gnome-about/gnome-about.in:829 +msgid "About the GNOME Desktop" +msgstr "Относно работната среда GNOME" -#: ../gnome-about/gnome-about.c:495 -#, c-format -msgid "Unable to load '%s': %s" -msgstr "Неуспех при зареждането на „%s“: %s" +#: ../gnome-about/gnome-about.in:865 +msgid "%(name)s: %(value)s" +msgstr "%(name)s: %(value)s" -#: ../gnome-about/gnome-about.c:548 -#, c-format -msgid "Could not open the address \"%s\": %s" -msgstr "Неуспех при отварянето на адреса „%s“: %s" +#: ../gnome-about/gnome-about.in:879 +msgid "Welcome to the GNOME Desktop" +msgstr "Добре дошли в работната среда GNOME" -#: ../gnome-about/gnome-about.c:867 ../gnome-about/gnome-about.c:897 -msgid "Could not get information about GNOME version." -msgstr "Неуспех при намирането на информацията за версията на GNOME." +#: ../gnome-about/gnome-about.in:896 +msgid "Brought to you by:" +msgstr "Благодарение на:" -#: ../gnome-about/gnome-about.c:871 ../gnome-about/gnome-about.c:872 -#: ../gnome-about/gnome-about.c:873 -#, c-format -msgid "%s: %s\n" -msgstr "%s: %s\n" +#: ../gnome-about/gnome-about.in:920 +msgid "%(name)s: %(value)s" +msgstr "%(name)s: %(value)s" -#: ../gnome-about/gnome-about.c:871 ../gnome-about/gnome-about.c:911 +#: ../gnome-about/gnome-about.in:976 msgid "Version" msgstr "Версия" -#: ../gnome-about/gnome-about.c:872 ../gnome-about/gnome-about.c:930 +#: ../gnome-about/gnome-about.in:977 msgid "Distributor" msgstr "Разпространител" -#: ../gnome-about/gnome-about.c:873 ../gnome-about/gnome-about.c:949 +#: ../gnome-about/gnome-about.in:978 msgid "Build Date" msgstr "Дата на компилиране" -#: ../gnome-about/gnome-about.c:904 -#, c-format -msgid "%s: " -msgstr "%s: " - -#: ../gnome-about/gnome-about.c:1032 -#: ../gnome-about/gnome-about.desktop.in.in.h:1 -msgid "About GNOME" -msgstr "Относно GNOME" - -#: ../gnome-about/gnome-about.c:1046 -msgid "News" -msgstr "Новини" - -#: ../gnome-about/gnome-about.c:1056 -msgid "Software" -msgstr "Софтуер" - -# ## -#: ../gnome-about/gnome-about.c:1062 -msgid "Developers" -msgstr "Разработчици" - -#: ../gnome-about/gnome-about.c:1068 -msgid "Friends of GNOME" -msgstr "Приятели на GNOME" - -#: ../gnome-about/gnome-about.c:1074 -msgid "Contact" -msgstr "Контакти" - -#: ../gnome-about/gnome-about.c:1111 -msgid "Welcome to the GNOME Desktop" -msgstr "Добре дошли в работната среда GNOME" - -#: ../gnome-about/gnome-about.c:1128 -msgid "Brought to you by:" -msgstr "Благодарение на:" - -#: ../gnome-about/gnome-about.c:1176 -msgid "About the GNOME Desktop" -msgstr "Относно работната среда GNOME" - -#: ../gnome-about/gnome-about.c:1216 +#: ../gnome-about/gnome-about.in:1019 msgid "Display information on this GNOME version" msgstr "Информация за версията на GNOME" -#: ../gnome-about/gnome-about.desktop.in.in.h:2 -msgid "Learn more about GNOME" -msgstr "Научете повече за GNOME" - #: ../gnome-version.xml.in.in.h:1 msgid "" "GNOME also includes a complete development platform for applications " @@ -157,7 +126,7 @@ "like family of operating systems." msgstr "" "GNOME е свободна, лесна, стабилна и достъпна работна среда за операционни " -"системи сходни с UNIX." +"системи сходни с Unix." #: ../gnome-version.xml.in.in.h:7 msgid "" @@ -185,193 +154,192 @@ "през 1997-ма и още повече допринасят чрез преводи, документация и контрол на " "качеството." -#: ../libgnome-desktop/gnome-desktop-item.c:210 -#: ../libgnome-desktop/gnome-desktop-item.c:598 +#: ../libgnome-desktop/gnome-desktop-item.c:219 #, c-format msgid "Error reading file '%s': %s" msgstr "Грешка при четенето на файла „%s“: %s" -#: ../libgnome-desktop/gnome-desktop-item.c:278 +#: ../libgnome-desktop/gnome-desktop-item.c:287 #, c-format msgid "Error rewinding file '%s': %s" msgstr "Грешка при превъртането на файла „%s“: %s" -#: ../libgnome-desktop/gnome-desktop-item.c:377 -#: ../libgnome-desktop/gnome-desktop-item.c:3748 +#: ../libgnome-desktop/gnome-desktop-item.c:389 +#: ../libgnome-desktop/gnome-desktop-item.c:3756 msgid "No name" msgstr "Няма име" -#: ../libgnome-desktop/gnome-desktop-item.c:613 +#: ../libgnome-desktop/gnome-desktop-item.c:616 #, c-format msgid "File '%s' is not a regular file or directory." msgstr "„%s“ не е обикновен файл или директория." -#: ../libgnome-desktop/gnome-desktop-item.c:789 +#: ../libgnome-desktop/gnome-desktop-item.c:796 #, c-format msgid "Error cannot find file id '%s'" msgstr "Грешка, идентификаторът на файла не може да бъде намерен „%s“" -#: ../libgnome-desktop/gnome-desktop-item.c:835 +#: ../libgnome-desktop/gnome-desktop-item.c:842 +#, c-format msgid "No filename to save to" msgstr "Липсва име на файл за запис" -#: ../libgnome-desktop/gnome-desktop-item.c:1828 +#: ../libgnome-desktop/gnome-desktop-item.c:1827 #, c-format msgid "Starting %s" msgstr "Стартиране на %s" -#: ../libgnome-desktop/gnome-desktop-item.c:2066 +#: ../libgnome-desktop/gnome-desktop-item.c:2063 +#, c-format msgid "No URL to launch" msgstr "Липсва адрес за стартиране" -#: ../libgnome-desktop/gnome-desktop-item.c:2080 +#: ../libgnome-desktop/gnome-desktop-item.c:2076 +#, c-format msgid "Not a launchable item" msgstr "Не е изпълним елемент" -#: ../libgnome-desktop/gnome-desktop-item.c:2090 +#: ../libgnome-desktop/gnome-desktop-item.c:2086 +#, c-format msgid "No command (Exec) to launch" msgstr "Липсва команда (Exec) за стартиране" -#: ../libgnome-desktop/gnome-desktop-item.c:2103 +#: ../libgnome-desktop/gnome-desktop-item.c:2099 +#, c-format msgid "Bad command (Exec) to launch" msgstr "Лоша команда (Exec) за стартиране" -#: ../libgnome-desktop/gnome-desktop-item.c:3805 +#: ../libgnome-desktop/gnome-desktop-item.c:3812 #, c-format msgid "Unknown encoding of: %s" msgstr "Неизвестно кодиране на: %s" -#: ../libgnome-desktop/gnome-desktop-item.c:4036 -#, c-format -msgid "Error writing file '%s': %s" -msgstr "Грешка при запис на файла „%s“: %s" - -#: ../libgnome-desktop/gnome-ditem-edit.c:210 -#: ../libgnome-desktop/gnome-ditem-edit.c:218 +#: ../libgnome-desktop/gnome-ditem-edit.c:209 +#: ../libgnome-desktop/gnome-ditem-edit.c:217 msgid "Directory" msgstr "Папка" -#: ../libgnome-desktop/gnome-ditem-edit.c:214 +#: ../libgnome-desktop/gnome-ditem-edit.c:213 msgid "Application" msgstr "Програма" -#: ../libgnome-desktop/gnome-ditem-edit.c:221 +#: ../libgnome-desktop/gnome-ditem-edit.c:220 msgid "Link" msgstr "Връзка" -#: ../libgnome-desktop/gnome-ditem-edit.c:223 +#: ../libgnome-desktop/gnome-ditem-edit.c:222 msgid "FSDevice" msgstr "Устройство с файлова система" -#: ../libgnome-desktop/gnome-ditem-edit.c:225 +#: ../libgnome-desktop/gnome-ditem-edit.c:224 msgid "MIME Type" msgstr "Вид по MIME" -#: ../libgnome-desktop/gnome-ditem-edit.c:227 +#: ../libgnome-desktop/gnome-ditem-edit.c:226 msgid "Service" msgstr "Услуга" -#: ../libgnome-desktop/gnome-ditem-edit.c:229 +#: ../libgnome-desktop/gnome-ditem-edit.c:228 msgid "ServiceType" msgstr "Тип услуга" -#: ../libgnome-desktop/gnome-ditem-edit.c:315 +#: ../libgnome-desktop/gnome-ditem-edit.c:314 msgid "_URL:" msgstr "_Адрес:" -#: ../libgnome-desktop/gnome-ditem-edit.c:318 -#: ../libgnome-desktop/gnome-ditem-edit.c:385 +#: ../libgnome-desktop/gnome-ditem-edit.c:317 +#: ../libgnome-desktop/gnome-ditem-edit.c:384 msgid "Comm_and:" msgstr "_Команда:" #. Name -#: ../libgnome-desktop/gnome-ditem-edit.c:339 +#: ../libgnome-desktop/gnome-ditem-edit.c:338 msgid "_Name:" msgstr "_Име:" #. Generic Name -#: ../libgnome-desktop/gnome-ditem-edit.c:356 +#: ../libgnome-desktop/gnome-ditem-edit.c:355 msgid "_Generic name:" msgstr "Об_що име:" #. Comment -#: ../libgnome-desktop/gnome-ditem-edit.c:373 +#: ../libgnome-desktop/gnome-ditem-edit.c:372 msgid "Co_mment:" msgstr "Ко_ментар:" -#: ../libgnome-desktop/gnome-ditem-edit.c:389 +#: ../libgnome-desktop/gnome-ditem-edit.c:388 msgid "Browse" msgstr "Избиране" -#: ../libgnome-desktop/gnome-ditem-edit.c:400 +#: ../libgnome-desktop/gnome-ditem-edit.c:399 msgid "_Type:" msgstr "_Тип:" -#: ../libgnome-desktop/gnome-ditem-edit.c:417 +#: ../libgnome-desktop/gnome-ditem-edit.c:416 msgid "_Icon:" msgstr "Ико_на:" -#: ../libgnome-desktop/gnome-ditem-edit.c:427 +#: ../libgnome-desktop/gnome-ditem-edit.c:426 msgid "Browse icons" msgstr "Избиране на икона" -#: ../libgnome-desktop/gnome-ditem-edit.c:441 +#: ../libgnome-desktop/gnome-ditem-edit.c:440 msgid "Run in t_erminal" msgstr "_Стартиране в терминал" -#: ../libgnome-desktop/gnome-ditem-edit.c:658 -#: ../libgnome-desktop/gnome-ditem-edit.c:758 +#: ../libgnome-desktop/gnome-ditem-edit.c:621 +#: ../libgnome-desktop/gnome-ditem-edit.c:721 msgid "Language" msgstr "Език" -#: ../libgnome-desktop/gnome-ditem-edit.c:663 -#: ../libgnome-desktop/gnome-ditem-edit.c:764 +#: ../libgnome-desktop/gnome-ditem-edit.c:626 +#: ../libgnome-desktop/gnome-ditem-edit.c:727 msgid "Name" msgstr "Име" -#: ../libgnome-desktop/gnome-ditem-edit.c:668 -#: ../libgnome-desktop/gnome-ditem-edit.c:770 +#: ../libgnome-desktop/gnome-ditem-edit.c:631 +#: ../libgnome-desktop/gnome-ditem-edit.c:733 msgid "Generic name" msgstr "Общо име" -#: ../libgnome-desktop/gnome-ditem-edit.c:673 -#: ../libgnome-desktop/gnome-ditem-edit.c:778 +#: ../libgnome-desktop/gnome-ditem-edit.c:636 +#: ../libgnome-desktop/gnome-ditem-edit.c:741 msgid "Comment" msgstr "Коментар" -#: ../libgnome-desktop/gnome-ditem-edit.c:711 +#: ../libgnome-desktop/gnome-ditem-edit.c:674 msgid "_Try this before using:" msgstr "Проба с _това преди да се използва:" -#: ../libgnome-desktop/gnome-ditem-edit.c:722 +#: ../libgnome-desktop/gnome-ditem-edit.c:685 msgid "_Documentation:" msgstr "_Документация:" -#: ../libgnome-desktop/gnome-ditem-edit.c:733 +#: ../libgnome-desktop/gnome-ditem-edit.c:696 msgid "_Name/Comment translations:" msgstr "Превод _на името/коментара:" -#: ../libgnome-desktop/gnome-ditem-edit.c:780 +#: ../libgnome-desktop/gnome-ditem-edit.c:743 msgid "_Add/Set" msgstr "До_бавяне/задаване" -#: ../libgnome-desktop/gnome-ditem-edit.c:785 +#: ../libgnome-desktop/gnome-ditem-edit.c:748 msgid "Add or Set Name/Comment Translations" msgstr "Добавяне или задаване на превод на името/коментара" -#: ../libgnome-desktop/gnome-ditem-edit.c:787 +#: ../libgnome-desktop/gnome-ditem-edit.c:750 msgid "Re_move" msgstr "Пре_махване" -#: ../libgnome-desktop/gnome-ditem-edit.c:792 +#: ../libgnome-desktop/gnome-ditem-edit.c:755 msgid "Remove Name/Comment Translation" msgstr "Премахване на превод на името/коментара" -#: ../libgnome-desktop/gnome-ditem-edit.c:808 +#: ../libgnome-desktop/gnome-ditem-edit.c:771 msgid "Basic" msgstr "Основни" -#: ../libgnome-desktop/gnome-ditem-edit.c:816 +#: ../libgnome-desktop/gnome-ditem-edit.c:779 msgid "Advanced" msgstr "Допълнителни" diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/po/ChangeLog /tmp/9k1jLYNok4/gnome-desktop-2.22.2/po/ChangeLog --- gnome-desktop-2.22.1/po/ChangeLog 2008-04-07 23:18:24.000000000 +0200 +++ gnome-desktop-2.22.2/po/ChangeLog 2008-05-26 18:11:15.000000000 +0200 @@ -1,3 +1,10 @@ +2008-04-15 Alexander Shopov + + * bg.po: Updated Bulgarian translation by + Yavor Doganov + +==================== 2.22.1 ==================== + 2008-04-01 Eskild Hustvedt * nn.po: Updated Norwegian Nynorsk translation diff -Nru /tmp/VWUQgF93jA/gnome-desktop-2.22.1/README /tmp/9k1jLYNok4/gnome-desktop-2.22.2/README --- gnome-desktop-2.22.1/README 2008-04-07 23:24:30.000000000 +0200 +++ gnome-desktop-2.22.2/README 2008-05-26 18:23:05.000000000 +0200 @@ -1,4 +1,4 @@ -gnome-desktop 2.22.1 +gnome-desktop 2.22.2 ==================== This package is free software and is part of the