use separte desktop-effects package

This commit is contained in:
drago01 2009-08-24 20:40:41 +00:00
parent 27a6c869a4
commit 69a9581fc5
5 changed files with 18 additions and 474 deletions

View File

@ -1 +1,2 @@
compiz-0.8.2.tar.bz2
kde-desktop-effects-0.0.6.tar.bz2

View File

@ -1,5 +1,4 @@
%define dialogversion 0.7.18
%define kde_dialogversion 0.0.5
%define kde_dialogversion 0.0.6
%define core_plugins blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall
@ -46,26 +45,21 @@ BuildRequires: fuse-devel
BuildRequires: cairo-devel
BuildRequires: libtool
Source0: http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
Source1: desktop-effects-%{dialogversion}.tar.bz2
Source2: kde-desktop-effects-%{kde_dialogversion}.tar.bz2
Source3: compiz-gtk
Source4: compiz-gtk.desktop
Source0: http://releases.compiz-fusion.org/compiz/%{version}/%{name}-%{version}.tar.bz2
Source1: kde-desktop-effects-%{kde_dialogversion}.tar.bz2
Source2: compiz-gtk
Source3: compiz-gtk.desktop
# Make sure that former beryl users still have bling
Obsoletes: beryl-core
# Patches that are not upstream
Patch102: desktop-effects-0.7.17-wall-plugin.patch
Patch103: composite-cube-logo.patch
Patch105: fedora-logo.patch
Patch106: redhat-logo.patch
Patch107: compiz-0.8.2-wall.patch
Patch108: compiz-pageflip.patch
#Patch110: scale-key.patch
# update translations in desktop-effects
Patch115: desktop-effects-linguas.patch
# Make sure configuration plugins never get unloaded
Patch123: compiz-0.8.2-pin-initial-plugins.patch
@ -103,9 +97,7 @@ windows and compositing manager.
%package gnome
Summary: Compiz gnome integration bits
Group: User Interface/Desktops
Requires: gnome-session >= 2.19.6-5
Requires: metacity >= 2.18
Requires: libwnck >= 2.15.4
Requires: desktop-effects
Requires: %{name} = %{version}
Requires(pre): GConf2
Requires(post): GConf2
@ -131,15 +123,9 @@ and other kde integration related stuff.
%prep
%setup -q -T -b1 -n desktop-effects-%{dialogversion}
%setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
%setup -q -T -b1 -n kde-desktop-effects-%{kde_dialogversion}
%setup -q
pushd ../desktop-effects-%{dialogversion}
%patch102 -p1 -b .wall-plugin
%patch115 -p1 -b .linguas
popd
%patch103 -p1 -b .composite-cube-logo
%if 0%{?fedora}
%patch105 -p1 -b .fedora-logo
@ -183,11 +169,6 @@ automake
make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps
# desktop-effects
cd ../desktop-effects-%{dialogversion}
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@ -195,19 +176,11 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make DESTDIR=$RPM_BUILD_ROOT install || exit 1
unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
echo INSTALLING DESKTOP EFFECTS
pushd ../desktop-effects-%{dialogversion}
make DESTDIR=$RPM_BUILD_ROOT install || exit 1
desktop-file-install --vendor redhat --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
$RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
popd
install %SOURCE3 $RPM_BUILD_ROOT%{_bindir}
install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
desktop-file-install --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%SOURCE4
%SOURCE3
# kde-desktop-effects
echo INSTALLING KDE DESKTOP EFFECTS
@ -219,7 +192,7 @@ cp -a ChangeLog COPYING README $RPM_BUILD_ROOT/%{_docdir}/compiz-kde-%{version}
iconlist="16 24 32 36 48 96"
for i in $iconlist; do
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/
cp -p ../desktop-effects-%{dialogversion}/desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
cp -p desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
done
desktop-file-install --vendor="" \
@ -264,11 +237,6 @@ for p in %{core_plugins} %{gnome_plugins} core;
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
%pre gnome
if [ "$1" -gt 1 ]; then
@ -293,13 +261,6 @@ if [ "$1" -eq 0 ]; then
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gwd.schemas >& /dev/null || :
fi
%postun gnome
touch --no-create %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi
%post kde
update-desktop-database -q %{_datadir}/applications/kde
@ -328,7 +289,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root)
%{_bindir}/compiz-gtk
%{_bindir}/gtk-window-decorator
%{_bindir}/desktop-effects
%{_libdir}/window-manager-settings/libcompiz.so
%{_datadir}/gnome/wm-properties/compiz-wm.desktop
%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
@ -336,13 +296,6 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/compiz/desktop-effects.glade
%{_datadir}/applications/compiz-gtk.desktop
%exclude %{_datadir}/applications/compiz.desktop
%{_datadir}/applications/redhat-desktop-effects.desktop
%{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
%{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
%{_datadir}/icons/hicolor/32x32/apps/desktop-effects.png
%{_datadir}/icons/hicolor/36x36/apps/desktop-effects.png
%{_datadir}/icons/hicolor/48x48/apps/desktop-effects.png
%{_datadir}/icons/hicolor/96x96/apps/desktop-effects.png
%{_sysconfdir}/gconf/schemas/*.schemas
@ -368,6 +321,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Aug 24 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-13
- Drop desktop-effects
- Make compiz-gnome require desktop-effects
- Drop now redundant requires
- Update kde desktop effects to 0.0.6 (includes its own icon)
* Sat Aug 22 2009 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.2-12
- Fix build

View File

@ -1,21 +0,0 @@
diff -upNr desktop-effects-0.7.17.orign/desktop-effects.c desktop-effects-0.7.17/desktop-effects.c
--- desktop-effects-0.7.17.orign/desktop-effects.c 2008-01-17 19:22:37.000000000 +0100
+++ desktop-effects-0.7.17/desktop-effects.c 2008-06-05 19:36:09.000000000 +0200
@@ -593,7 +593,7 @@ update_plugins (App *app,
if (strcmp (name, "cube") == 0 ||
strcmp (name, "rotate") == 0 ||
strcmp (name, "zoom") == 0 ||
- strcmp (name, "plane") == 0 ||
+ strcmp (name, "wall") == 0 ||
strcmp (name, "wobbly") == 0)
continue;
@@ -613,7 +613,7 @@ update_plugins (App *app,
new_setting = g_slist_prepend (new_setting, "zoom");
}
else
- new_setting = g_slist_prepend (new_setting, "plane");
+ new_setting = g_slist_prepend (new_setting, "wall");
}
}

View File

@ -1,393 +0,0 @@
diff -up desktop-effects-0.7.18/configure.linguas desktop-effects-0.7.18/configure
--- desktop-effects-0.7.18/configure.linguas 2008-10-27 22:23:53.000000000 -0400
+++ desktop-effects-0.7.18/configure 2008-10-27 22:24:36.000000000 -0400
@@ -4143,7 +4143,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-ALL_LINGUAS="as bg bn_IN bs ca cs da de el es fi fr gu hi hr hu id is it ja ka kn ko mk ml mr ms nb nl or pa pl pt_BR pt ro ru si sk sl sr@Latn sr sv ta te uk ur zh_CN zh_TW"
+ALL_LINGUAS="as bg bn_IN bs ca cs da de el es fi fr gu he hi hr hu id is it ja ka kn ko mk ml mr ms nb nl or pa pl pt_BR pt ro ru si sk sl sr@latin sr sv ta te uk ur zh_CN zh_TW"
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff -up desktop-effects-0.7.18/po/sr@latin.po.linguas desktop-effects-0.7.18/po/sr@latin.po
--- desktop-effects-0.7.18/po/sr@latin.po.linguas 2008-10-27 22:25:42.000000000 -0400
+++ desktop-effects-0.7.18/po/sr@latin.po 2008-10-27 22:26:10.000000000 -0400
@@ -0,0 +1,77 @@
+# Serbian(Latin) translations for desktop-effects
+# Copyright (C) 2006 Red Hat, Inc.
+# This file is distributed under the same license as the desktop-effects package.
+#
+# Igor Miletic <grejigl-gnomeprevod@yahoo.ca>, 2006.
+# Milos Mijatovic <mijatix@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: desktop-effects\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-29 08:58-0500\n"
+"PO-Revision-Date: 2008-02-19 10:30+0100\n"
+"Last-Translator: Milos Mijatovic <mijatix@gmail.com>\n"
+"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: ../desktop-effects.c:140
+#, c-format
+msgid ""
+"Testing the new settings. If you don't respond in %d second the previous "
+"settings will be restored."
+msgid_plural ""
+"Testing the new settings. If you don't respond in %d seconds the previous "
+"settings will be restored."
+msgstr[0] ""
+"Isprobavam nove postavke. Ako se ne odazovete za %d sekundu prethodne "
+"postavke <20>e biti vra<72>ene."
+msgstr[1] ""
+"Isprobavam nove postavke. Ako se ne odazovete za %d sekunde prethodne "
+"postavke <20>e biti vra<72>ene."
+msgstr[2] ""
+"Isprobavam nove postavke. Ako se ne odazovete za %d sekundi prethodne "
+"postavke <20>e biti vra<72>ene."
+
+#: ../desktop-effects.c:184
+msgid "Keep Settings"
+msgstr "Zadr鱉i postavke"
+
+#: ../desktop-effects.c:190
+msgid "Do you want to keep these settings?"
+msgstr "Da li 鱉elite da zadr鱉ite ove postavke?"
+
+#: ../desktop-effects.c:212
+msgid "Use _previous settings"
+msgstr "Koristi _prethodne postavke"
+
+#: ../desktop-effects.c:213
+msgid "_Keep settings"
+msgstr "Zadr鱉i postav_ke"
+
+#: ../desktop-effects.desktop.in.h:1 ../desktop-effects.glade.h:2
+msgid "Desktop Effects"
+msgstr "Efekti radnog okru鱉enja"
+
+#: ../desktop-effects.desktop.in.h:2
+msgid "Select desktop effects"
+msgstr "Izaberite efekte radnog okru鱉enja"
+
+#: ../desktop-effects.glade.h:1
+msgid "<b>Desktop Effects</b>"
+msgstr "<b>Efekti radnog okru鱉enja</b>"
+
+#: ../desktop-effects.glade.h:3
+msgid "Enable Desktop _Effects"
+msgstr "Uklju<6A>i _efekte radnog okru鱉enja"
+
+#: ../desktop-effects.glade.h:4
+msgid "Windows _Wobble when Moved"
+msgstr "Prozori se _talasaju pri pomeranju"
+
+#: ../desktop-effects.glade.h:5
+msgid "Workspaces on a C_ube"
+msgstr "Radne povr禳ine na _kocki"
diff -up desktop-effects-0.7.18/po/sr.po.linguas desktop-effects-0.7.18/po/sr.po
--- desktop-effects-0.7.18/po/sr.po.linguas 2008-10-27 22:25:30.000000000 -0400
+++ desktop-effects-0.7.18/po/sr.po 2008-10-27 22:26:10.000000000 -0400
@@ -1,21 +1,22 @@
# Serbian translations for desktop-effects
# Copyright (C) 2006 Red Hat, Inc.
# This file is distributed under the same license as the desktop-effects package.
-# Igor Miletic <grejigl-gnomeprevod@yahoo.ca>, 2006.
#
+# Igor Miletic <grejigl-gnomeprevod@yahoo.ca>, 2006.
+# Milos Mijatovic <mijatix@gmail.com>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: desktop-effects\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-11-29 08:58-0500\n"
-"PO-Revision-Date: 2006-12-15 18:29-0500\n"
-"Last-Translator: Igor Miletic <grejigl-gnomeprevod@yahoo.ca>\n"
-"Language-Team: Serbian (sr) <fedora@prevod.org>\n"
+"PO-Revision-Date: 2008-02-19 10:30+0100\n"
+"Last-Translator: Milos Mijatovic <mijatix@gmail.com>\n"
+"Language-Team: Serbian (sr) <fedora-trans-sr@redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Pootle 0.10.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../desktop-effects.c:140
#, c-format
@@ -26,14 +27,14 @@ msgid_plural ""
"Testing the new settings. If you don't respond in %d seconds the previous "
"settings will be restored."
msgstr[0] ""
-"<22><><EFBFBD>郋訇訄赲訄邾 郇郋赲迮 郈郋<E98388><E9838B>訄赲郕迮. <20>郕郋 <20>迮 郇迮 郋迡訄郱郋赲迮<E8B5B2>迮 郱訄 %d <20>迮郕<E8BFAE>郇迡<E98387><><EFBFBD><E8BFAE>郋迡郇迮 郈郋<E98388><E9838B>訄赲郕迮 "
-"<22>迮 訇邽<E8A887>邽 郈郋赲<E9838B><EFBFBD>迮郇迮."
+"<22><><EFBFBD>郋訇訄赲訄邾 郇郋赲迮 郈郋<E98388><E9838B>訄赲郕迮. <20>郕郋 <20>迮 郇迮 郋迡訄郱郋赲迮<E8B5B2>迮 郱訄 %d <20>迮郕<E8BFAE>郇迡<E98387><><EFBFBD><E8BFAE>郋迡郇迮 "
+"郈郋<E98388><E9838B>訄赲郕迮 <20>迮 訇邽<E8A887>邽 赲<><EFBFBD>迮郇迮."
msgstr[1] ""
-"<22><><EFBFBD>郋訇訄赲訄邾 郇郋赲迮 郈郋<E98388><E9838B>訄赲郕迮. <20>郕郋 <20>迮 郇迮 郋迡訄郱郋赲迮<E8B5B2>迮 郱訄 %d <20>迮郕<E8BFAE>郇迡迮 郈<><EFBFBD><E8BFAE>郋迡郇迮 郈郋<E98388><E9838B>訄赲郕迮 "
-"<22>迮 訇邽<E8A887>邽 郈郋赲<E9838B><EFBFBD>迮郇迮."
+"<22><><EFBFBD>郋訇訄赲訄邾 郇郋赲迮 郈郋<E98388><E9838B>訄赲郕迮. <20>郕郋 <20>迮 郇迮 郋迡訄郱郋赲迮<E8B5B2>迮 郱訄 %d <20>迮郕<E8BFAE>郇迡迮 郈<><EFBFBD><E8BFAE>郋迡郇迮 "
+"郈郋<E98388><E9838B>訄赲郕迮 <20>迮 訇邽<E8A887>邽 赲<><EFBFBD>迮郇迮."
msgstr[2] ""
-"<22><><EFBFBD>郋訇訄赲訄邾 郇郋赲迮 郈郋<E98388><E9838B>訄赲郕迮. <20>郕郋 <20>迮 郇迮 郋迡訄郱郋赲迮<E8B5B2>迮 郱訄 %d <20>迮郕<E8BFAE>郇迡邽 郈<><EFBFBD><E8BFAE>郋迡郇迮 郈郋<E98388><E9838B>訄赲郕迮 "
-"<22>迮 訇邽<E8A887>邽 郈郋赲<E9838B><EFBFBD>迮郇迮."
+"<22><><EFBFBD>郋訇訄赲訄邾 郇郋赲迮 郈郋<E98388><E9838B>訄赲郕迮. <20>郕郋 <20>迮 郇迮 郋迡訄郱郋赲迮<E8B5B2>迮 郱訄 %d <20>迮郕<E8BFAE>郇迡邽 郈<><EFBFBD><E8BFAE>郋迡郇迮 "
+"郈郋<E98388><E9838B>訄赲郕迮 <20>迮 訇邽<E8A887>邽 赲<><EFBFBD>迮郇迮."
#: ../desktop-effects.c:184
msgid "Keep Settings"
@@ -73,4 +74,4 @@ msgstr "<22><>郋郱郋<E983B1><20>迮 _<>訄郅訄<E98385><E8A884>
#: ../desktop-effects.glade.h:5
msgid "Workspaces on a C_ube"
-msgstr "<22>訄迡郇迮 郈郋赲<E9838B><E8B5B2>邽 郇訄 _郕郋<E98395>郕邽"
+msgstr "<22>訄迡郇迮 郈郋赲<E9838B><E8B5B2>邽郇迮 郇訄 _郕郋<E98395>郕邽"
diff -up desktop-effects-0.7.18/po/zh_CN.po.linguas desktop-effects-0.7.18/po/zh_CN.po
--- desktop-effects-0.7.18/po/zh_CN.po.linguas 2008-10-27 22:25:14.000000000 -0400
+++ desktop-effects-0.7.18/po/zh_CN.po 2008-10-27 22:26:10.000000000 -0400
@@ -1,53 +1,55 @@
-# translation of zh_CN.po to
+# translation of desktop-effects.master.po to Simplified Chinese
+# translation of zh_CN.po to
# translation of zh_CN.po to
# translation of zh_CN.po to
# translation of zh_CN.po to
# Chinese translations for PACKAGE package.
# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
+#
# Automatically generated, 2006.
# Xi Huang <xhuang@redhat.com>, 2006.
# Tony Fu <tfu@redhat.com>, 2006.
-#
+# Leah Liu <lliu@redhat.com>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: zh_CN\n"
+"Project-Id-Version: desktop-effects.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 08:58-0500\n"
-"PO-Revision-Date: 2006-12-15 10:06+1000\n"
-"Last-Translator: Tony Fu <tfu@redhat.com>\n"
-"Language-Team: <zh@li.org>\n"
+"POT-Creation-Date: 2008-08-26 03:13+0000\n"
+"PO-Revision-Date: 2008-09-11 16:15+1000\n"
+"Last-Translator: Leah Liu <lliu@redhat.com>\n"
+"Language-Team: Simplified Chinese <zh@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
# Remove this line or KBabel regards it as an invalid header
# "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: ../desktop-effects.c:140
-#, fuzzy, c-format
+#: ../desktop-effects.c:153
+#, c-format
msgid ""
"Testing the new settings. If you don't respond in %d second the previous "
"settings will be restored."
msgid_plural ""
"Testing the new settings. If you don't respond in %d seconds the previous "
"settings will be restored."
-msgstr[0] "瘚贝<E7989A><E8B49D>啗挽蝵柴<E89DB5><E69FB4><EFBFBD><EFBFBD><EFBFBD><E99D9D><EFBFBD> %d 蝘雴<E89D98><E99BB4><EFBFBD><EFBFBD><EFBFBD>摨䈑<E691A8>銋见<E98A8B><E8A781><EFBFBD>挽蝵桀<E89DB5><E6A180><EFBFBD><EFBCB7><EFBFBD>"
-msgstr[1] "瘚贝<E7989A><E8B49D>啗挽蝵柴<E89DB5><E69FB4><EFBFBD><EFBFBD><EFBFBD><E99D9D><EFBFBD> %d 蝘雴<E89D98><E99BB4><EFBFBD><EFBFBD><EFBFBD>摨䈑<E691A8>銋见<E98A8B><E8A781><EFBFBD>挽蝵桀<E89DB5><E6A180><EFBFBD><EFBCB7><EFBFBD>"
+msgstr[0] "瘚贝<E7989A><E8B49D>啗挽蝵柴<E89DB5><E69FB4><EFBFBD><EFBFBD><EFBFBD><E99D9D><EFBFBD> %d 蝘雴<E89D98><E99BB4><EFBFBD><EFBFBD><EFBFBD>摨䈑<E691A8>銋见<E98A8B><E8A781><EFBFBD>挽蝵桀<E89DB5><E6A180><EFBFBD>."
+msgstr[1] "瘚贝<E7989A><E8B49D>啗挽蝵柴<E89DB5><E69FB4><EFBFBD><EFBFBD><EFBFBD><E99D9D><EFBFBD> %d 蝘雴<E89D98><E99BB4><EFBFBD><EFBFBD><EFBFBD>摨䈑<E691A8>銋见<E98A8B><E8A781><EFBFBD>挽蝵桀<E89DB5><E6A180><EFBFBD>"
-#: ../desktop-effects.c:184
+#: ../desktop-effects.c:197
msgid "Keep Settings"
msgstr "靽萘<E99DBD>霈曄蔭"
-#: ../desktop-effects.c:190
+#: ../desktop-effects.c:203
msgid "Do you want to keep these settings?"
msgstr "雿㰘<E99BBF>靽萘<E99DBD>餈嗘<E9A488>霈曄蔭<E69B84><EFBFBD>"
-#: ../desktop-effects.c:212
+#: ../desktop-effects.c:225
msgid "Use _previous settings"
msgstr "雿輻鍂銋见<E98A8B><E8A781><EFBFBD>挽蝵<E68CBD> (_p)"
-#: ../desktop-effects.c:213
+#: ../desktop-effects.c:226
msgid "_Keep settings"
msgstr "靽萘<E99DBD>霈曄蔭 (_K)"
@@ -74,3 +76,4 @@ msgstr "蝘餃𢆡<E9A483><EFBFBD><E597A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (_W)"
#: ../desktop-effects.glade.h:5
msgid "Workspaces on a C_ube"
msgstr "蝡𧢲䲮雿㮖<E99BBF><E3AE96><EFBFBD>極雿𨅯躹 (_u)"
+
diff -up desktop-effects-0.7.18/po/zh_TW.po.linguas desktop-effects-0.7.18/po/zh_TW.po
--- desktop-effects-0.7.18/po/zh_TW.po.linguas 2008-10-27 22:25:24.000000000 -0400
+++ desktop-effects-0.7.18/po/zh_TW.po 2008-10-27 22:26:10.000000000 -0400
@@ -1,4 +1,4 @@
-# translation of zh_TW.po to Chinese (Traditional)
+# translation of desktop-effects.master.po to Traditional Chinese
# translation of zh_TW.po to
# Twi translations for PACKAGE package.
# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
@@ -7,45 +7,46 @@
# Automatically generated, 2006.
# Chester Cheng <ccheng@brisbane.redhat.com>, 2006.
# Chester Cheng <ccheng@redhat.com>, 2006.
+# Terry Chuang <tchuang@redhat.com>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: zh_TW\n"
+"Project-Id-Version: desktop-effects.master\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-29 08:58-0500\n"
-"PO-Revision-Date: 2006-11-30 00:32+1000\n"
-"Last-Translator: Chester Cheng <ccheng@redhat.com>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"POT-Creation-Date: 2008-08-26 03:13+0000\n"
+"PO-Revision-Date: 2008-09-24 14:12+1000\n"
+"Last-Translator: Terry Chuang <tchuang@redhat.com>\n"
+"Language-Team: Traditional Chinese <zh@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../desktop-effects.c:140
-#, fuzzy, c-format
+#: ../desktop-effects.c:153
+#, c-format
msgid ""
"Testing the new settings. If you don't respond in %d second the previous "
"settings will be restored."
msgid_plural ""
"Testing the new settings. If you don't respond in %d seconds the previous "
"settings will be restored."
-msgstr[0] "皜祈岫<E7A588>啗身摰𠾼<E691B0><F0A0BEBC><EFBFBD><EFBFBD>𨀣<EFBFBD>銝滚銁 %d 蝘鍦<E89D98><E98DA6><EFBFBD>嚗𣬚頂蝯望<E89DAF><E69C9B>𧼮儔<F0A7BCAE><EFBFBD><E595A3><EFBFBD>閮剖<E996AE><E58996><EFBFBD>"
-msgstr[1] "皜祈岫<E7A588>啗身摰𠾼<E691B0><F0A0BEBC><EFBFBD><EFBFBD>𨀣<EFBFBD>銝滚銁 %d 蝘鍦<E89D98><E98DA6><EFBFBD>嚗𣬚頂蝯望<E89DAF><E69C9B>𧼮儔<F0A7BCAE><EFBFBD><E595A3><EFBFBD>閮剖<E996AE><E58996><EFBFBD>"
+msgstr[0] "皜祈岫<E7A588>啗身摰𠾼<E691B0><F0A0BEBC><EFBFBD><EFBFBD>𨀣<EFBFBD>銝滚銁 %d 蝘鍦<E89D98><E98DA6><EFBFBD>嚗𣬚頂蝯勗停<E58B97><E5819C><EFBFBD>敺拙<E695BA><E68B99><EFBFBD><EFBFBD><EFBFBD><EFBFBD>身摰𠾼<E691B0><F0A0BEBC>"
+msgstr[1] "皜祈岫<E7A588>啗身摰𠾼<E691B0><F0A0BEBC><EFBFBD><EFBFBD>𨀣<EFBFBD>銝滚銁 %d 蝘鍦<E89D98><E98DA6><EFBFBD>嚗𣬚頂蝯勗停<E58B97><E5819C><EFBFBD>敺拙<E695BA><E68B99><EFBFBD><EFBFBD><EFBFBD><EFBFBD>身摰𠾼<E691B0><F0A0BEBC>"
-#: ../desktop-effects.c:184
+#: ../desktop-effects.c:197
msgid "Keep Settings"
msgstr "靽萘<E99DBD>閮剖<E996AE>"
-#: ../desktop-effects.c:190
+#: ../desktop-effects.c:203
msgid "Do you want to keep these settings?"
msgstr "<22>冽糓<E586BD>西<EFBFBD>靽萘<E99DBD><E89098><EFBFBD>閮剖<E996AE><EFBFBD>"
-#: ../desktop-effects.c:212
+#: ../desktop-effects.c:225
msgid "Use _previous settings"
-msgstr "雿輻鍂<E8BCBB><E98D82><EFBFBD><EFBFBD><EFBFBD>身摰<E8BAAB> (_p)"
+msgstr "雿輻鍂<E8BCBB><E98D82><EFBFBD><EFBFBD><EFBFBD>身摰𡄯<E691B0>_p嚗<70>"
-#: ../desktop-effects.c:213
+#: ../desktop-effects.c:226
msgid "_Keep settings"
-msgstr "靽萘<E99DBD>閮剖<E996AE> (_K)"
+msgstr "靽萘<E99DBD>閮剖<E996AE>嚗ÓK嚗<4B>"
#: ../desktop-effects.desktop.in.h:1 ../desktop-effects.glade.h:2
msgid "Desktop Effects"
@@ -61,12 +62,13 @@ msgstr "<b>獢屸𢒰<E5B1B8><EFBFBD></b>"
#: ../desktop-effects.glade.h:3
msgid "Enable Desktop _Effects"
-msgstr "<22>毺鍂獢屸𢒰<E5B1B8><F0A292B0>鸌畾𦠜<E795BE><F0A6A09C><EFBFBD> (_E)"
+msgstr "<22>毺鍂獢屸𢒰<E5B1B8><F0A292B0>鸌畾𦠜<E795BE><F0A6A09C><EFBFBD>_E嚗<45>"
#: ../desktop-effects.glade.h:4
msgid "Windows _Wobble when Moved"
-msgstr "閬𣇉<E996AC>蝘餃<E89D98><E9A483><EFBFBD><EFBFBD><EFBFBD>𡝗<EFBFBD><F0A19D97><EFBFBD><EFBFBD> (_W)"
+msgstr "閬𣇉<E996AC>蝘餃<E89D98><E9A483><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBCB9>𡝗<EFBFBD><F0A19D97><EFBFBD><EFBFBD>嚗ÓW嚗<57>"
#: ../desktop-effects.glade.h:5
msgid "Workspaces on a C_ube"
-msgstr "撌乩<E6928C><E4B9A9><EFBFBD>雿齿䲰<E9BDBF>孵耦擃𥪯<E69383> (_u)"
+msgstr "撌乩<E6928C><E4B9A9><EFBFBD>雿齿䲰<E9BDBF>孵耦擃𥪯<E69383>嚗Óu嚗<75>"
+
--- desktop-effects-0.7.18/po/he.po.linguas 2008-10-27 22:45:50.000000000 -0400
+++ desktop-effects-0.7.18/po/he.po 2008-10-27 22:45:53.000000000 -0400
@@ -0,0 +1,70 @@
+# translation of desktop-effects.master.po to Hebrew
+# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the desktop-effects package.
+# Oron Peled <oron@actcom.co.il>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: desktop-effects.master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-04-07 18:39+0000\n"
+"PO-Revision-Date: 2008-10-21 10:57GMT\n"
+"Last-Translator: Oron Peled <oron@actcom.co.il>\n"
+"Language-Team: Hebrew\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"
+
+#: ../desktop-effects.c:153
+#, c-format
+msgid ""
+"Testing the new settings. If you don't respond in %d second the previous "
+"settings will be restored."
+msgid_plural ""
+"Testing the new settings. If you don't respond in %d seconds the previous "
+"settings will be restored."
+msgstr[0] "<22><>蛈蛁 <20><><EFBFBD>蚹蛌 <20>蛌蛈<E89B8C><EFBFBD> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><><E89B8C><EFBFBD><EFBFBD><><E89B8C> %d 蚸<><E89AB8><EFBFBD> <20>蛌蛈<E89B8C><EFBFBD> <20><EFBFBD><E89AB9><EFBFBD>蛌 蛌蚸<E89B8C><E89AB8><EFBFBD>蚳."
+msgstr[1] "<22><>蛈蛁 <20><><EFBFBD>蚹蛌 <20>蛌蛈<E89B8C><EFBFBD> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><><E89B8C><EFBFBD><EFBFBD><><E89B8C> %d 蚸<><E89AB8><EFBFBD><20>蛌蛈<E89B8C><EFBFBD> <20><EFBFBD><E89AB9><EFBFBD>蛌 蛌蚸<E89B8C><E89AB8><EFBFBD>蚳."
+
+#: ../desktop-effects.c:197
+msgid "Keep Settings"
+msgstr "<22><EFBFBD>蚳 蛌蛈<E89B8C><EFBFBD> <20><EFBFBD><><E89AB8><EFBFBD>"
+
+#: ../desktop-effects.c:203
+msgid "Do you want to keep these settings?"
+msgstr "<22><><EFBFBD> <20>蚳蛈<E89AB3><E89B88><EFBFBD> <20><><EFBFBD><E89AB8>蚳 蛌蛈<E89B8C><EFBFBD> <20><>?"
+
+#: ../desktop-effects.c:225
+msgid "Use _previous settings"
+msgstr "<22>蚸蛌<E89AB8><20>蛌蛈<E89B8C><EFBFBD> _蚹<5F><E89AB9><EFBFBD>蛌"
+
+#: ../desktop-effects.c:226
+msgid "_Keep settings"
+msgstr "_<><EFBFBD>蚳 蛌蛈<E89B8C><EFBFBD>"
+
+#: ../desktop-effects.desktop.in.h:1 ../desktop-effects.glade.h:2
+msgid "Desktop Effects"
+msgstr "蚺蛁<E89ABA><E89B81><EFBFBD><EFBFBD><><E89AB8><EFBFBD><EFBFBD><><E89B81><EFBFBD><EFBFBD>"
+
+#: ../desktop-effects.desktop.in.h:2
+msgid "Select desktop effects"
+msgstr "<22><><EFBFBD>蚳蛌 蚺蛁<E89ABA><E89B81><EFBFBD><EFBFBD><><E89AB8><EFBFBD><EFBFBD><><E89B81><EFBFBD><EFBFBD>"
+
+#: ../desktop-effects.glade.h:1
+msgid "<b>Desktop Effects</b>"
+msgstr "<b>蚺蛁<E89ABA><E89B81><EFBFBD><EFBFBD><><E89AB8><EFBFBD><EFBFBD> <20><EFBFBD><E89B81><EFBFBD><EFBFBD></b>"
+
+#: ../desktop-effects.glade.h:3
+msgid "Enable Desktop _Effects"
+msgstr "<22>蚺蚸蚳 _蚺蛁<E89ABA><E89B81><EFBFBD><EFBFBD><><E89AB8><EFBFBD><EFBFBD> <20><EFBFBD><E89B81><EFBFBD><EFBFBD>"
+
+#: ../desktop-effects.glade.h:4
+msgid "Windows _Wobble when Moved"
+msgstr "<22><><EFBFBD><EFBFBD><EFBFBD>蛌 _蚳<5F><E89AB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><><E89B8C><EFBFBD>"
+
+#: ../desktop-effects.glade.h:5
+msgid "Workspaces on a C_ube"
+msgstr "<22><EFBFBD><E89AB8><EFBFBD><><E89B81><EFBFBD><EFBFBD><> <20><><EFBFBD> _蚹<5F><E89AB9><EFBFBD><EFBFBD><EFBFBD>"
+

View File

@ -1,4 +1,2 @@
d56f2f6456fc89b06e1e0d21cab74f55 desktop-effects-0.7.18.tar.bz2
7a7766f43797239ca0a4a0881d91f646 kde-desktop-effects-0.0.5.tar.bz2
892ce372ff673202db52034a0473f262 glx_tfp_test.c
c161975eb0fe8deac7be8d99408a80fc compiz-0.8.2.tar.bz2
e40e51ba5837a11bea58231b6ae49611 kde-desktop-effects-0.0.6.tar.bz2