From 99bcdcbfea2030ac0f15ba3a81d50532e74a1584 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Jul 23 2010 14:05:15 +0000 Subject: - Fix crash caused by wrong translations (bn_IN, gu_IN) (#583559) --- diff --git a/nautilus-578086-po.patch b/nautilus-578086-po.patch new file mode 100644 index 0000000..c050d25 --- /dev/null +++ b/nautilus-578086-po.patch @@ -0,0 +1,69 @@ +diff --git a/po/bn.po b/po/bn.po +index 353931f..d7c5618 100644 +--- a/po/bn.po ++++ b/po/bn.po +@@ -2306,14 +2306,14 @@ msgstr "\"%B\"-এর অনুলিপি তৈরি করা হচ্ছ + #: ../libnautilus-private/nautilus-file-operations.c:2864 + msgid "Moving %'d file (in \"%B\") to \"%B\"" + msgid_plural "Moving %'d files (in \"%B\") to \"%B\"" +-msgstr[0] " \"%1$B\"-এ উপস্থিত %2$d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" +-msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ স্থানান্তর করা হচ্ছে" ++msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" ++msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" + + #: ../libnautilus-private/nautilus-file-operations.c:2868 + msgid "Copying %'d file (in \"%B\") to \"%B\"" + msgid_plural "Copying %'d files (in \"%B\") to \"%B\"" +-msgstr[0] " \"%1$B\"-এ উপস্থিত %2$'d ফাইল \"%3$B\"-এ অনুলিপি হচ্ছে" +-msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ কপি হচ্ছে" ++msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ অনুলিপি হচ্ছে" ++msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ কপি হচ্ছে" + + #: ../libnautilus-private/nautilus-file-operations.c:2876 + msgid "Duplicating %'d file (in \"%B\")" +diff --git a/po/bn_IN.po b/po/bn_IN.po +index 51bb767..a7a330c 100644 +--- a/po/bn_IN.po ++++ b/po/bn_IN.po +@@ -2286,14 +2286,14 @@ msgstr "\"%B\"-র প্রতিলিপি তৈরি করা হচ্ + #: ../libnautilus-private/nautilus-file-operations.c:2890 + msgid "Moving %'d file (in \"%B\") to \"%B\"" + msgid_plural "Moving %'d files (in \"%B\") to \"%B\"" +-msgstr[0] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ স্থানান্তর করা হচ্ছে" +-msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ স্থানান্তর করা হচ্ছে" ++msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" ++msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ স্থানান্তর করা হচ্ছে" + + #: ../libnautilus-private/nautilus-file-operations.c:2894 + msgid "Copying %'d file (in \"%B\") to \"%B\"" + msgid_plural "Copying %'d files (in \"%B\") to \"%B\"" +-msgstr[0] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ কপি হচ্ছে" +-msgstr[1] " \"%B\"-এ উপস্থিত %'d ফাইল \"%B\"-এ কপি হচ্ছে" ++msgstr[0] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ কপি হচ্ছে" ++msgstr[1] " \"%2$B\"-এ উপস্থিত %1$'d ফাইল \"%3$B\"-এ কপি হচ্ছে" + + #: ../libnautilus-private/nautilus-file-operations.c:2902 + msgid "Duplicating %'d file (in \"%B\")" +diff --git a/po/gu.po b/po/gu.po +index 0dd7313..24d916a 100644 +--- a/po/gu.po ++++ b/po/gu.po +@@ -2240,14 +2240,14 @@ msgstr "\"%B\" ની નકલ કરી રહ્યા છીએ" + #: ../libnautilus-private/nautilus-file-operations.c:2890 + msgid "Moving %'d file (in \"%B\") to \"%B\"" + msgid_plural "Moving %'d files (in \"%B\") to \"%B\"" +-msgstr[0] "\"%B\" માં %'d ફાઇલોને ખસેડી રહ્યા છે (\"%B\" માં)" +-msgstr[1] "\"%B\" માં %'d ને ખસેડી રહ્યા છે (\"%B\" માં)" ++msgstr[0] "\"%3$B\" માં %1$'d ફાઇલોને ખસેડી રહ્યા છે (\"%2$B\" માં)" ++msgstr[1] "\"%3$B\" માં %1$'d ને ખસેડી રહ્યા છે (\"%2$B\" માં)" + + #: ../libnautilus-private/nautilus-file-operations.c:2894 + msgid "Copying %'d file (in \"%B\") to \"%B\"" + msgid_plural "Copying %'d files (in \"%B\") to \"%B\"" +-msgstr[0] "\"%B\" માં %'d ફાઇલની નકલ કરી રહ્યા છે" +-msgstr[1] "\"%B\" માં %'d ફાઇલોની નકલ કરી રહ્યા છે" ++msgstr[0] "\"%3$B\" માં %1$'d ફાઇલની નકલ કરી રહ્યા છે (\"%2$B\")" ++msgstr[1] "\"%3$B\" માં %1$'d ફાઇલોની નકલ કરી રહ્યા છે (\"%2$B\")" + + #: ../libnautilus-private/nautilus-file-operations.c:2902 + msgid "Duplicating %'d file (in \"%B\")" diff --git a/nautilus.spec b/nautilus.spec index d8fc2f9..4edc2ae 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -15,7 +15,7 @@ Name: nautilus Summary: File manager for GNOME Version: 2.30.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: User Interface/Desktops Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2 @@ -94,6 +94,11 @@ Patch20: nautilus-gconf-navigation_window_saved_maximized.patch Patch21: nautilus-gconf-correct-type.patch Patch22: nautilus-gconf-default-value.patch +# [bn_IN, gu_IN][nautilus] - Its crashing, when drag any file +# https://bugzilla.redhat.com/show_bug.cgi?id=583559 +Patch23: nautilus-578086-po.patch + + %description Nautilus is the file manager and graphical shell for the GNOME desktop that makes it easy to manage your files and the rest of your system. @@ -137,6 +142,7 @@ for developing nautilus extensions. %patch20 -p1 -b .saved-maximized %patch21 -p1 -b .gconf-type %patch22 -p1 -b .gconf-default +%patch23 -p1 -b .gu_IN-crash %build @@ -273,6 +279,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %changelog +* Fri Jul 23 2010 Tomas Bzatek - 2.30.1-6 +- Fix crash caused by wrong translations (bn_IN, gu_IN) (#583559) + * Wed Jul 21 2010 Tomas Bzatek - 2.30.1-5 - Set default value in order to avoid gconf warnings (#614715)