]> git.pld-linux.org Git - packages/gnome-applets.git/blame - gnome-applets-xml-i18n.patch
projects / packages / gnome-applets.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- adding es/pt/pt_BR Group translations
[packages/gnome-applets.git] / gnome-applets-xml-i18n.patch
CommitLineData
f9ad2bbf 1diff -urN gnome-applets-1.4.0.4.orig/another_clock/Makefile.am gnome-applets-1.4.0.4/another_clock/Makefile.am
2--- gnome-applets-1.4.0.4.orig/another_clock/Makefile.am Mon Sep 3 20:37:37 2001
3+++ gnome-applets-1.4.0.4/another_clock/Makefile.am Sun Nov 25 03:03:16 2001
4@@ -22,7 +22,8 @@
5 sys_predata = another_clock_applet.desktop.in
6 sys_DATA = $(sys_predata:.desktop.in=.desktop)
7
8-@XML_I18N_MERGE_DESKTOP_RULE@
9+@XML_I18N_MERGE_DESKTOP_RULE1@
10+@XML_I18N_MERGE_DESKTOP_RULE2@
11
12 gnorbadir = $(sysconfdir)/CORBA/servers
13 gnorba_DATA = another_clock_applet.gnorba
14diff -urN gnome-applets-1.4.0.4.orig/another_clock/Makefile.in gnome-applets-1.4.0.4/another_clock/Makefile.in
15--- gnome-applets-1.4.0.4.orig/another_clock/Makefile.in Mon Sep 3 21:51:09 2001
16+++ gnome-applets-1.4.0.4/another_clock/Makefile.in Sun Nov 25 03:03:16 2001
17@@ -592,7 +592,8 @@
18 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
19
20
21-@XML_I18N_MERGE_DESKTOP_RULE@
22+@XML_I18N_MERGE_DESKTOP_RULE1@
23+@XML_I18N_MERGE_DESKTOP_RULE2@
24
25 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26 # Otherwise a system limit (for SysV at least) may be exceeded.
27diff -urN gnome-applets-1.4.0.4.orig/asclock/Makefile.am gnome-applets-1.4.0.4/asclock/Makefile.am
28--- gnome-applets-1.4.0.4.orig/asclock/Makefile.am Mon Sep 3 20:37:37 2001
29+++ gnome-applets-1.4.0.4/asclock/Makefile.am Sun Nov 25 03:03:16 2001
30@@ -30,7 +30,8 @@
31 sysdir = $(datadir)/applets/Clocks
32 sys_predata = asclock_applet.desktop.in
33 sys_DATA = $(sys_predata:.desktop.in=.desktop)
34-@XML_I18N_MERGE_DESKTOP_RULE@
35+@XML_I18N_MERGE_DESKTOP_RULE1@
36+@XML_I18N_MERGE_DESKTOP_RULE2@
37
38 gnorbadir = $(sysconfdir)/CORBA/servers
39 gnorba_DATA = asclock_applet.gnorba
40diff -urN gnome-applets-1.4.0.4.orig/asclock/Makefile.in gnome-applets-1.4.0.4/asclock/Makefile.in
41--- gnome-applets-1.4.0.4.orig/asclock/Makefile.in Mon Sep 3 21:51:18 2001
42+++ gnome-applets-1.4.0.4/asclock/Makefile.in Sun Nov 25 03:03:16 2001
43@@ -553,7 +553,8 @@
44 installdirs mostlyclean-generic distclean-generic clean-generic \
45 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
46
47-@XML_I18N_MERGE_DESKTOP_RULE@
48+@XML_I18N_MERGE_DESKTOP_RULE1@
49+@XML_I18N_MERGE_DESKTOP_RULE2@
50
51 # Tell versions [3.59,3.63) of GNU make to not export all variables.
52 # Otherwise a system limit (for SysV at least) may be exceeded.
53diff -urN gnome-applets-1.4.0.4.orig/battery/Makefile.am gnome-applets-1.4.0.4/battery/Makefile.am
54--- gnome-applets-1.4.0.4.orig/battery/Makefile.am Mon Sep 3 20:37:37 2001
55+++ gnome-applets-1.4.0.4/battery/Makefile.am Sun Nov 25 03:03:16 2001
56@@ -24,7 +24,8 @@
57 sysdir = $(datadir)/applets/Monitors
58 sys_predata = battery_applet.desktop.in
59 sys_DATA = $(sys_predata:.desktop.in=.desktop)
60-@XML_I18N_MERGE_DESKTOP_RULE@
61+@XML_I18N_MERGE_DESKTOP_RULE1@
62+@XML_I18N_MERGE_DESKTOP_RULE2@
63
64 pixmapdir = $(datadir)/pixmaps
65 pixmap_DATA = gnome-battery.png
66diff -urN gnome-applets-1.4.0.4.orig/battery/Makefile.in gnome-applets-1.4.0.4/battery/Makefile.in
67--- gnome-applets-1.4.0.4.orig/battery/Makefile.in Mon Sep 3 21:51:27 2001
68+++ gnome-applets-1.4.0.4/battery/Makefile.in Sun Nov 25 03:03:16 2001
69@@ -570,7 +570,8 @@
70 installdirs mostlyclean-generic distclean-generic clean-generic \
71 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
72
73-@XML_I18N_MERGE_DESKTOP_RULE@
74+@XML_I18N_MERGE_DESKTOP_RULE1@
75+@XML_I18N_MERGE_DESKTOP_RULE2@
76
77 # Tell versions [3.59,3.63) of GNU make to not export all variables.
78 # Otherwise a system limit (for SysV at least) may be exceeded.
79diff -urN gnome-applets-1.4.0.4.orig/cdplayer/Makefile.am gnome-applets-1.4.0.4/cdplayer/Makefile.am
80--- gnome-applets-1.4.0.4.orig/cdplayer/Makefile.am Mon Sep 3 20:37:37 2001
81+++ gnome-applets-1.4.0.4/cdplayer/Makefile.am Sun Nov 25 03:03:16 2001
82@@ -29,7 +29,8 @@
83 sysdir = $(datadir)/applets/Multimedia
84 sys_predata = cdplayer_applet.desktop.in
85 sys_DATA = $(sys_predata:.desktop.in=.desktop)
86-@XML_I18N_MERGE_DESKTOP_RULE@
87+@XML_I18N_MERGE_DESKTOP_RULE1@
88+@XML_I18N_MERGE_DESKTOP_RULE2@
89
90 EXTRA_DIST = cdrom-linux.c cdrom-solaris.c \
91 $(gnorba_DATA) $(sys_DATA) $(sys_predata)
92diff -urN gnome-applets-1.4.0.4.orig/cdplayer/Makefile.in gnome-applets-1.4.0.4/cdplayer/Makefile.in
93--- gnome-applets-1.4.0.4.orig/cdplayer/Makefile.in Mon Sep 3 21:59:36 2001
94+++ gnome-applets-1.4.0.4/cdplayer/Makefile.in Sun Nov 25 03:03:16 2001
95@@ -550,7 +550,8 @@
96 dist-hook:
97 mkdir $(distdir)/images
98 cp $(srcdir)/images/*.xpm $(distdir)/images
99-@XML_I18N_MERGE_DESKTOP_RULE@
100+@XML_I18N_MERGE_DESKTOP_RULE1@
101+@XML_I18N_MERGE_DESKTOP_RULE2@
102
103 # Tell versions [3.59,3.63) of GNU make to not export all variables.
104 # Otherwise a system limit (for SysV at least) may be exceeded.
105diff -urN gnome-applets-1.4.0.4.orig/charpick/Makefile.am gnome-applets-1.4.0.4/charpick/Makefile.am
106--- gnome-applets-1.4.0.4.orig/charpick/Makefile.am Mon Sep 3 20:37:37 2001
107+++ gnome-applets-1.4.0.4/charpick/Makefile.am Sun Nov 25 03:03:17 2001
108@@ -21,7 +21,8 @@
109 sysdir = $(datadir)/applets/Utility
110 sys_predata = charpick_applet.desktop.in
111 sys_DATA = $(sys_predata:.desktop.in=.desktop)
112-@XML_I18N_MERGE_DESKTOP_RULE@
113+@XML_I18N_MERGE_DESKTOP_RULE1@
114+@XML_I18N_MERGE_DESKTOP_RULE2@
115
116 gnorbadir = $(sysconfdir)/CORBA/servers
117 gnorba_DATA = charpick_applet.gnorba
118diff -urN gnome-applets-1.4.0.4.orig/charpick/Makefile.in gnome-applets-1.4.0.4/charpick/Makefile.in
119--- gnome-applets-1.4.0.4.orig/charpick/Makefile.in Mon Sep 3 21:51:38 2001
120+++ gnome-applets-1.4.0.4/charpick/Makefile.in Sun Nov 25 03:03:17 2001
121@@ -565,7 +565,8 @@
122 installdirs mostlyclean-generic distclean-generic clean-generic \
123 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
124
125-@XML_I18N_MERGE_DESKTOP_RULE@
126+@XML_I18N_MERGE_DESKTOP_RULE1@
127+@XML_I18N_MERGE_DESKTOP_RULE2@
128
129 # Tell versions [3.59,3.63) of GNU make to not export all variables.
130 # Otherwise a system limit (for SysV at least) may be exceeded.
131diff -urN gnome-applets-1.4.0.4.orig/clipboard/Makefile.am gnome-applets-1.4.0.4/clipboard/Makefile.am
132--- gnome-applets-1.4.0.4.orig/clipboard/Makefile.am Mon Sep 3 20:37:36 2001
133+++ gnome-applets-1.4.0.4/clipboard/Makefile.am Sun Nov 25 03:03:17 2001
134@@ -17,7 +17,8 @@
135
136 sys_DATA = $(sys_predata:.desktop.in=.desktop)
137
138-@XML_I18N_MERGE_DESKTOP_RULE@
139+@XML_I18N_MERGE_DESKTOP_RULE1@
140+@XML_I18N_MERGE_DESKTOP_RULE2@
141
142 pixmapsdir = $(datadir)/pixmaps
143 pixmaps_DATA = gnome-clipboard.png
144diff -urN gnome-applets-1.4.0.4.orig/clipboard/Makefile.in gnome-applets-1.4.0.4/clipboard/Makefile.in
145--- gnome-applets-1.4.0.4.orig/clipboard/Makefile.in Mon Sep 3 21:58:27 2001
146+++ gnome-applets-1.4.0.4/clipboard/Makefile.in Sun Nov 25 03:03:17 2001
147@@ -488,7 +488,8 @@
148 mostlyclean distclean maintainer-clean
149
150
151-@XML_I18N_MERGE_DESKTOP_RULE@
152+@XML_I18N_MERGE_DESKTOP_RULE1@
153+@XML_I18N_MERGE_DESKTOP_RULE2@
154
155 # Tell versions [3.59,3.63) of GNU make to not export all variables.
156 # Otherwise a system limit (for SysV at least) may be exceeded.
157diff -urN gnome-applets-1.4.0.4.orig/clockmail/Makefile.am gnome-applets-1.4.0.4/clockmail/Makefile.am
158--- gnome-applets-1.4.0.4.orig/clockmail/Makefile.am Mon Sep 3 20:37:37 2001
159+++ gnome-applets-1.4.0.4/clockmail/Makefile.am Sun Nov 25 03:03:17 2001
160@@ -49,7 +49,8 @@
161
162 sys_DATA = $(sys_predata:.desktop.in=.desktop)
163
164-@XML_I18N_MERGE_DESKTOP_RULE@
165+@XML_I18N_MERGE_DESKTOP_RULE1@
166+@XML_I18N_MERGE_DESKTOP_RULE2@
167
168 gnorbadir = $(sysconfdir)/CORBA/servers
169 gnorba_DATA = clockmail_applet.gnorba
170diff -urN gnome-applets-1.4.0.4.orig/clockmail/Makefile.in gnome-applets-1.4.0.4/clockmail/Makefile.in
171--- gnome-applets-1.4.0.4.orig/clockmail/Makefile.in Mon Sep 3 21:51:48 2001
172+++ gnome-applets-1.4.0.4/clockmail/Makefile.in Sun Nov 25 03:03:17 2001
173@@ -632,7 +632,8 @@
174 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
175
176
177-@XML_I18N_MERGE_DESKTOP_RULE@
178+@XML_I18N_MERGE_DESKTOP_RULE1@
179+@XML_I18N_MERGE_DESKTOP_RULE2@
180
181 # Tell versions [3.59,3.63) of GNU make to not export all variables.
182 # Otherwise a system limit (for SysV at least) may be exceeded.
183diff -urN gnome-applets-1.4.0.4.orig/configure gnome-applets-1.4.0.4/configure
184--- gnome-applets-1.4.0.4.orig/configure Mon Sep 3 21:47:17 2001
185+++ gnome-applets-1.4.0.4/configure Sun Nov 25 03:03:17 2001
186@@ -10137,7 +10137,8 @@
187 s%@XML_I18N_MERGE_OAF_RULE@%$XML_I18N_MERGE_OAF_RULE%g
188 s%@XML_I18N_MERGE_SERVER_RULE@%$XML_I18N_MERGE_SERVER_RULE%g
189 s%@XML_I18N_MERGE_KEYS_RULE@%$XML_I18N_MERGE_KEYS_RULE%g
190-s%@XML_I18N_MERGE_DESKTOP_RULE@%$XML_I18N_MERGE_DESKTOP_RULE%g
191+s%@XML_I18N_MERGE_DESKTOP_RULE1@
192+@XML_I18N_MERGE_DESKTOP_RULE2@%$XML_I18N_MERGE_DESKTOP_RULE%g
193 s%@XML_I18N_MERGE_DIRECTORY_RULE@%$XML_I18N_MERGE_DIRECTORY_RULE%g
194 s%@XML_I18N_MERGE_SOUNDLIST_RULE@%$XML_I18N_MERGE_SOUNDLIST_RULE%g
195 s%@XML_I18N_MERGE_PONG_RULE@%$XML_I18N_MERGE_PONG_RULE%g
196diff -urN gnome-applets-1.4.0.4.orig/cpumemusage/Makefile.am gnome-applets-1.4.0.4/cpumemusage/Makefile.am
197--- gnome-applets-1.4.0.4.orig/cpumemusage/Makefile.am Mon Sep 3 20:37:37 2001
198+++ gnome-applets-1.4.0.4/cpumemusage/Makefile.am Sun Nov 25 03:03:18 2001
199@@ -21,7 +21,8 @@
200 sysdir = $(datadir)/applets/Monitors
201 sys_predata = cpumemusage_applet.desktop.in
202 sys_DATA = $(sys_predata:.desktop.in=.desktop)
203-@XML_I18N_MERGE_DESKTOP_RULE@
204+@XML_I18N_MERGE_DESKTOP_RULE1@
205+@XML_I18N_MERGE_DESKTOP_RULE2@
206
207 pixmapdir = $(datadir)/pixmaps
208 pixmap_DATA = gnome-cpu-mem.png
209diff -urN gnome-applets-1.4.0.4.orig/cpumemusage/Makefile.in gnome-applets-1.4.0.4/cpumemusage/Makefile.in
210--- gnome-applets-1.4.0.4.orig/cpumemusage/Makefile.in Mon Sep 3 21:58:30 2001
211+++ gnome-applets-1.4.0.4/cpumemusage/Makefile.in Sun Nov 25 03:03:18 2001
212@@ -567,7 +567,8 @@
213 installdirs mostlyclean-generic distclean-generic clean-generic \
214 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
215
216-@XML_I18N_MERGE_DESKTOP_RULE@
217+@XML_I18N_MERGE_DESKTOP_RULE1@
218+@XML_I18N_MERGE_DESKTOP_RULE2@
219
220 # Tell versions [3.59,3.63) of GNU make to not export all variables.
221 # Otherwise a system limit (for SysV at least) may be exceeded.
222diff -urN gnome-applets-1.4.0.4.orig/diskusage/Makefile.am gnome-applets-1.4.0.4/diskusage/Makefile.am
223--- gnome-applets-1.4.0.4.orig/diskusage/Makefile.am Mon Sep 3 20:37:37 2001
224+++ gnome-applets-1.4.0.4/diskusage/Makefile.am Sun Nov 25 03:03:18 2001
225@@ -21,7 +21,8 @@
226 sysdir = $(datadir)/applets/Monitors
227 sys_predata = diskusage_applet.desktop.in
228 sys_DATA = $(sys_predata:.desktop.in=.desktop)
229-@XML_I18N_MERGE_DESKTOP_RULE@
230+@XML_I18N_MERGE_DESKTOP_RULE1@
231+@XML_I18N_MERGE_DESKTOP_RULE2@
232
233 gnorbadir = $(sysconfdir)/CORBA/servers
234 gnorba_DATA = diskusage_applet.gnorba
235diff -urN gnome-applets-1.4.0.4.orig/diskusage/Makefile.in gnome-applets-1.4.0.4/diskusage/Makefile.in
236--- gnome-applets-1.4.0.4.orig/diskusage/Makefile.in Mon Sep 3 21:58:40 2001
237+++ gnome-applets-1.4.0.4/diskusage/Makefile.in Sun Nov 25 03:03:18 2001
238@@ -541,7 +541,8 @@
239 installdirs mostlyclean-generic distclean-generic clean-generic \
240 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
241
242-@XML_I18N_MERGE_DESKTOP_RULE@
243+@XML_I18N_MERGE_DESKTOP_RULE1@
244+@XML_I18N_MERGE_DESKTOP_RULE2@
245
246 # Tell versions [3.59,3.63) of GNU make to not export all variables.
247 # Otherwise a system limit (for SysV at least) may be exceeded.
248diff -urN gnome-applets-1.4.0.4.orig/drivemount/Makefile.am gnome-applets-1.4.0.4/drivemount/Makefile.am
249--- gnome-applets-1.4.0.4.orig/drivemount/Makefile.am Mon Sep 3 20:37:37 2001
250+++ gnome-applets-1.4.0.4/drivemount/Makefile.am Sun Nov 25 03:03:18 2001
251@@ -19,7 +19,8 @@
252 sysdir = $(datadir)/applets/Utility
253 sys_predata = drivemount_applet.desktop.in
254 sys_DATA = $(sys_predata:.desktop.in=.desktop)
255-@XML_I18N_MERGE_DESKTOP_RULE@
256+@XML_I18N_MERGE_DESKTOP_RULE1@
257+@XML_I18N_MERGE_DESKTOP_RULE2@
258
259 gnorbadir = $(sysconfdir)/CORBA/servers
260 gnorba_DATA = drivemount_applet.gnorba
261diff -urN gnome-applets-1.4.0.4.orig/drivemount/Makefile.in gnome-applets-1.4.0.4/drivemount/Makefile.in
262--- gnome-applets-1.4.0.4.orig/drivemount/Makefile.in Mon Sep 3 21:52:00 2001
263+++ gnome-applets-1.4.0.4/drivemount/Makefile.in Sun Nov 25 03:03:18 2001
264@@ -561,7 +561,8 @@
265 installdirs mostlyclean-generic distclean-generic clean-generic \
266 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
267
268-@XML_I18N_MERGE_DESKTOP_RULE@
269+@XML_I18N_MERGE_DESKTOP_RULE1@
270+@XML_I18N_MERGE_DESKTOP_RULE2@
271
272 # Tell versions [3.59,3.63) of GNU make to not export all variables.
273 # Otherwise a system limit (for SysV at least) may be exceeded.
274diff -urN gnome-applets-1.4.0.4.orig/fifteen/Makefile.am gnome-applets-1.4.0.4/fifteen/Makefile.am
275--- gnome-applets-1.4.0.4.orig/fifteen/Makefile.am Mon Sep 3 20:37:37 2001
276+++ gnome-applets-1.4.0.4/fifteen/Makefile.am Sun Nov 25 03:03:18 2001
277@@ -16,7 +16,8 @@
278 sysdir = $(datadir)/applets/Amusements
279 sys_predata = fifteen_applet.desktop.in
280 sys_DATA = $(sys_predata:.desktop.in=.desktop)
281-@XML_I18N_MERGE_DESKTOP_RULE@
282+@XML_I18N_MERGE_DESKTOP_RULE1@
283+@XML_I18N_MERGE_DESKTOP_RULE2@
284
285 pixmapdir = $(datadir)/pixmaps
286 pixmap_DATA = gnome-fifteen.png
287diff -urN gnome-applets-1.4.0.4.orig/fifteen/Makefile.in gnome-applets-1.4.0.4/fifteen/Makefile.in
288--- gnome-applets-1.4.0.4.orig/fifteen/Makefile.in Mon Sep 3 21:52:10 2001
289+++ gnome-applets-1.4.0.4/fifteen/Makefile.in Sun Nov 25 03:03:18 2001
290@@ -561,7 +561,8 @@
291 installdirs mostlyclean-generic distclean-generic clean-generic \
292 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
293
294-@XML_I18N_MERGE_DESKTOP_RULE@
295+@XML_I18N_MERGE_DESKTOP_RULE1@
296+@XML_I18N_MERGE_DESKTOP_RULE2@
297
298 # Tell versions [3.59,3.63) of GNU make to not export all variables.
299 # Otherwise a system limit (for SysV at least) may be exceeded.
300diff -urN gnome-applets-1.4.0.4.orig/geyes/Makefile.am gnome-applets-1.4.0.4/geyes/Makefile.am
301--- gnome-applets-1.4.0.4.orig/geyes/Makefile.am Mon Sep 3 20:37:37 2001
302+++ gnome-applets-1.4.0.4/geyes/Makefile.am Sun Nov 25 03:03:18 2001
303@@ -24,7 +24,8 @@
304 sysdir = $(datadir)/applets/Amusements
305 sys_predata = geyes_applet.desktop.in
306 sys_DATA = $(sys_predata:.desktop.in=.desktop)
307-@XML_I18N_MERGE_DESKTOP_RULE@
308+@XML_I18N_MERGE_DESKTOP_RULE1@
309+@XML_I18N_MERGE_DESKTOP_RULE2@
310
311 gnorbadir = $(sysconfdir)/CORBA/servers
312 gnorba_DATA = geyes_applet.gnorba
313diff -urN gnome-applets-1.4.0.4.orig/geyes/Makefile.in gnome-applets-1.4.0.4/geyes/Makefile.in
314--- gnome-applets-1.4.0.4.orig/geyes/Makefile.in Mon Sep 3 21:52:17 2001
315+++ gnome-applets-1.4.0.4/geyes/Makefile.in Sun Nov 25 03:03:18 2001
316@@ -566,7 +566,8 @@
317 installdirs mostlyclean-generic distclean-generic clean-generic \
318 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
319
320-@XML_I18N_MERGE_DESKTOP_RULE@
321+@XML_I18N_MERGE_DESKTOP_RULE1@
322+@XML_I18N_MERGE_DESKTOP_RULE2@
323
324 # Tell versions [3.59,3.63) of GNU make to not export all variables.
325 # Otherwise a system limit (for SysV at least) may be exceeded.
326diff -urN gnome-applets-1.4.0.4.orig/gkb-new/Makefile.am gnome-applets-1.4.0.4/gkb-new/Makefile.am
327--- gnome-applets-1.4.0.4.orig/gkb-new/Makefile.am Mon Sep 3 20:37:36 2001
328+++ gnome-applets-1.4.0.4/gkb-new/Makefile.am Sun Nov 25 03:03:18 2001
329@@ -37,7 +37,8 @@
330 sysdir = $(datadir)/applets/Utility
331 sys_predata = gkb_applet.desktop.in
332 sys_DATA = $(sys_predata:.desktop.in=.desktop)
333-@XML_I18N_MERGE_DESKTOP_RULE@
334+@XML_I18N_MERGE_DESKTOP_RULE1@
335+@XML_I18N_MERGE_DESKTOP_RULE2@
336
337 gkbicondir = $(datadir)/pixmaps
338 gkbicon_DATA = $(GKB_ICON)
339diff -urN gnome-applets-1.4.0.4.orig/gkb-new/Makefile.in gnome-applets-1.4.0.4/gkb-new/Makefile.in
340--- gnome-applets-1.4.0.4.orig/gkb-new/Makefile.in Mon Sep 3 21:52:26 2001
341+++ gnome-applets-1.4.0.4/gkb-new/Makefile.in Sun Nov 25 03:03:18 2001
342@@ -611,7 +611,8 @@
343 installdirs mostlyclean-generic distclean-generic clean-generic \
344 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
345
346-@XML_I18N_MERGE_DESKTOP_RULE@
347+@XML_I18N_MERGE_DESKTOP_RULE1@
348+@XML_I18N_MERGE_DESKTOP_RULE2@
349
350 gkb_xmmap: gkb_xmmap.in ../config.status
351 sed "s,\$${prefix},$(prefix),g" \
352diff -urN gnome-applets-1.4.0.4.orig/gnotes/Makefile.am gnome-applets-1.4.0.4/gnotes/Makefile.am
353--- gnome-applets-1.4.0.4.orig/gnotes/Makefile.am Mon Sep 3 20:37:36 2001
354+++ gnome-applets-1.4.0.4/gnotes/Makefile.am Sun Nov 25 03:03:18 2001
355@@ -26,7 +26,8 @@
356 sysdir = $(datadir)/applets/Utility
357 sys_predata = gnotes_applet.desktop.in
358 sys_DATA = $(sys_predata:.desktop.in=.desktop)
359-@XML_I18N_MERGE_DESKTOP_RULE@
360+@XML_I18N_MERGE_DESKTOP_RULE1@
361+@XML_I18N_MERGE_DESKTOP_RULE2@
362
363 pixmapsdir = $(datadir)/pixmaps
364 pixmaps_DATA = gnome-gnotes.png
365diff -urN gnome-applets-1.4.0.4.orig/gnotes/Makefile.in gnome-applets-1.4.0.4/gnotes/Makefile.in
366--- gnome-applets-1.4.0.4.orig/gnotes/Makefile.in Mon Sep 3 22:00:16 2001
367+++ gnome-applets-1.4.0.4/gnotes/Makefile.in Sun Nov 25 03:03:18 2001
368@@ -575,7 +575,8 @@
369 installdirs mostlyclean-generic distclean-generic clean-generic \
370 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
371
372-@XML_I18N_MERGE_DESKTOP_RULE@
373+@XML_I18N_MERGE_DESKTOP_RULE1@
374+@XML_I18N_MERGE_DESKTOP_RULE2@
375
376 # Tell versions [3.59,3.63) of GNU make to not export all variables.
377 # Otherwise a system limit (for SysV at least) may be exceeded.
378diff -urN gnome-applets-1.4.0.4.orig/gtik/Makefile.am gnome-applets-1.4.0.4/gtik/Makefile.am
379--- gnome-applets-1.4.0.4.orig/gtik/Makefile.am Mon Sep 3 20:37:36 2001
380+++ gnome-applets-1.4.0.4/gtik/Makefile.am Sun Nov 25 03:03:18 2001
381@@ -15,7 +15,8 @@
382 sysdir = $(datadir)/applets/Network
383 sys_predata = gtik2_applet.desktop.in
384 sys_DATA = $(sys_predata:.desktop.in=.desktop)
385-@XML_I18N_MERGE_DESKTOP_RULE@
386+@XML_I18N_MERGE_DESKTOP_RULE1@
387+@XML_I18N_MERGE_DESKTOP_RULE2@
388
389 gnorbadir = $(sysconfdir)/CORBA/servers
390 gnorba_DATA = gtik2_applet.gnorba
391diff -urN gnome-applets-1.4.0.4.orig/gtik/Makefile.in gnome-applets-1.4.0.4/gtik/Makefile.in
392--- gnome-applets-1.4.0.4.orig/gtik/Makefile.in Mon Sep 3 21:59:29 2001
393+++ gnome-applets-1.4.0.4/gtik/Makefile.in Sun Nov 25 03:03:18 2001
394@@ -460,7 +460,8 @@
395 installdirs mostlyclean-generic distclean-generic clean-generic \
396 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
397
398-@XML_I18N_MERGE_DESKTOP_RULE@
399+@XML_I18N_MERGE_DESKTOP_RULE1@
400+@XML_I18N_MERGE_DESKTOP_RULE2@
401
402 # Tell versions [3.59,3.63) of GNU make to not export all variables.
403 # Otherwise a system limit (for SysV at least) may be exceeded.
404diff -urN gnome-applets-1.4.0.4.orig/gweather/Makefile.am gnome-applets-1.4.0.4/gweather/Makefile.am
405--- gnome-applets-1.4.0.4.orig/gweather/Makefile.am Mon Sep 3 20:37:36 2001
406+++ gnome-applets-1.4.0.4/gweather/Makefile.am Sun Nov 25 03:03:18 2001
407@@ -35,7 +35,8 @@
408 gweatherappletdir = $(datadir)/applets/Utility
409 gweatherapplet_predata = gweather.desktop.in
410 gweatherapplet_DATA = $(gweatherapplet_predata:.desktop.in=.desktop)
411-@XML_I18N_MERGE_DESKTOP_RULE@
412+@XML_I18N_MERGE_DESKTOP_RULE1@
413+@XML_I18N_MERGE_DESKTOP_RULE2@
414
415 gweatherlocationsdir = $(datadir)/gweather
416 gweatherlocations_DATA = Locations
417diff -urN gnome-applets-1.4.0.4.orig/gweather/Makefile.in gnome-applets-1.4.0.4/gweather/Makefile.in
418--- gnome-applets-1.4.0.4.orig/gweather/Makefile.in Mon Sep 3 21:59:22 2001
419+++ gnome-applets-1.4.0.4/gweather/Makefile.in Sun Nov 25 03:03:18 2001
420@@ -584,7 +584,8 @@
421 installdirs mostlyclean-generic distclean-generic clean-generic \
422 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
423
424-@XML_I18N_MERGE_DESKTOP_RULE@
425+@XML_I18N_MERGE_DESKTOP_RULE1@
426+@XML_I18N_MERGE_DESKTOP_RULE2@
427
428 # Tell versions [3.59,3.63) of GNU make to not export all variables.
429 # Otherwise a system limit (for SysV at least) may be exceeded.
430diff -urN gnome-applets-1.4.0.4.orig/jbc/Makefile.am gnome-applets-1.4.0.4/jbc/Makefile.am
431--- gnome-applets-1.4.0.4.orig/jbc/Makefile.am Mon Sep 3 20:37:36 2001
432+++ gnome-applets-1.4.0.4/jbc/Makefile.am Sun Nov 25 03:03:18 2001
433@@ -27,7 +27,8 @@
434 sysdir = $(datadir)/applets/Clocks
435 sys_predata = jbc_applet.desktop.in
436 sys_DATA = $(sys_predata:.desktop.in=.desktop)
437-@XML_I18N_MERGE_DESKTOP_RULE@
438+@XML_I18N_MERGE_DESKTOP_RULE1@
439+@XML_I18N_MERGE_DESKTOP_RULE2@
440
441 pixmapsdir = $(datadir)/pixmaps
442 pixmaps_DATA = gnome-jbc.png
443diff -urN gnome-applets-1.4.0.4.orig/jbc/Makefile.in gnome-applets-1.4.0.4/jbc/Makefile.in
444--- gnome-applets-1.4.0.4.orig/jbc/Makefile.in Mon Sep 3 21:57:27 2001
445+++ gnome-applets-1.4.0.4/jbc/Makefile.in Sun Nov 25 03:03:18 2001
446@@ -572,7 +572,8 @@
447 installdirs mostlyclean-generic distclean-generic clean-generic \
448 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
449
450-@XML_I18N_MERGE_DESKTOP_RULE@
451+@XML_I18N_MERGE_DESKTOP_RULE1@
452+@XML_I18N_MERGE_DESKTOP_RULE2@
453
454 # dist-hook:
455 # mkdir $(distdir)/pixmaps
456diff -urN gnome-applets-1.4.0.4.orig/life/Makefile.am gnome-applets-1.4.0.4/life/Makefile.am
457--- gnome-applets-1.4.0.4.orig/life/Makefile.am Mon Sep 3 20:37:36 2001
458+++ gnome-applets-1.4.0.4/life/Makefile.am Sun Nov 25 03:03:18 2001
459@@ -16,7 +16,8 @@
460 sysdir = $(datadir)/applets/Amusements
461 sys_predata = life_applet.desktop.in
462 sys_DATA = $(sys_predata:.desktop.in=.desktop)
463-@XML_I18N_MERGE_DESKTOP_RULE@
464+@XML_I18N_MERGE_DESKTOP_RULE1@
465+@XML_I18N_MERGE_DESKTOP_RULE2@
466
467 gnorbadir = $(sysconfdir)/CORBA/servers
468 gnorba_DATA = life_applet.gnorba
469diff -urN gnome-applets-1.4.0.4.orig/life/Makefile.in gnome-applets-1.4.0.4/life/Makefile.in
470--- gnome-applets-1.4.0.4.orig/life/Makefile.in Mon Sep 3 21:57:35 2001
471+++ gnome-applets-1.4.0.4/life/Makefile.in Sun Nov 25 03:03:18 2001
472@@ -560,7 +560,8 @@
473 installdirs mostlyclean-generic distclean-generic clean-generic \
474 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
475
476-@XML_I18N_MERGE_DESKTOP_RULE@
477+@XML_I18N_MERGE_DESKTOP_RULE1@
478+@XML_I18N_MERGE_DESKTOP_RULE2@
479
480 # Tell versions [3.59,3.63) of GNU make to not export all variables.
481 # Otherwise a system limit (for SysV at least) may be exceeded.
482diff -urN gnome-applets-1.4.0.4.orig/mini-commander/src/Makefile.am gnome-applets-1.4.0.4/mini-commander/src/Makefile.am
483--- gnome-applets-1.4.0.4.orig/mini-commander/src/Makefile.am Mon Sep 3 20:37:36 2001
484+++ gnome-applets-1.4.0.4/mini-commander/src/Makefile.am Sun Nov 25 03:03:19 2001
485@@ -46,7 +46,8 @@
486 sysdir = $(datadir)/applets/Utility
487 sys_predata = mini-commander_applet.desktop.in
488 sys_DATA = $(sys_predata:.desktop.in=.desktop)
489-@XML_I18N_MERGE_DESKTOP_RULE@
490+@XML_I18N_MERGE_DESKTOP_RULE1@
491+@XML_I18N_MERGE_DESKTOP_RULE2@
492
493 gnorbadir = $(sysconfdir)/CORBA/servers
494 gnorba_DATA = mini-commander_applet.gnorba
495diff -urN gnome-applets-1.4.0.4.orig/mini-commander/src/Makefile.in gnome-applets-1.4.0.4/mini-commander/src/Makefile.in
496--- gnome-applets-1.4.0.4.orig/mini-commander/src/Makefile.in Mon Sep 3 21:57:43 2001
497+++ gnome-applets-1.4.0.4/mini-commander/src/Makefile.in Sun Nov 25 03:03:19 2001
498@@ -512,7 +512,8 @@
499 distclean-generic clean-generic maintainer-clean-generic clean \
500 mostlyclean distclean maintainer-clean
501
502-@XML_I18N_MERGE_DESKTOP_RULE@
503+@XML_I18N_MERGE_DESKTOP_RULE1@
504+@XML_I18N_MERGE_DESKTOP_RULE2@
505
506 # Tell versions [3.59,3.63) of GNU make to not export all variables.
507 # Otherwise a system limit (for SysV at least) may be exceeded.
508diff -urN gnome-applets-1.4.0.4.orig/mixer/Makefile.am gnome-applets-1.4.0.4/mixer/Makefile.am
509--- gnome-applets-1.4.0.4.orig/mixer/Makefile.am Mon Sep 3 20:37:36 2001
510+++ gnome-applets-1.4.0.4/mixer/Makefile.am Sun Nov 25 03:03:19 2001
511@@ -24,7 +24,8 @@
512 sysdir = $(datadir)/applets/Multimedia
513 sys_predata = mixer_applet.desktop.in
514 sys_DATA = $(sys_predata:.desktop.in=.desktop)
515-@XML_I18N_MERGE_DESKTOP_RULE@
516+@XML_I18N_MERGE_DESKTOP_RULE1@
517+@XML_I18N_MERGE_DESKTOP_RULE2@
518
519 gnorbadir = $(sysconfdir)/CORBA/servers
520 gnorba_DATA = mixer_applet.gnorba
521diff -urN gnome-applets-1.4.0.4.orig/mixer/Makefile.in gnome-applets-1.4.0.4/mixer/Makefile.in
522--- gnome-applets-1.4.0.4.orig/mixer/Makefile.in Mon Sep 3 21:59:45 2001
523+++ gnome-applets-1.4.0.4/mixer/Makefile.in Sun Nov 25 03:03:19 2001
524@@ -545,7 +545,8 @@
525 installdirs mostlyclean-generic distclean-generic clean-generic \
526 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
527
528-@XML_I18N_MERGE_DESKTOP_RULE@
529+@XML_I18N_MERGE_DESKTOP_RULE1@
530+@XML_I18N_MERGE_DESKTOP_RULE2@
531
532 # Tell versions [3.59,3.63) of GNU make to not export all variables.
533 # Otherwise a system limit (for SysV at least) may be exceeded.
534diff -urN gnome-applets-1.4.0.4.orig/modemlights/Makefile.am gnome-applets-1.4.0.4/modemlights/Makefile.am
535--- gnome-applets-1.4.0.4.orig/modemlights/Makefile.am Mon Sep 3 20:37:36 2001
536+++ gnome-applets-1.4.0.4/modemlights/Makefile.am Sun Nov 25 03:03:19 2001
537@@ -20,7 +20,8 @@
538 sysdir = $(datadir)/applets/Network
539 sys_predata = modemlights_applet.desktop.in
540 sys_DATA = $(sys_predata:.desktop.in=.desktop)
541-@XML_I18N_MERGE_DESKTOP_RULE@
542+@XML_I18N_MERGE_DESKTOP_RULE1@
543+@XML_I18N_MERGE_DESKTOP_RULE2@
544
545 gnorbadir = $(sysconfdir)/CORBA/servers
546 gnorba_DATA = modemlights_applet.gnorba
547diff -urN gnome-applets-1.4.0.4.orig/modemlights/Makefile.in gnome-applets-1.4.0.4/modemlights/Makefile.in
548--- gnome-applets-1.4.0.4.orig/modemlights/Makefile.in Mon Sep 3 21:59:53 2001
549+++ gnome-applets-1.4.0.4/modemlights/Makefile.in Sun Nov 25 03:03:19 2001
550@@ -543,7 +543,8 @@
551 installdirs mostlyclean-generic distclean-generic clean-generic \
552 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
553
554-@XML_I18N_MERGE_DESKTOP_RULE@
555+@XML_I18N_MERGE_DESKTOP_RULE1@
556+@XML_I18N_MERGE_DESKTOP_RULE2@
557
558 # Tell versions [3.59,3.63) of GNU make to not export all variables.
559 # Otherwise a system limit (for SysV at least) may be exceeded.
560diff -urN gnome-applets-1.4.0.4.orig/multiload/Makefile.am gnome-applets-1.4.0.4/multiload/Makefile.am
561--- gnome-applets-1.4.0.4.orig/multiload/Makefile.am Mon Sep 3 20:37:36 2001
562+++ gnome-applets-1.4.0.4/multiload/Makefile.am Sun Nov 25 03:03:19 2001
563@@ -38,7 +38,8 @@
564 netload_applet.desktop.in loadavg_applet.desktop.in
565
566 Monitors_DATA = $(Monitors_predata:.desktop.in=.desktop)
567-@XML_I18N_MERGE_DESKTOP_RULE@
568+@XML_I18N_MERGE_DESKTOP_RULE1@
569+@XML_I18N_MERGE_DESKTOP_RULE2@
570
571 pixmaps = gnome-cpu.png gnome-mem.png
572 pixmapdir = $(datadir)/pixmaps
573diff -urN gnome-applets-1.4.0.4.orig/multiload/Makefile.in gnome-applets-1.4.0.4/multiload/Makefile.in
574--- gnome-applets-1.4.0.4.orig/multiload/Makefile.in Mon Sep 3 21:58:59 2001
575+++ gnome-applets-1.4.0.4/multiload/Makefile.in Sun Nov 25 03:03:19 2001
576@@ -590,7 +590,8 @@
577 installdirs mostlyclean-generic distclean-generic clean-generic \
578 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
579
580-@XML_I18N_MERGE_DESKTOP_RULE@
581+@XML_I18N_MERGE_DESKTOP_RULE1@
582+@XML_I18N_MERGE_DESKTOP_RULE2@
583
584 # Tell versions [3.59,3.63) of GNU make to not export all variables.
585 # Otherwise a system limit (for SysV at least) may be exceeded.
586diff -urN gnome-applets-1.4.0.4.orig/odometer/Makefile.am gnome-applets-1.4.0.4/odometer/Makefile.am
587--- gnome-applets-1.4.0.4.orig/odometer/Makefile.am Mon Sep 3 20:37:36 2001
588+++ gnome-applets-1.4.0.4/odometer/Makefile.am Sun Nov 25 03:03:19 2001
589@@ -17,7 +17,8 @@
590 sysdir = $(datadir)/applets/Amusements
591 sys_predata = odometer_applet.desktop.in
592 sys_DATA = $(sys_predata:.desktop.in=.desktop)
593-@XML_I18N_MERGE_DESKTOP_RULE@
594+@XML_I18N_MERGE_DESKTOP_RULE1@
595+@XML_I18N_MERGE_DESKTOP_RULE2@
596
597 gnorbadir = $(sysconfdir)/CORBA/servers
598 gnorba_DATA = odometer_applet.gnorba
599diff -urN gnome-applets-1.4.0.4.orig/odometer/Makefile.in gnome-applets-1.4.0.4/odometer/Makefile.in
600--- gnome-applets-1.4.0.4.orig/odometer/Makefile.in Mon Sep 3 21:58:19 2001
601+++ gnome-applets-1.4.0.4/odometer/Makefile.in Sun Nov 25 03:03:19 2001
602@@ -564,7 +564,8 @@
603 installdirs mostlyclean-generic distclean-generic clean-generic \
604 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
605
606-@XML_I18N_MERGE_DESKTOP_RULE@
607+@XML_I18N_MERGE_DESKTOP_RULE1@
608+@XML_I18N_MERGE_DESKTOP_RULE2@
609
610 # Tell versions [3.59,3.63) of GNU make to not export all variables.
611 # Otherwise a system limit (for SysV at least) may be exceeded.
612diff -urN gnome-applets-1.4.0.4.orig/quicklaunch/Makefile.am gnome-applets-1.4.0.4/quicklaunch/Makefile.am
613--- gnome-applets-1.4.0.4.orig/quicklaunch/Makefile.am Mon Sep 3 20:37:36 2001
614+++ gnome-applets-1.4.0.4/quicklaunch/Makefile.am Sun Nov 25 03:03:19 2001
615@@ -16,7 +16,8 @@
616 sysdir = $(datadir)/applets/Utility
617 sys_predata = quicklaunch_applet.desktop.in
618 sys_DATA = $(sys_predata:.desktop.in=.desktop)
619-@XML_I18N_MERGE_DESKTOP_RULE@
620+@XML_I18N_MERGE_DESKTOP_RULE1@
621+@XML_I18N_MERGE_DESKTOP_RULE2@
622
623 gnorbadir = $(sysconfdir)/CORBA/servers
624 gnorba_DATA = quicklaunch_applet.gnorba
625diff -urN gnome-applets-1.4.0.4.orig/quicklaunch/Makefile.in gnome-applets-1.4.0.4/quicklaunch/Makefile.in
626--- gnome-applets-1.4.0.4.orig/quicklaunch/Makefile.in Mon Sep 3 21:57:51 2001
627+++ gnome-applets-1.4.0.4/quicklaunch/Makefile.in Sun Nov 25 03:03:19 2001
628@@ -560,7 +560,8 @@
629 installdirs mostlyclean-generic distclean-generic clean-generic \
630 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
631
632-@XML_I18N_MERGE_DESKTOP_RULE@
633+@XML_I18N_MERGE_DESKTOP_RULE1@
634+@XML_I18N_MERGE_DESKTOP_RULE2@
635
636 # Tell versions [3.59,3.63) of GNU make to not export all variables.
637 # Otherwise a system limit (for SysV at least) may be exceeded.
638diff -urN gnome-applets-1.4.0.4.orig/screenshooter/Makefile.am gnome-applets-1.4.0.4/screenshooter/Makefile.am
639--- gnome-applets-1.4.0.4.orig/screenshooter/Makefile.am Mon Sep 3 20:37:36 2001
640+++ gnome-applets-1.4.0.4/screenshooter/Makefile.am Sun Nov 25 03:03:19 2001
641@@ -24,7 +24,8 @@
642 sysdir = $(datadir)/applets/Utility
643 sys_predata = screenshooter_applet.desktop.in
644 sys_DATA = $(sys_predata:.desktop.in=.desktop)
645-@XML_I18N_MERGE_DESKTOP_RULE@
646+@XML_I18N_MERGE_DESKTOP_RULE1@
647+@XML_I18N_MERGE_DESKTOP_RULE2@
648
649 gnorbadir = $(sysconfdir)/CORBA/servers
650 gnorba_DATA = screenshooter_applet.gnorba
651diff -urN gnome-applets-1.4.0.4.orig/screenshooter/Makefile.in gnome-applets-1.4.0.4/screenshooter/Makefile.in
652--- gnome-applets-1.4.0.4.orig/screenshooter/Makefile.in Mon Sep 3 22:00:10 2001
653+++ gnome-applets-1.4.0.4/screenshooter/Makefile.in Sun Nov 25 03:03:19 2001
654@@ -592,7 +592,8 @@
655 installdirs mostlyclean-generic distclean-generic clean-generic \
656 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
657
658-@XML_I18N_MERGE_DESKTOP_RULE@
659+@XML_I18N_MERGE_DESKTOP_RULE1@
660+@XML_I18N_MERGE_DESKTOP_RULE2@
661
662 # Tell versions [3.59,3.63) of GNU make to not export all variables.
663 # Otherwise a system limit (for SysV at least) may be exceeded.
664diff -urN gnome-applets-1.4.0.4.orig/slashapp/Makefile.am gnome-applets-1.4.0.4/slashapp/Makefile.am
665--- gnome-applets-1.4.0.4.orig/slashapp/Makefile.am Mon Sep 3 20:37:36 2001
666+++ gnome-applets-1.4.0.4/slashapp/Makefile.am Sun Nov 25 03:03:19 2001
667@@ -17,7 +17,8 @@
668 sysdir = $(datadir)/applets/Network
669 sys_predata = slash_applet.desktop.in
670 sys_DATA = $(sys_predata:.desktop.in=.desktop)
671-@XML_I18N_MERGE_DESKTOP_RULE@
672+@XML_I18N_MERGE_DESKTOP_RULE1@
673+@XML_I18N_MERGE_DESKTOP_RULE2@
674
675 pixmapdir = $(datadir)/pixmaps
676 pixmap_DATA = slashapp.png
677diff -urN gnome-applets-1.4.0.4.orig/slashapp/Makefile.in gnome-applets-1.4.0.4/slashapp/Makefile.in
678--- gnome-applets-1.4.0.4.orig/slashapp/Makefile.in Mon Sep 3 21:59:33 2001
679+++ gnome-applets-1.4.0.4/slashapp/Makefile.in Sun Nov 25 03:03:19 2001
680@@ -490,7 +490,8 @@
681 distclean-generic clean-generic maintainer-clean-generic clean \
682 mostlyclean distclean maintainer-clean
683
684-@XML_I18N_MERGE_DESKTOP_RULE@
685+@XML_I18N_MERGE_DESKTOP_RULE1@
686+@XML_I18N_MERGE_DESKTOP_RULE2@
687
688 # Tell versions [3.59,3.63) of GNU make to not export all variables.
689 # Otherwise a system limit (for SysV at least) may be exceeded.
690diff -urN gnome-applets-1.4.0.4.orig/sound-monitor/Makefile.am gnome-applets-1.4.0.4/sound-monitor/Makefile.am
691--- gnome-applets-1.4.0.4.orig/sound-monitor/Makefile.am Mon Sep 3 20:37:36 2001
692+++ gnome-applets-1.4.0.4/sound-monitor/Makefile.am Sun Nov 25 03:03:19 2001
693@@ -49,7 +49,8 @@
694 sysdir = $(datadir)/applets/Multimedia
695 sys_predata = sound-monitor_applet.desktop.in
696 sys_DATA = $(sys_predata:.desktop.in=.desktop)
697-@XML_I18N_MERGE_DESKTOP_RULE@
698+@XML_I18N_MERGE_DESKTOP_RULE1@
699+@XML_I18N_MERGE_DESKTOP_RULE2@
700
701 gnorbadir = $(sysconfdir)/CORBA/servers
702 gnorba_DATA = sound-monitor_applet.gnorba
703diff -urN gnome-applets-1.4.0.4.orig/sound-monitor/Makefile.in gnome-applets-1.4.0.4/sound-monitor/Makefile.in
704--- gnome-applets-1.4.0.4.orig/sound-monitor/Makefile.in Mon Sep 3 22:00:00 2001
705+++ gnome-applets-1.4.0.4/sound-monitor/Makefile.in Sun Nov 25 03:03:19 2001
706@@ -575,7 +575,8 @@
707 installdirs mostlyclean-generic distclean-generic clean-generic \
708 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
709
710-@XML_I18N_MERGE_DESKTOP_RULE@
711+@XML_I18N_MERGE_DESKTOP_RULE1@
712+@XML_I18N_MERGE_DESKTOP_RULE2@
713
714 # Tell versions [3.59,3.63) of GNU make to not export all variables.
715 # Otherwise a system limit (for SysV at least) may be exceeded.
716diff -urN gnome-applets-1.4.0.4.orig/tickastat/Makefile.am gnome-applets-1.4.0.4/tickastat/Makefile.am
717--- gnome-applets-1.4.0.4.orig/tickastat/Makefile.am Mon Sep 3 20:37:36 2001
718+++ gnome-applets-1.4.0.4/tickastat/Makefile.am Sun Nov 25 03:03:19 2001
719@@ -30,7 +30,8 @@
720 sysdir = $(datadir)/applets/Utility
721 sys_predata = tickastat_applet.desktop.in
722 sys_DATA = $(sys_predata:.desktop.in=.desktop)
723-@XML_I18N_MERGE_DESKTOP_RULE@
724+@XML_I18N_MERGE_DESKTOP_RULE1@
725+@XML_I18N_MERGE_DESKTOP_RULE2@
726
727 gnorbadir = $(sysconfdir)/CORBA/servers
728 gnorba_DATA = tickastat_applet.gnorba
729diff -urN gnome-applets-1.4.0.4.orig/tickastat/Makefile.in gnome-applets-1.4.0.4/tickastat/Makefile.in
730--- gnome-applets-1.4.0.4.orig/tickastat/Makefile.in Mon Sep 3 21:57:58 2001
731+++ gnome-applets-1.4.0.4/tickastat/Makefile.in Sun Nov 25 03:03:19 2001
732@@ -577,7 +577,8 @@
733 installdirs mostlyclean-generic distclean-generic clean-generic \
734 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
735
736-@XML_I18N_MERGE_DESKTOP_RULE@
737+@XML_I18N_MERGE_DESKTOP_RULE1@
738+@XML_I18N_MERGE_DESKTOP_RULE2@
739
740 # Tell versions [3.59,3.63) of GNU make to not export all variables.
741 # Otherwise a system limit (for SysV at least) may be exceeded.
742diff -urN gnome-applets-1.4.0.4.orig/webcontrol/Makefile.am gnome-applets-1.4.0.4/webcontrol/Makefile.am
743--- gnome-applets-1.4.0.4.orig/webcontrol/Makefile.am Mon Sep 3 20:37:36 2001
744+++ gnome-applets-1.4.0.4/webcontrol/Makefile.am Sun Nov 25 03:03:19 2001
745@@ -22,7 +22,8 @@
746 sysdir = $(datadir)/applets/Network
747 sys_predata = webcontrol_applet.desktop.in
748 sys_DATA = $(sys_predata:.desktop.in=.desktop)
749-@XML_I18N_MERGE_DESKTOP_RULE@
750+@XML_I18N_MERGE_DESKTOP_RULE1@
751+@XML_I18N_MERGE_DESKTOP_RULE2@
752
753 gnorbadir = $(sysconfdir)/CORBA/servers
754 gnorba_DATA = webcontrol_applet.gnorba
755diff -urN gnome-applets-1.4.0.4.orig/webcontrol/Makefile.in gnome-applets-1.4.0.4/webcontrol/Makefile.in
756--- gnome-applets-1.4.0.4.orig/webcontrol/Makefile.in Mon Sep 3 21:58:05 2001
757+++ gnome-applets-1.4.0.4/webcontrol/Makefile.in Sun Nov 25 03:03:19 2001
758@@ -545,7 +545,8 @@
759 installdirs mostlyclean-generic distclean-generic clean-generic \
760 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
761
762-@XML_I18N_MERGE_DESKTOP_RULE@
763+@XML_I18N_MERGE_DESKTOP_RULE1@
764+@XML_I18N_MERGE_DESKTOP_RULE2@
765
766 # Tell versions [3.59,3.63) of GNU make to not export all variables.
767 # Otherwise a system limit (for SysV at least) may be exceeded.
768diff -urN gnome-applets-1.4.0.4.orig/whereami/Makefile.am gnome-applets-1.4.0.4/whereami/Makefile.am
769--- gnome-applets-1.4.0.4.orig/whereami/Makefile.am Mon Sep 3 20:37:36 2001
770+++ gnome-applets-1.4.0.4/whereami/Makefile.am Sun Nov 25 03:03:19 2001
771@@ -11,7 +11,8 @@
772 sysdir = $(datadir)/applets/Utility
773 sys_predata = whereami_applet.desktop.in
774 sys_DATA = $(sys_predata:.desktop.in=.desktop)
775-@XML_I18N_MERGE_DESKTOP_RULE@
776+@XML_I18N_MERGE_DESKTOP_RULE1@
777+@XML_I18N_MERGE_DESKTOP_RULE2@
778
779 gnorbadir = $(sysconfdir)/CORBA/servers
780 gnorba_DATA = whereami_applet.gnorba
781diff -urN gnome-applets-1.4.0.4.orig/whereami/Makefile.in gnome-applets-1.4.0.4/whereami/Makefile.in
782--- gnome-applets-1.4.0.4.orig/whereami/Makefile.in Mon Sep 3 21:58:11 2001
783+++ gnome-applets-1.4.0.4/whereami/Makefile.in Sun Nov 25 03:03:19 2001
784@@ -530,7 +530,8 @@
785 installdirs mostlyclean-generic distclean-generic clean-generic \
786 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
787
788-@XML_I18N_MERGE_DESKTOP_RULE@
789+@XML_I18N_MERGE_DESKTOP_RULE1@
790+@XML_I18N_MERGE_DESKTOP_RULE2@
791
792 # Tell versions [3.59,3.63) of GNU make to not export all variables.
793 # Otherwise a system limit (for SysV at least) may be exceeded.
Small applications which embed themselves in the GNOME panel
This page took 0.121147 seconds and 4 git commands to generate.