]>
Commit | Line | Data |
---|---|---|
bffa637a | 1 | diff -ur control-center-1.4.0.5.orig/capplets/background-properties/background-properties.desktop.in control-center-1.4.0.5/capplets/background-properties/background-properties.desktop.in |
2 | --- control-center-1.4.0.5.orig/capplets/background-properties/background-properties.desktop.in Fri Oct 26 10:59:59 2001 | |
3 | +++ control-center-1.4.0.5/capplets/background-properties/background-properties.desktop.in Fri Dec 19 14:43:34 2003 | |
4 | @@ -3,5 +3,7 @@ | |
5 | _Comment=Configuration of the desktop's background | |
6 | Exec=background-properties-capplet | |
7 | Icon=gnome-ccbackground.png | |
8 | -Terminal=0 | |
9 | +Terminal=false | |
10 | Type=Application | |
11 | +Encoding=UTF-8 | |
12 | +# vi: encoding=utf-8 | |
13 | diff -ur control-center-1.4.0.5.orig/capplets/default-applications/default-application-properties.desktop.in control-center-1.4.0.5/capplets/default-applications/default-application-properties.desktop.in | |
14 | --- control-center-1.4.0.5.orig/capplets/default-applications/default-application-properties.desktop.in Sat Apr 6 15:46:16 2002 | |
15 | +++ control-center-1.4.0.5/capplets/default-applications/default-application-properties.desktop.in Fri Dec 19 14:42:36 2003 | |
16 | @@ -3,5 +3,7 @@ | |
17 | _Comment=Choose the applications used by default | |
18 | Exec=default-application-properties-capplet | |
19 | Icon= | |
20 | -Terminal=0 | |
21 | +Terminal=false | |
22 | Type=Application | |
23 | +Encoding=UTF-8 | |
24 | +# vi: encoding=utf-8 | |
25 | diff -ur control-center-1.4.0.5.orig/capplets/file-types/file-types-capplet.desktop.in control-center-1.4.0.5/capplets/file-types/file-types-capplet.desktop.in | |
26 | --- control-center-1.4.0.5.orig/capplets/file-types/file-types-capplet.desktop.in Fri Oct 26 11:00:07 2001 | |
27 | +++ control-center-1.4.0.5/capplets/file-types/file-types-capplet.desktop.in Fri Dec 19 14:43:27 2003 | |
28 | @@ -3,5 +3,7 @@ | |
29 | _Comment=Specify which programs are used to open or view each file type | |
30 | Icon=gnome-ccmime.png | |
31 | Exec=file-types-capplet | |
32 | -Terminal=0 | |
33 | +Terminal=false | |
34 | Type=Application | |
35 | +Encoding=UTF-8 | |
36 | +# vi: encoding=utf-8 | |
37 | diff -ur control-center-1.4.0.5.orig/capplets/keyboard-properties/keyboard-properties.desktop.in control-center-1.4.0.5/capplets/keyboard-properties/keyboard-properties.desktop.in | |
38 | --- control-center-1.4.0.5.orig/capplets/keyboard-properties/keyboard-properties.desktop.in Fri Oct 26 10:59:59 2001 | |
39 | +++ control-center-1.4.0.5/capplets/keyboard-properties/keyboard-properties.desktop.in Fri Dec 19 14:34:39 2003 | |
40 | @@ -3,5 +3,7 @@ | |
41 | _Comment=Keyboard Properties | |
42 | Exec=keyboard-properties | |
43 | Icon=gnome-cckeyboard.png | |
44 | -Terminal=0 | |
45 | +Terminal=false | |
46 | Type=Application | |
47 | +Encoding=UTF-8 | |
48 | +# vi: encoding=utf-8 | |
49 | diff -ur control-center-1.4.0.5.orig/capplets/mouse-properties/mouse-properties.desktop.in control-center-1.4.0.5/capplets/mouse-properties/mouse-properties.desktop.in | |
50 | --- control-center-1.4.0.5.orig/capplets/mouse-properties/mouse-properties.desktop.in Fri Oct 26 11:00:00 2001 | |
51 | +++ control-center-1.4.0.5/capplets/mouse-properties/mouse-properties.desktop.in Fri Dec 19 14:43:21 2003 | |
52 | @@ -3,5 +3,7 @@ | |
53 | _Comment=Mouse Properties | |
54 | Exec=mouse-properties-capplet | |
55 | Icon=gnome-mouse.png | |
56 | -Terminal=0 | |
57 | +Terminal=false | |
58 | Type=Application | |
59 | +Encoding=UTF-8 | |
60 | +# vi: encoding=utf-8 | |
61 | diff -ur control-center-1.4.0.5.orig/capplets/sound-properties/sound-properties.desktop.in control-center-1.4.0.5/capplets/sound-properties/sound-properties.desktop.in | |
62 | --- control-center-1.4.0.5.orig/capplets/sound-properties/sound-properties.desktop.in Fri Oct 26 11:00:05 2001 | |
63 | +++ control-center-1.4.0.5/capplets/sound-properties/sound-properties.desktop.in Fri Dec 19 14:34:32 2003 | |
64 | @@ -3,5 +3,7 @@ | |
65 | _Comment=Configure GNOME's use of sound | |
66 | Exec=sound-properties | |
67 | Icon=gnome-audio2.png | |
68 | -Terminal=0 | |
69 | +Terminal=false | |
70 | Type=Application | |
71 | +Encoding=UTF-8 | |
72 | +# vi: encoding=utf-8 | |
73 | diff -ur control-center-1.4.0.5.orig/capplets/theme-switcher/theme-selector.desktop.in control-center-1.4.0.5/capplets/theme-switcher/theme-selector.desktop.in | |
74 | --- control-center-1.4.0.5.orig/capplets/theme-switcher/theme-selector.desktop.in Fri Oct 26 11:00:05 2001 | |
75 | +++ control-center-1.4.0.5/capplets/theme-switcher/theme-selector.desktop.in Fri Dec 19 14:43:14 2003 | |
76 | @@ -3,5 +3,7 @@ | |
77 | _Comment=Select which desktop theme to use | |
78 | Exec=theme-selector-capplet | |
79 | Icon=gnome-ccthemes.png | |
80 | -Terminal=0 | |
81 | +Terminal=false | |
82 | Type=Application | |
83 | +Encoding=UTF-8 | |
84 | +# vi: encoding=utf-8 | |
85 | diff -ur control-center-1.4.0.5.orig/capplets/ui-properties/application.desktop.in control-center-1.4.0.5/capplets/ui-properties/application.desktop.in | |
86 | --- control-center-1.4.0.5.orig/capplets/ui-properties/application.desktop.in Fri Oct 26 11:00:06 2001 | |
87 | +++ control-center-1.4.0.5/capplets/ui-properties/application.desktop.in Fri Dec 19 14:34:24 2003 | |
88 | @@ -3,5 +3,7 @@ | |
89 | _Comment=Sets the default feel of GNOME applications | |
90 | Exec=ui-properties --cap-id=1 | |
91 | Icon=gnome-applications.png | |
92 | -Terminal=0 | |
93 | +Terminal=false | |
94 | Type=Application | |
95 | +Encoding=UTF-8 | |
96 | +# vi: encoding=utf-8 | |
97 | diff -ur control-center-1.4.0.5.orig/capplets/ui-properties/dialogs.desktop.in control-center-1.4.0.5/capplets/ui-properties/dialogs.desktop.in | |
98 | --- control-center-1.4.0.5.orig/capplets/ui-properties/dialogs.desktop.in Fri Oct 26 11:00:06 2001 | |
99 | +++ control-center-1.4.0.5/capplets/ui-properties/dialogs.desktop.in Fri Dec 19 14:43:07 2003 | |
100 | @@ -2,5 +2,7 @@ | |
101 | _Name=Dialogs | |
102 | Exec=ui-properties --cap-id=0 | |
103 | Icon=gnome-ccdialog.png | |
104 | -Terminal=0 | |
105 | +Terminal=false | |
106 | Type=Application | |
107 | +Encoding=UTF-8 | |
108 | +# vi: encoding=utf-8 | |
109 | diff -ur control-center-1.4.0.5.orig/capplets/ui-properties/mdi.desktop.in control-center-1.4.0.5/capplets/ui-properties/mdi.desktop.in | |
110 | --- control-center-1.4.0.5.orig/capplets/ui-properties/mdi.desktop.in Fri Oct 26 11:00:06 2001 | |
111 | +++ control-center-1.4.0.5/capplets/ui-properties/mdi.desktop.in Fri Dec 19 14:34:16 2003 | |
112 | @@ -2,5 +2,7 @@ | |
113 | _Name=MDI | |
114 | Exec=ui-properties --cap-id=2 | |
115 | Icon=gnome-mdi.png | |
116 | -Terminal=0 | |
117 | +Terminal=false | |
118 | Type=Application | |
119 | +Encoding=UTF-8 | |
120 | +# vi: encoding=utf-8 | |
121 | diff -ur control-center-1.4.0.5.orig/capplets/url-properties/url-properties.desktop.in control-center-1.4.0.5/capplets/url-properties/url-properties.desktop.in | |
122 | --- control-center-1.4.0.5.orig/capplets/url-properties/url-properties.desktop.in Fri Oct 26 11:00:06 2001 | |
123 | +++ control-center-1.4.0.5/capplets/url-properties/url-properties.desktop.in Fri Dec 19 14:43:01 2003 | |
124 | @@ -3,5 +3,7 @@ | |
125 | _Comment=Configure which programs are used to display URLs | |
126 | Exec=url-properties | |
127 | Icon=gnome-html.png | |
128 | -Terminal=0 | |
129 | +Terminal=false | |
130 | Type=Application | |
131 | +Encoding=UTF-8 | |
132 | +# vi: encoding=utf-8 | |
133 | diff -ur control-center-1.4.0.5.orig/capplets/wm-properties/wm-properties.desktop.in control-center-1.4.0.5/capplets/wm-properties/wm-properties.desktop.in | |
134 | --- control-center-1.4.0.5.orig/capplets/wm-properties/wm-properties.desktop.in Fri Oct 26 11:00:06 2001 | |
135 | +++ control-center-1.4.0.5/capplets/wm-properties/wm-properties.desktop.in Fri Dec 19 14:43:46 2003 | |
136 | @@ -3,5 +3,7 @@ | |
137 | _Comment=Choose a window manager | |
138 | Exec=wm-properties-capplet --sync | |
139 | Icon=gnome-ccwindowmanager.png | |
140 | -Terminal=0 | |
141 | +Terminal=false | |
142 | Type=Application | |
143 | +Encoding=UTF-8 | |
144 | +# vi: encoding=utf-8 | |
145 | diff -ur control-center-1.4.0.5.orig/control-center/gnomecc.desktop.in control-center-1.4.0.5/control-center/gnomecc.desktop.in | |
146 | --- control-center-1.4.0.5.orig/control-center/gnomecc.desktop.in Fri Oct 26 11:00:08 2001 | |
147 | +++ control-center-1.4.0.5/control-center/gnomecc.desktop.in Fri Dec 19 14:42:43 2003 | |
148 | @@ -3,5 +3,7 @@ | |
149 | _Comment=The GNOME configuration tool | |
150 | Icon=control-center.png | |
151 | Exec=gnomecc | |
152 | -Terminal=0 | |
153 | +Terminal=false | |
154 | Type=Application | |
155 | +Encoding=UTF-8 | |
156 | +# vi: encoding=utf-8 | |
157 | --- control-center-1.4.0.5/acinclude.m4~ Fri Oct 26 11:00:07 2001 | |
158 | +++ control-center-1.4.0.5/acinclude.m4 Fri Dec 19 16:21:28 2003 | |
159 | @@ -1,3 +1,138 @@ | |
160 | +## xml-i18n-tools.m4 - Configure xml-i18n-tools for the target system. -*-Shell-script-*- | |
161 | +## Copyright (C) 2001 Eazel, Inc. | |
162 | +## Author: Maciej Stachowiak <mjs@noisehavoc.org> | |
163 | +## | |
164 | +## This program is free software; you can redistribute it and/or modify | |
165 | +## it under the terms of the GNU General Public License as published by | |
166 | +## the Free Software Foundation; either version 2 of the License, or | |
167 | +## (at your option) any later version. | |
168 | +## | |
169 | +## This program is distributed in the hope that it will be useful, but | |
170 | +## WITHOUT ANY WARRANTY; without even the implied warranty of | |
171 | +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
172 | +## General Public License for more details. | |
173 | +## | |
174 | +## You should have received a copy of the GNU General Public License | |
175 | +## along with this program; if not, write to the Free Software | |
176 | +## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | |
177 | +## | |
178 | +## As a special exception to the GNU General Public License, if you | |
179 | +## distribute this file as part of a program that contains a | |
180 | +## configuration script generated by Autoconf, you may include it under | |
181 | +## the same distribution terms that you use for the rest of that program. | |
182 | + | |
183 | +AC_DEFUN(XML_I18N_TOOLS_NEWER_THAN_0_9,[ true ]) | |
184 | + | |
185 | +dnl AC_PROG_XML_I18N_TOOLS([MINIMUM-VERSION [,"G2" if always using --utf8] ]) | |
186 | +# serial 1 AC_PROG_XML_I18N_TOOLS | |
187 | +AC_DEFUN(AC_PROG_XML_I18N_TOOLS, | |
188 | +[ | |
189 | + AC_DEFUN(X18T_PFORG1, dnl and -u for G2 | |
190 | + ifelse([$2],[G2],[ -u ], [ -p ])) | |
191 | + AC_DEFUN(X18T_XML_KIND, | |
192 | + ifelse([$2],[G2],[ -u ],[ $(XML_I18N_XML_KIND) ])) | |
193 | + AC_DEFUN(X18T_KEYS_KIND, | |
194 | + ifelse([$2],[G2],[ -u ],[ $(XML_I18N_KEYS_KIND) ])) | |
195 | + | |
196 | + XML_I18N_MERGE_DESKTOP_RULE='%.desktop: %.desktop.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d -u X18T_PFORG1' | |
197 | +XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d -u X18T_PFORG1' | |
198 | + XML_I18N_MERGE_KEYS_RULE='%.keys: %.keys.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k X18T_KEYS_KIND' | |
199 | + XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p' | |
200 | + XML_I18N_MERGE_PONG_RULE='%.pong: %.pong.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_PFORG1' | |
201 | + XML_I18N_MERGE_SERVER_RULE='%.server: %.server.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u' | |
202 | + XML_I18N_MERGE_SHEET_RULE='%.sheet: %.sheet.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u' | |
203 | +XML_I18N_MERGE_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1' | |
204 | + XML_I18N_MERGE_XML_RULE='%.xml: %.xml.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_XML_KIND' | |
205 | + | |
206 | +AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE) | |
207 | +AC_SUBST(XML_I18N_MERGE_DIRECTORY_RULE) | |
208 | +AC_SUBST(XML_I18N_MERGE_KEYS_RULE) | |
209 | +AC_SUBST(XML_I18N_MERGE_OAF_RULE) | |
210 | +AC_SUBST(XML_I18N_MERGE_PONG_RULE) | |
211 | +AC_SUBST(XML_I18N_MERGE_SERVER_RULE) | |
212 | +AC_SUBST(XML_I18N_MERGE_SHEET_RULE) | |
213 | +AC_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE) | |
214 | +AC_SUBST(XML_I18N_MERGE_XML_RULE) | |
215 | + | |
216 | +# Use the tools built into the package, not the ones that are installed. | |
217 | + | |
218 | +XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract' | |
219 | +AC_SUBST(XML_I18N_EXTRACT)dnl | |
220 | + | |
221 | +XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge' | |
222 | +AC_SUBST(XML_I18N_MERGE)dnl | |
223 | + | |
224 | +XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update' | |
225 | +AC_SUBST(XML_I18N_UPDATE)dnl | |
226 | + | |
227 | +AC_PATH_PROG(INTLTOOL_PERL, perl) | |
228 | +if test -z "$INTLTOOL_PERL"; then | |
229 | + AC_MSG_ERROR([perl not found; required for xml-i18n-tools]) | |
230 | +fi | |
231 | +if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then | |
232 | + AC_MSG_ERROR([perl 5.x required for xml-i18n-tools]) | |
233 | +fi | |
234 | + | |
235 | +dnl Remove Intltool [] tags from po/POTFILES | |
236 | +dnl | |
237 | +ifdef([AC_DIVERSION_ICMDS],[ | |
238 | + AC_DIVERT_PUSH(AC_DIVERSION_ICMDS) | |
239 | + changequote(,) | |
240 | + mv -f po/POTFILES po/POTFILES.tmp | |
241 | + sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES | |
242 | + rm -f po/POTFILES.tmp | |
243 | + changequote([,]) | |
244 | + AC_DIVERT_POP() | |
245 | +],[ | |
246 | + ifdef([AC_CONFIG_COMMANDS_PRE],[ | |
247 | + AC_CONFIG_COMMANDS_PRE([ | |
248 | + changequote(,) | |
249 | + mv -f po/POTFILES po/POTFILES.tmp | |
250 | + sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES | |
251 | + rm -f po/POTFILES.tmp | |
252 | + changequote([,]) | |
253 | + ]) | |
254 | + ]) | |
255 | +]) | |
256 | + | |
257 | +dnl manually sed perl in so people don't have to put the xml-i18n-tools scripts in their | |
258 | +dnl AC_OUTPUT | |
259 | +AC_OUTPUT_COMMANDS([ | |
260 | +sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-extract.in > xml-i18n-extract.out | |
261 | +if cmp -s xml-i18n-extract xml-i18n-extract.out 2>/dev/null; then | |
262 | + rm -f xml-i18n-extract.out | |
263 | +else | |
264 | + mv -f xml-i18n-extract.out xml-i18n-extract | |
265 | +fi | |
266 | +chmod ugo+x xml-i18n-extract | |
267 | +chmod u+w xml-i18n-extract | |
268 | + | |
269 | +sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-merge.in > xml-i18n-merge.out | |
270 | +if cmp -s xml-i18n-merge xml-i18n-merge.out 2>/dev/null; then | |
271 | + rm -f xml-i18n-merge.out | |
272 | +else | |
273 | + mv -f xml-i18n-merge.out xml-i18n-merge | |
274 | +fi | |
275 | +chmod ugo+x xml-i18n-merge | |
276 | +chmod u+w xml-i18n-merge | |
277 | + | |
278 | +sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-update.in > xml-i18n-update.out | |
279 | +if cmp -s xml-i18n-update xml-i18n-update.out 2>/dev/null; then | |
280 | + rm -f xml-i18n-update.out | |
281 | +else | |
282 | + mv -f xml-i18n-update.out xml-i18n-update | |
283 | +fi | |
284 | +chmod ugo+x xml-i18n-update | |
285 | +chmod u+w xml-i18n-update | |
286 | +], INTLTOOL_PERL=${INTLTOOL_PERL}) | |
287 | + | |
288 | +# Redirect the config.log output again, so that the ltconfig log is not | |
289 | +# clobbered by the next message. | |
290 | +exec 5>>./config.log | |
291 | +]) | |
292 | + | |
293 | +dnl old names | |
294 | +AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl | |
295 | # Configure paths for ESD | |
296 | # Manish Singh 98-9-30 | |
297 | # stolen back from Frank Belew |