]> git.pld-linux.org Git - packages/WindowMaker.git/blame - WindowMaker-cvs.patch
projects / packages / WindowMaker.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 19; fix build
[packages/WindowMaker.git] / WindowMaker-cvs.patch
CommitLineData
8b54764a
JB		 1diff -Nur WindowMaker-0.92.0.orig/ChangeLog WindowMaker-0.92.0/ChangeLog
2--- WindowMaker-0.92.0.orig/ChangeLog 2005-07-03 19:36:39.000000000 +0200
3+++ WindowMaker-0.92.0/ChangeLog 2006-01-23 07:47:10.000000000 +0100
4@@ -1,3 +1,37 @@
5+Changes since version 0.92.0:
6+.............................
7+
8+- added check for --with-gnustepdir option to configure to verify that its
9+ argument is an absolute path
10+- updated german translations (Torsten Marek <shlomme@gmx.net>)
11+- fixed WPrefs.app to find its icons when not installed under GNUstep paths
12+- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
13+- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
14+- eliminated gcc-4 compilation warnings
15+- small fix for compilation in a different directory than the source
16+ (Balaton Zoltan <balaton@eik.bme.hu>)
17+- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
18+- fixed issue with invisible modal windows from Qt and Gtk applications
19+ on 64bit platforms (Max Loparyev <max@city.veganet.ru>)
20+- fixed issue with icon colors on big endian platforms
21+ (Max Loparyev <max@city.veganet.ru>)
22+- release colors to avoid issues with the reference count overflowing a
23+ small integer and causing unexpected color releases that can crash
24+ Window Maker (Martin Frydl <martin.frydl@systinet.com>)
25+- fixed a small memory leak in WINGs/wview.c caused by not releasing the
26+ background color of a view (Martin Frydl <martin.frydl@systinet.com>)
27+- updated estonian translation (Ivar Smolin <okul@linux.ee>)
28+- updated the XDND code in WINGs to work with GDK based applications.
29+ WINGs based applications should now work with both KDE and GNOME
30+ applications (Sylvain Reynal <sreynal@nerim.net>)
31+- better check for the XDND protocol version when interoperating with other
32+ applications. As it seems xdnd version 3 (which WINGs supports) and newer
33+ are not backward compatible with xdnd version 1 and 2. This is why WINGs
34+ applications cannot interoperate with GNUstep applications (which uses
35+ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
36+ version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
37+
38+
39 Changes since version 0.91.0:
40 .............................
41
42diff -Nur WindowMaker-0.92.0.orig/configure.ac WindowMaker-0.92.0/configure.ac
43--- WindowMaker-0.92.0.orig/configure.ac 2005-01-06 16:31:40.000000000 +0100
44+++ WindowMaker-0.92.0/configure.ac 2005-08-22 23:48:20.000000000 +0200
45@@ -197,7 +197,7 @@
46
47 AC_CACHE_CHECK(whether gcc supports x86 inline asm,
48 ac_cv_c_inline_asm,
49- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
50+ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
51 "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
52 "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
53 ac_cv_c_inline_asm=yes,
54@@ -831,7 +831,9 @@
55 AC_ARG_WITH(appspath,
56 [ --with-gnustepdir=PATH specify the directory for GNUstep applications])
57
58-appspath=$with_gnustepdir
59+if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then
60+ appspath=$with_gnustepdir
61+fi
62
63 if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then
64 wprefs_base_dir=${prefix}
65diff -Nur WindowMaker-0.92.0.orig/po/de.po WindowMaker-0.92.0/po/de.po
66--- WindowMaker-0.92.0.orig/po/de.po 2004-10-26 05:52:38.000000000 +0200
67+++ WindowMaker-0.92.0/po/de.po 2005-07-05 21:39:14.000000000 +0200
68@@ -1,38 +1,44 @@
69-# SOME DESCRIPTIVE TITLE.
70-# Copyright (C) YEAR Free Software Foundation, Inc.
71-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
72 #
73+# German Message Catalog for Window Maker
74+#
75+# Initial translation
76+# Gudio Scholz <guido.scholz@bayernline.de>
77+# Bernd Eggert <Bernd.Eggert@t-online.de>
78+#
79+# Adapted to versions 0.80 ff.
80+# Torsten Marek <shlomme@gmx.net>
81+#
82+
83 msgid ""
84 msgstr ""
85-"Project-Id-Version: WindowMaker 0.80.0\n"
86-"POT-Creation-Date: 2002-01-22 21:20+0100\n"
87-"PO-Revision-Date: 2002-01-25 16:42GMT\n"
88-"Last-Translator: Torsten Marek <shlomme@gmx.net>\n"
89-"Language-Team: German \n"
90+"Project-Id-Version: Window Maker 0.91\n"
91+"POT-Creation-Date: 2004-11-01 16:17+0100\n"
92+"PO-Revision-Date: 2004-11-08 22:58+0100\n"
93+"Last-Translator: shlomme@gmx.net\n"
94+"Language-Team: German\n"
95 "MIME-Version: 1.0\n"
96 "Content-Type: text/plain; charset=UTF-8\n"
97 "Content-Transfer-Encoding: 8bit\n"
98-"X-Generator: KBabel 0.9.6\n"
99
100-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
101-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
102-#: ../src/winspector.c:389 ../src/winspector.c:406
103+#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335
104+#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854
105+#: ../src/winspector.c:394 ../src/winspector.c:411
106 msgid "Error"
107 msgstr "Fehler"
108
109-#: ../src/appicon.c:427
110+#: ../src/appicon.c:416
111 msgid "Could not open specified icon file"
112 msgstr "Symboldatei konnte nicht geöffnet werden"
113
114-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
115-#: ../src/dialog.c:729 ../src/dialog.c:1814 ../src/dock.c:526
116-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
117-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
118-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
119+#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295
120+#: ../src/dialog.c:725 ../src/dialog.c:1796 ../src/dock.c:515
121+#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336
122+#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271
123+#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412
124 msgid "OK"
125 msgstr "OK"
126
127-#: ../src/appicon.c:456 ../src/dock.c:264
128+#: ../src/appicon.c:445 ../src/dock.c:244
129 msgid ""
130 " will be forcibly closed.\n"
131 "Any unsaved changes will be lost.\n"
132@@ -42,344 +48,369 @@
133 "Alle ungespeicherten Änderungen gehen dabei verloren.\n"
134 "Bitte bestätigen."
135
136-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
137+#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124
138 msgid "Kill Application"
139 msgstr "Anwendung töten"
140
141-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
142+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
143 msgid "Yes"
144 msgstr "Ja"
145
146-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
147+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
148 msgid "No"
149 msgstr "Nein"
150
151-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
152+#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501
153 msgid "Unhide Here"
154 msgstr "Hier wiederherstellen"
155
156-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
157-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
158+#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170
159+#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461
160 msgid "Hide"
161 msgstr "Verstecken"
162
163-#: ../src/appicon.c:497
164+#: ../src/appicon.c:486
165 msgid "Set Icon..."
166 msgstr "Symbol wählen..."
167
168-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
169+#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
170 #: ../src/rootmenu.c:264 ../src/winmenu.c:508
171 msgid "Kill"
172 msgstr "Töten"
173
174-#: ../src/appicon.c:519 ../src/dock.c:3501
175+#: ../src/appicon.c:508 ../src/dock.c:3511
176 msgid "Unhide"
177 msgstr "Wiederherstellen"
178
179-#: ../src/application.c:398
180+#: ../src/application.c:405
181 #, c-format
182 msgid "recreating missing icon '%s'"
183 msgstr "fehlendes Symbol '%s' wird wiederhergestellt"
184
185-#: ../src/defaults.c:919 ../src/defaults.c:1008
186+#: ../src/defaults.c:930 ../src/defaults.c:1092
187 #, c-format
188 msgid "Domain %s (%s) of global defaults database is corrupted!"
189 msgstr "Domäne %s (%s) in globaler Standarddatenbank ist fehlerhaft!"
190
191-#: ../src/defaults.c:924
192+#: ../src/defaults.c:935
193 #, c-format
194 msgid "could not load domain %s from global defaults database"
195 msgstr "Domäne %s aus globaler Standarddatenbank konnte nicht geladen werden"
196
197-#: ../src/defaults.c:946 ../src/startup.c:884 ../src/startup.c:902
198-#: ../src/startup.c:908
199+#: ../src/defaults.c:987 ../src/defaults.c:1002
200+#, c-format
201+msgid "invalid global menu file %s"
202+msgstr "Ungültige Datei %s für globales Menü"
203+
204+#: ../src/defaults.c:1030 ../src/startup.c:762 ../src/startup.c:780
205+#: ../src/startup.c:787
206 #, c-format
207 msgid "could not read domain \"%s\" from defaults database"
208-msgstr "Dömane \"%s\" aus Standarddatenbank konnte nicht gelesen werden"
209+msgstr "Dömane \"%s\" aus der Standarddatenbank konnte nicht gelesen werden"
210
211-#: ../src/defaults.c:992 ../src/defaults.c:1096 ../src/defaults.c:1137
212-#: ../src/defaults.c:1193
213+#: ../src/defaults.c:1076 ../src/defaults.c:1181 ../src/defaults.c:1222
214+#: ../src/defaults.c:1278
215 #, c-format
216 msgid "Domain %s (%s) of defaults database is corrupted!"
217-msgstr "Domäne %s (%s) aus Standarddatenbank ist fehlerhaft!"
218+msgstr "Domäne %s (%s) aus der Standarddatenbank ist fehlerhaft!"
219
220-#: ../src/defaults.c:997 ../src/defaults.c:1116 ../src/defaults.c:1173
221-#: ../src/defaults.c:1202
222+#: ../src/defaults.c:1081 ../src/defaults.c:1201 ../src/defaults.c:1258
223+#: ../src/defaults.c:1288
224 #, c-format
225 msgid "could not load domain %s from user defaults database"
226 msgstr "Domäne %s aus Benutzer-Standarddatenbank konnte nicht geladen werden"
227
228-#: ../src/defaults.c:1027
229+#: ../src/defaults.c:1111
230 #, c-format
231 msgid "could not load domain %s from global defaults database (%s)"
232 msgstr "Dömane %s konnte nicht aus globaler Standarddatenbank (%s) gelesen werden"
233
234-#: ../src/defaults.c:1163 ../src/screen.c:458
235+#: ../src/defaults.c:1248 ../src/screen.c:419
236 #, c-format
237 msgid "could not load logo image for panels: %s"
238 msgstr "Panel-Logo konnte nicht geladen werden: %s"
239
240 #. --------------------------- Local -----------------------
241-#: ../src/defaults.c:1411 ../src/defaults.c:1553 ../src/defaults.c:1665
242-#: ../src/defaults.c:2144 ../src/defaults.c:2161 ../src/defaults.c:2206
243-#: ../src/defaults.c:2253 ../src/defaults.c:2726 ../src/wdefaults.c:571
244-#: ../src/wdefaults.c:607
245+#: ../src/defaults.c:1497 ../src/defaults.c:1636 ../src/defaults.c:1756
246+#: ../src/defaults.c:2234 ../src/defaults.c:2251 ../src/defaults.c:2296
247+#: ../src/defaults.c:2343 ../src/defaults.c:2816 ../src/wdefaults.c:571
248+#: ../src/wdefaults.c:604
249 #, c-format
250 msgid "Wrong option format for key \"%s\". Should be %s."
251 msgstr "Falsches Optionsformat für Schlüssel \"%s\". %s erwartet."
252
253-#: ../src/defaults.c:1413 ../src/defaults.c:1494 ../src/defaults.c:1526
254-#: ../src/defaults.c:1558 ../src/defaults.c:1571 ../src/defaults.c:1586
255-#: ../src/defaults.c:1600 ../src/defaults.c:1670 ../src/defaults.c:1682
256-#: ../src/defaults.c:2149 ../src/defaults.c:2166 ../src/defaults.c:2179
257-#: ../src/defaults.c:2211 ../src/defaults.c:2227 ../src/defaults.c:2258
258-#: ../src/defaults.c:2345 ../src/defaults.c:2731 ../src/defaults.c:2742
259+#: ../src/defaults.c:1499 ../src/defaults.c:1580 ../src/defaults.c:1610
260+#: ../src/defaults.c:1641 ../src/defaults.c:1654 ../src/defaults.c:1669
261+#: ../src/defaults.c:1683 ../src/defaults.c:1761 ../src/defaults.c:1773
262+#: ../src/defaults.c:2239 ../src/defaults.c:2256 ../src/defaults.c:2269
263+#: ../src/defaults.c:2301 ../src/defaults.c:2317 ../src/defaults.c:2348
264+#: ../src/defaults.c:2435 ../src/defaults.c:2821 ../src/defaults.c:2832
265 #, c-format
266 msgid "using default \"%s\" instead"
267-msgstr "benutze Standardeinstellung \"%s\" anderenstatt"
268+msgstr "benutze Standardeinstellung \"%s\" anstatt"
269
270-#: ../src/defaults.c:1444
271+#: ../src/defaults.c:1530
272 #, c-format
273 msgid "wrong option value for key \"%s\". Should be one of %s"
274 msgstr "falscher Eigenschaftenwert für Schlüssel \"%s\". Wert aus %s erwartet"
275
276-#: ../src/defaults.c:1489
277+#: ../src/defaults.c:1575
278 #, c-format
279 msgid "can't convert \"%s\" to boolean for key \"%s\""
280-msgstr "\"%s\" konnte nicht in Wahrheitswert für Schlüssel \"%s\" konvertiert werden"
281+msgstr "\"%s\" konnte nicht in Boolean für Schlüssel \"%s\" konvertiert werden"
282
283-#: ../src/defaults.c:1523
284+#: ../src/defaults.c:1607
285 #, c-format
286 msgid "can't convert \"%s\" to integer for key \"%s\""
287-msgstr "\"%s\" konnte nicht in Ganzzahl für Schlüssel \"%s\" konvertiert werden"
288+msgstr "\"%s\" konnte nicht in Integer für Schlüssel \"%s\" konvertiert werden"
289
290-#: ../src/defaults.c:1566
291+#: ../src/defaults.c:1649
292 #, c-format
293 msgid "Incorrect number of elements in array for key \"%s\"."
294 msgstr "Falsche Anzahl von Argumenten für Schlüssel \"%s\""
295
296-#: ../src/defaults.c:1581
297+#: ../src/defaults.c:1664
298 #, c-format
299 msgid "Wrong value for key \"%s\". Should be Coordinate."
300-msgstr "Falscher Wert für Schlüssel \"%s\". Koordinate erwartet."
301+msgstr "Falscher Wert für Schlüssel \"%s\". Koordinaten erwartet."
302
303-#: ../src/defaults.c:1596
304+#: ../src/defaults.c:1679
305 #, c-format
306 msgid "can't convert array to integers for \"%s\"."
307-msgstr "Feld konnte nicht in Ganzzahlen für \"%s\" konvertiert werden."
308+msgstr "Feld konnte nicht in Integer für \"%s\" konvertiert werden."
309
310-#: ../src/defaults.c:1794 ../src/defaults.c:1826 ../src/defaults.c:1842
311-#: ../src/defaults.c:1871 ../src/defaults.c:1894 ../src/defaults.c:1947
312-#: ../src/defaults.c:1987 ../src/defaults.c:2025 ../src/defaults.c:2041
313+#: ../src/defaults.c:1884 ../src/defaults.c:1916 ../src/defaults.c:1932
314+#: ../src/defaults.c:1961 ../src/defaults.c:1984 ../src/defaults.c:2037
315+#: ../src/defaults.c:2077 ../src/defaults.c:2115 ../src/defaults.c:2131
316 #, c-format
317 msgid "\"%s\" is not a valid color name"
318 msgstr "\"%s\" ist kein gültiger Farbname"
319
320-#: ../src/defaults.c:1807 ../src/defaults.c:1859
321+#: ../src/defaults.c:1897 ../src/defaults.c:1949
322 msgid "bad number of arguments in gradient specification"
323 msgstr "falsche Anzahl von Argumenten in Farbverlaufsbeschreibung"
324
325-#: ../src/defaults.c:1920
326+#: ../src/defaults.c:2010
327 msgid "too few arguments in multicolor gradient specification"
328 msgstr "zuwenig Argumente in Mehrfarbverlaufsbeschreibung"
329
330-#: ../src/defaults.c:2014
331+#: ../src/defaults.c:2104
332 msgid "bad number of arguments in textured gradient specification"
333 msgstr "falsche Anzahl von Argumenten in Texturverlaufsbeschreibung"
334
335-#: ../src/defaults.c:2057
336+#: ../src/defaults.c:2147
337 #, c-format
338 msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
339 msgstr "falscher Transparenzwert für Textur \"%s\". [0..255] erwartet."
340
341-#: ../src/defaults.c:2117
342+#: ../src/defaults.c:2207
343 #, c-format
344 msgid "could not initialize library %s"
345 msgstr "Bibliothek %s konnte nicht initialisiert werden"
346
347-#: ../src/defaults.c:2120
348+#: ../src/defaults.c:2210
349 #, c-format
350 msgid "could not find function %s::%s"
351 msgstr "Funktion %s::%s konnte nicht gefunden werden"
352
353-#: ../src/defaults.c:2127
354+#: ../src/defaults.c:2217
355 #, c-format
356 msgid "invalid texture type %s"
357 msgstr "ungültiger Texturtyp %s"
358
359-#: ../src/defaults.c:2174
360+#: ../src/defaults.c:2264
361 #, c-format
362 msgid "Error in texture specification for key \"%s\""
363 msgstr "fehlerhafte Texturbeschreibung für Schlüssel \"%s\""
364
365-#: ../src/defaults.c:2223
366+#: ../src/defaults.c:2313
367 msgid "Wrong type for workspace background. Should be a texture type."
368 msgstr "Falscher Typ für Arbeitsflächen-Hintergrund. Textur erwartet."
369
370-#: ../src/defaults.c:2271
371+#: ../src/defaults.c:2361
372 #, c-format
373 msgid "Wrong type for background of workspace %i. Should be a texture."
374 msgstr "Falscher Typ für Arbeitsflächen-Hintergrund %i. Textur erwartet."
375
376-#: ../src/defaults.c:2313
377+#: ../src/defaults.c:2403
378 msgid "could not load any usable font!!!"
379 msgstr "keine brauchbaren Schriften konnten geladen werden!!!"
380
381-#: ../src/defaults.c:2340
382+#: ../src/defaults.c:2430
383 #, c-format
384 msgid "could not get color for key \"%s\""
385 msgstr "Farbe für Schlüssel \"%s\" konnte nicht ermittelt werden"
386
387-#: ../src/defaults.c:2398 ../src/rootmenu.c:523
388+#: ../src/defaults.c:2488 ../src/rootmenu.c:531
389 #, c-format
390 msgid "%s:invalid key modifier \"%s\""
391 msgstr "%s: ungültiger Schlüsselmodifikator \"%s\""
392
393-#: ../src/defaults.c:2410
394+#: ../src/defaults.c:2500
395 #, c-format
396 msgid "%s:invalid kbd shortcut specification \"%s\""
397 msgstr "%s: ungültiges Tastaturkürzel \"%s\""
398
399-#: ../src/defaults.c:2417
400+#: ../src/defaults.c:2507
401 #, c-format
402 msgid "%s:invalid key in shortcut \"%s\""
403-msgstr "%s: ungülige Taste in Kürzel \"%s\""
404+msgstr "%s: ungültige Taste in Kürzel \"%s\""
405
406-#: ../src/defaults.c:2442
407+#: ../src/defaults.c:2532
408 #, c-format
409 msgid "%s: modifier key %s is not valid"
410-msgstr "%s: ungültige Umschalttaste %s"
411+msgstr "%s: ungültige Tastenmodifikator %s"
412
413-#: ../src/defaults.c:2474
414+#: ../src/defaults.c:2564
415 #, c-format
416 msgid "could not load image in option %s: %s"
417 msgstr "Bild aus Eigenschaft %s konnte nicht geladen werden (%s)"
418
419-#: ../src/defaults.c:2591
420+#: ../src/defaults.c:2681
421 #, c-format
422 msgid "failed to open bitmap file \"%s\""
423 msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden"
424
425-#: ../src/defaults.c:2594
426+#: ../src/defaults.c:2684
427 #, c-format
428 msgid "\"%s\" is not a valid bitmap file"
429 msgstr "\"%s\" ist keine gültige Bitmap-Datei"
430
431-#: ../src/defaults.c:2597
432+#: ../src/defaults.c:2687
433 #, c-format
434 msgid "out of memory reading bitmap file \"%s\""
435 msgstr "zuwenig Speicher beim Lesen der Bitmap \"%s\""
436
437-#: ../src/defaults.c:2636 ../src/defaults.c:2669
438+#: ../src/defaults.c:2726 ../src/defaults.c:2759
439 msgid "bad number of arguments in cursor specification"
440 msgstr "falsche Anzahl von Argumente in Mauszeigerbeschreibung"
441
442-#: ../src/defaults.c:2652
443+#: ../src/defaults.c:2742
444 #, c-format
445 msgid "unknown builtin cursor name \"%s\""
446 msgstr "unbekannter interner Mauszeiger \"%s\""
447
448-#: ../src/defaults.c:2679 ../src/defaults.c:2691
449+#: ../src/defaults.c:2769 ../src/defaults.c:2781
450 #, c-format
451 msgid "could not find cursor bitmap file \"%s\""
452 msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden"
453
454-#: ../src/defaults.c:2738
455+#: ../src/defaults.c:2828
456 #, c-format
457 msgid "Error in cursor specification for key \"%s\""
458 msgstr "Fehler in Mauszeigerbeschreibung für Schlüssel \"%s\""
459
460-#: ../src/defaults.c:2823
461+#: ../src/defaults.c:2913
462 msgid "could not render texture for icon background"
463 msgstr "Textur für Symbolhintergrund konnte nicht angezeigt werden"
464
465-#: ../src/dialog.c:135
466+#: ../src/defaults.c:3541 ../src/defaults.c:3616
467+#, c-format
468+msgid "Invalid arguments for option \"%s\""
469+msgstr "Falsche Argument für Option \"%s\""
470+
471+#: ../src/defaults.c:3548 ../src/defaults.c:3623
472+#, c-format
473+msgid "Could not find image \"%s\" for option \"%s\""
474+msgstr "Bild \"%s\" aus Eigenschaft \"%s\" konnte nicht gefunden werden"
475+
476+#: ../src/defaults.c:3554 ../src/defaults.c:3631
477+#, c-format
478+msgid "Could not load image \"%s\" for option \"%s\""
479+msgstr "Bild \"%s\"aus Eigenschaft \"%s\" konnte nicht geladen werden"
480+
481+#: ../src/defaults.c:3566
482+msgid "Invalid split sizes for SwitchPanel back image."
483+msgstr "Ungültige Unterteilungsangaben für SwitchPanel-Hintergrundbild."
484+
485+#: ../src/defaults.c:3639
486+#, c-format
487+msgid "Invalid number of arguments for option \"%s\""
488+msgstr "Falsche Anzahl von Argumente für Option \"%s\""
489+
490+#: ../src/dialog.c:147
491 msgid "Save workspace state"
492 msgstr "Sitzung speichern"
493
494-#: ../src/dialog.c:173 ??
495-msgid "Shutdown Computer"
496-msgstr "Computer herunterfahren"
497-
498-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
499-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
500+#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547
501+#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248
502 #: ../src/rootmenu.c:264
503 msgid "Cancel"
504 msgstr "Abbrechen"
505
506-#: ../src/dialog.c:277
507+#: ../src/dialog.c:290
508 msgid "Could not open directory "
509 msgstr "Verzeichnis konnte nicht geöffnet werden"
510
511-#: ../src/dialog.c:332
512+#: ../src/dialog.c:345
513 msgid "Could not load image file "
514 msgstr "Bilddatei konnte nicht geöffnet werden"
515
516-#: ../src/dialog.c:663
517+#: ../src/dialog.c:659
518 msgid "Directories"
519 msgstr "Verzeichnisse"
520
521-#: ../src/dialog.c:672
522+#: ../src/dialog.c:668
523 msgid "Icons"
524 msgstr "Symbole"
525
526-#: ../src/dialog.c:705
527+#: ../src/dialog.c:701
528 msgid "Preview"
529 msgstr "Vorschau"
530
531-#: ../src/dialog.c:718
532+#: ../src/dialog.c:714
533 msgid "File Name:"
534 msgstr "Dateiname:"
535
536-#: ../src/dialog.c:742
537+#: ../src/dialog.c:738
538 msgid "Choose File"
539 msgstr "Datei auswählen"
540
541-#: ../src/dialog.c:760 ../src/dialog.c:762
542+#: ../src/dialog.c:757 ../src/dialog.c:759
543 msgid "Icon Chooser"
544 msgstr "Symbol-Wähler"
545
546-#: ../src/dialog.c:1241 ../src/dialog.c:1351
547+#: ../src/dialog.c:1196 ../src/dialog.c:1304
548 #, c-format
549 msgid "Version %s"
550 msgstr "Version %s"
551
552-#: ../src/dialog.c:1348
553+#: ../src/dialog.c:1302
554 msgid "Window Manager for X"
555 msgstr "Windowmanager für X"
556
557-#: ../src/dialog.c:1371
558+#: ../src/dialog.c:1325
559 #, c-format
560 msgid "Using visual 0x%x: %s %ibpp "
561 msgstr "Benutze Visual 0x%x %s %ibpp "
562
563-#: ../src/dialog.c:1379
564+#: ../src/dialog.c:1333
565 msgid "(32 thousand colors)\n"
566 msgstr "(32.000 Farben)\n"
567
568-#: ../src/dialog.c:1382
569+#: ../src/dialog.c:1336
570 msgid "(64 thousand colors)\n"
571 msgstr "(64.000 Farben)\n"
572
573-#: ../src/dialog.c:1386
574+#: ../src/dialog.c:1340
575 msgid "(16 million colors)\n"
576 msgstr "(16 Millionen Farben)\n"
577
578-#: ../src/dialog.c:1389
579+#: ../src/dialog.c:1343
580 #, c-format
581 msgid "(%d colors)\n"
582 msgstr "(%d Farben)\n"
583
584-#: ../src/dialog.c:1399
585+#: ../src/dialog.c:1353
586 #, c-format
587 msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
588 msgstr "Gesamter belegter Speicher: %i kB. Gesamter benutzter Speicher: %i kB.\n"
589
590-#: ../src/dialog.c:1406
591+#: ../src/dialog.c:1360
592 msgid "Supported image formats: "
593 msgstr "Unterstütze Grafikformate: "
594
595-#: ../src/dialog.c:1413
596+#: ../src/dialog.c:1367
597 msgid ""
598 "\n"
599 "Additional support for: "
600@@ -387,11 +418,11 @@
601 "\n"
602 "Zusätzliche Unterstützung für: "
603
604-#: ../src/dialog.c:1436
605+#: ../src/dialog.c:1384
606 msgid " and "
607 msgstr " und "
608
609-#: ../src/dialog.c:1446
610+#: ../src/dialog.c:1394
611 msgid ""
612 "\n"
613 "Sound disabled"
614@@ -399,7 +430,7 @@
615 "\n"
616 "Ton ausgeschaltet"
617
618-#: ../src/dialog.c:1448
619+#: ../src/dialog.c:1396
620 msgid ""
621 "\n"
622 "Sound enabled"
623@@ -407,89 +438,105 @@
624 "\n"
625 "Ton eingeschaltet"
626
627-#: ../src/dialog.c:1472
628+#: ../src/dialog.c:1401
629+msgid ", VirtualDesktop enabled"
630+msgstr ", VirtualDesktop aktiviert"
631+
632+#: ../src/dialog.c:1403
633+msgid ", VirtualDesktop disabled"
634+msgstr ", VirtualDesktop deaktiviert"
635+
636+#: ../src/dialog.c:1407
637+msgid "\n"
638+msgstr ""
639+
640+#: ../src/dialog.c:1409
641+msgid "Solaris "
642+msgstr ""
643+
644+#: ../src/dialog.c:1411
645+msgid "Xinerama: "
646+msgstr ""
647+
648+#: ../src/dialog.c:1445
649 msgid "Info"
650 msgstr "Info"
651
652-#: ../src/dialog.c:1495
653+#: ../src/dialog.c:1469
654 msgid "Merry Christmas!"
655 msgstr "Frohe Weihnachten!"
656
657-#: ../src/dialog.c:1565
658+#: ../src/dialog.c:1539
659 msgid ""
660 " Window Maker is free software; you can redistribute it and/or\n"
661 "modify it under the terms of the GNU General Public License as\n"
662 "published by the Free Software Foundation; either version 2 of the\n"
663 "License, or (at your option) any later version.\n"
664 "\n"
665-"\n"
666 " Window Maker is distributed in the hope that it will be useful,\n"
667 "but WITHOUT ANY WARRANTY; without even the implied warranty\n"
668 "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
669 "See the GNU General Public License for more details.\n"
670 "\n"
671-"\n"
672 " You should have received a copy of the GNU General Public\n"
673 "License along with this program; if not, write to the Free Software\n"
674 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
675 "02111-1307, USA."
676 msgstr ""
677
678-#: ../src/dialog.c:1586
679+#: ../src/dialog.c:1563
680 msgid "Legal"
681 msgstr "Rechtliches"
682
683-#: ../src/dialog.c:1737 ../src/startup.c:395
684+#: ../src/dialog.c:1719
685 msgid "cannot open connection for crashing dialog panel. Aborting."
686-msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden"
687+msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden. Abbruch."
688
689-#: ../src/dialog.c:1763
690+#: ../src/dialog.c:1745
691 msgid "Fatal error"
692 msgstr "Fataler Fehler"
693
694-#: ../src/dialog.c:1774
695+#: ../src/dialog.c:1756
696 #, c-format
697 msgid ""
698 "Window Maker received signal %i\n"
699 "(%s)."
700 msgstr ""
701-"Window Maker erhielt Signale %i\n"
702+"Window Maker erhielt Signal %i\n"
703 "(%s)."
704
705-#: ../src/dialog.c:1777
706+#: ../src/dialog.c:1759
707 #, c-format
708 msgid "Window Maker received signal %i."
709 msgstr "Window Maker erhielt Signal %i"
710
711-#: ../src/dialog.c:1786
712+#: ../src/dialog.c:1768
713 msgid ""
714 " This fatal error occured probably due to a bug. Please fill the included "
715 "BUGFORM and report it to bugs@windowmaker.org."
716-msgstr ""
717-" Dieser fatale Fehler trat möglicherweise aufgrund eines Programmfehlers auf. Bitte füllen Sie die "
718-"mitgelieferte BUGFORM aus und schicken sie an bugs@windowmaker.org"
719+msgstr " Dieser fatale Fehler trat möglicherweise wegen eines Bugs auf. Bitte füllen Sie die mitgelieferte BUGFORM aus und schicken Sie sie an bugs@windowmaker.org."
720
721-#: ../src/dialog.c:1795
722+#: ../src/dialog.c:1777
723 msgid "What do you want to do now?"
724 msgstr "Was möchten Sie jetzt tun?"
725
726-#: ../src/dialog.c:1801
727+#: ../src/dialog.c:1783
728 msgid "Select action"
729 msgstr "Aktion auswählen"
730
731-#: ../src/dialog.c:1802
732+#: ../src/dialog.c:1784
733 msgid "Abort and leave a core file"
734 msgstr "Abbrechen und Core-Datei hinterlassen"
735
736-#: ../src/dialog.c:1803
737+#: ../src/dialog.c:1785
738 msgid "Restart Window Maker"
739 msgstr "Window Maker neustarten"
740
741-#: ../src/dialog.c:1804
742+#: ../src/dialog.c:1786
743 msgid "Start alternate window manager"
744 msgstr "Anderen Windowmanager starten"
745
746-#: ../src/dialog.c:1982
747+#: ../src/dialog.c:1964
748 msgid ""
749 "Window Maker is part of the GNUstep project.\n"
750 "The GNUstep project aims to create a free\n"
751@@ -510,567 +557,507 @@
752 "erstellt. Für weitere Informationen zu GNUstep besuchen\n"
753 "sie bitte www.gnustep.org"
754
755-#: ../src/dialog.c:2002
756+#: ../src/dialog.c:1987
757 msgid "About GNUstep"
758 msgstr "Über GNUStep"
759
760-#: ../src/dock.c:213
761+#: ../src/dock.c:193
762 #, c-format
763 msgid "Type the name for workspace %i:"
764-msgstr "Geben sie den Namen der Arbeitsfläche %i ein:"
765+msgstr "Geben Sie den Namen der Arbeitsfläche %i ein:"
766
767-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
768+#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419
769 msgid "Rename Workspace"
770 msgstr "Arbeitsfläche umbenennen"
771
772-#: ../src/dock.c:520 ../src/dock.c:528
773+#: ../src/dock.c:509 ../src/dock.c:517
774 msgid "Warning"
775 msgstr "Warnung"
776
777-#: ../src/dock.c:521
778+#: ../src/dock.c:510
779 msgid ""
780 "Some icons cannot be made omnipresent. Please make sure that no other icon "
781 "is docked in the same positions on the other workspaces and the Clip is not "
782 "full in some workspace."
783 msgstr ""
784-"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie sicher, "
785-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position andockt "
786-"und der Clip in keiner Arbeitsfläche voll ist."
787+"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie "
788+"sicher, dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen "
789+"Position andockt und der Clip in keiner Arbeitsfläche voll ist."
790
791-#: ../src/dock.c:529
792+#: ../src/dock.c:518
793 msgid ""
794 "Icon cannot be made omnipresent. Please make sure that no other icon is "
795 "docked in the same position on the other workspaces and the Clip is not full "
796 "in some workspace."
797 msgstr ""
798-"Symbol konntennicht haftend gemacht werden. Bitte stellen Sie sicher, "
799-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt "
800+"Symbol konnte nicht haftend gemacht werden. Bitte stellen Sie sicher, dass "
801+"kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt "
802 "und der Clip in keiner Arbeitsfläche voll ist."
803
804-#: ../src/dock.c:556
805+#: ../src/dock.c:545
806 msgid "Workspace Clip"
807 msgstr "Arbeitsflächen-Clip"
808
809-#: ../src/dock.c:557
810+#: ../src/dock.c:546
811 msgid "All selected icons will be removed!"
812 msgstr "Alle ausgewählten Symbole werden entfernt!"
813
814-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
815+#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455
816 msgid "Keep Icon"
817 msgstr "Symbol behalten"
818
819-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
820+#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276
821 msgid "Type the command used to launch the application"
822 msgstr "Geben Sie den Befehl zum Starten der Anwendung ein"
823
824-#: ../src/dock.c:965
825+#: ../src/dock.c:954
826 #, c-format
827 msgid "could not launch application %s\n"
828 msgstr "Anwendung %s konnte nicht gestartet werden\n"
829
830-#: ../src/dock.c:1020
831+#: ../src/dock.c:1010
832 msgid "could not create workspace submenu for Clip menu"
833 msgstr "Arbeitsflächen-Untermenü für Clip konnte nicht erstellt werden"
834
835-#: ../src/dock.c:1078
836+#: ../src/dock.c:1069
837 msgid "could not create options submenu for Clip menu"
838 msgstr "Eigenschaften-Menü für Clip konnte nicht erstellt werden"
839
840-#: ../src/dock.c:1082 ../src/dock.c:1130
841+#: ../src/dock.c:1073 ../src/dock.c:1121
842 msgid "Keep on Top"
843 msgstr "Immer oben"
844
845-#: ../src/dock.c:1088
846+#: ../src/dock.c:1079
847 msgid "Collapsed"
848 msgstr "Zusammengefaltet"
849
850-#: ../src/dock.c:1094
851+#: ../src/dock.c:1085
852 msgid "Autocollapse"
853 msgstr "Automatisch zusammenfalten"
854
855-#: ../src/dock.c:1100
856+#: ../src/dock.c:1091
857 msgid "Autoraise"
858 msgstr "Automatisch oben"
859
860-#: ../src/dock.c:1106
861+#: ../src/dock.c:1097
862 msgid "Autoattract Icons"
863 msgstr "Symbole automatisch anziehen"
864
865-#: ../src/dock.c:1136
866+#: ../src/dock.c:1127
867 msgid "Clip Options"
868 msgstr "Clip-Optionen"
869
870-#: ../src/dock.c:1146
871+#: ../src/dock.c:1137
872 msgid "Selected"
873 msgstr "Ausgewählt"
874
875-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
876+#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446
877 msgid "Select All Icons"
878 msgstr "Alle Symbole auswählen"
879
880-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
881+#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463
882 msgid "Move Icon To"
883 msgstr "Verschiebe Symbol nach..."
884
885-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
886+#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474
887 msgid "Remove Icon"
888 msgstr "Entferne Symbol"
889
890-#: ../src/dock.c:1172
891+#: ../src/dock.c:1163
892 msgid "Attract Icons"
893 msgstr "Symbole anziehen"
894
895-#: ../src/dock.c:1175
896+#: ../src/dock.c:1166
897 msgid "Launch"
898-msgstr "Starten"
899+msgstr "Ausführen"
900
901-#: ../src/dock.c:1183
902+#: ../src/dock.c:1174
903 msgid "Settings..."
904 msgstr "Einstellungen..."
905
906-#: ../src/dock.c:1548 ../src/dock.c:1655
907+#: ../src/dock.c:1538 ../src/dock.c:1645
908 #, c-format
909 msgid "bad value in docked icon state info %s"
910 msgstr "falscher Wert für Statusinfo %s des angedockten Symbols"
911
912-#: ../src/dock.c:1663
913+#: ../src/dock.c:1653
914 #, c-format
915 msgid "bad value in docked icon position %i,%i"
916 msgstr "falscher Wert für Position eines angedockten Symbols: %i,%i"
917
918-#: ../src/dock.c:1683
919+#: ../src/dock.c:1673
920 #, c-format
921 msgid "bad value in dock state info:%s"
922 msgstr "falscher Wert in Dock-Statusinfo: %s"
923
924-#: ../src/dock.c:1919
925+#: ../src/dock.c:1923
926 msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
927 msgstr "zu viele Symbole im Dock, überzählige werden ignoriert"
928
929 #. icon->forced_dock = 1;
930-#: ../src/dock.c:2136 ../src/dock.c:2277
931+#: ../src/dock.c:2138 ../src/dock.c:2275
932 msgid "Dock Icon"
933 msgstr "Dock-Symbol"
934
935-#: ../src/dock.c:3323
936+#: ../src/dock.c:3333
937 #, c-format
938 msgid "Could not execute command \"%s\""
939 msgstr "Befehl \"%s\" konnte nicht ausgeführt werden"
940
941-#: ../src/dock.c:3415
942+#: ../src/dock.c:3425
943 msgid "Toggle Omnipresent"
944 msgstr "Haftend ein/aus"
945
946-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
947-#: ../src/winspector.c:1375
948+#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383
949 msgid "Omnipresent"
950 msgstr "Haftend"
951
952-#: ../src/dock.c:3434
953+#: ../src/dock.c:3444
954 msgid "Unselect All Icons"
955 msgstr "Alle Symbole abwählen"
956
957-#: ../src/dock.c:3443
958+#: ../src/dock.c:3453
959 msgid "Keep Icons"
960 msgstr "Symbole behalten"
961
962-#: ../src/dock.c:3451
963+#: ../src/dock.c:3461
964 msgid "Move Icons To"
965 msgstr "Verschiebe Symbole nach"
966
967-#: ../src/dock.c:3462
968+#: ../src/dock.c:3472
969 msgid "Remove Icons"
970 msgstr "Symbole entfernen"
971
972-#: ../src/dock.c:3493 ../src/kwm.c:643
973+#: ../src/dock.c:3503
974 msgid "Bring Here"
975 msgstr "Hierher holen"
976
977-#: ../src/dockedapp.c:149
978+#: ../src/dockedapp.c:150
979 #, c-format
980 msgid "could not find icon %s, used in a docked application"
981 msgstr "Symbol %s für gedockte Anwendung konnte nicht gefunden"
982
983-#: ../src/dockedapp.c:229
984+#: ../src/dockedapp.c:230
985 #, c-format
986 msgid "Could not open specified icon file: %s"
987 msgstr "Symboldatei %s konnte nicht geöffnet werden"
988
989-#: ../src/dockedapp.c:231
990+#: ../src/dockedapp.c:232
991 msgid "Ignore"
992 msgstr "Ignorieren"
993
994-#: ../src/dockedapp.c:333
995+#: ../src/dockedapp.c:334
996 msgid "Start when Window Maker is started"
997 msgstr "Autostart"
998
999-#: ../src/dockedapp.c:340
1000+#: ../src/dockedapp.c:341
1001 msgid "Lock (prevent accidental removal)"
1002 msgstr "Festhalten (kein versehentliches Entfernen)"
1003
1004-#: ../src/dockedapp.c:344
1005+#: ../src/dockedapp.c:345
1006 msgid "Application path and arguments"
1007 msgstr "Anwendungspfad und -argumente"
1008
1009-#: ../src/dockedapp.c:357
1010+#: ../src/dockedapp.c:358
1011 msgid "Command for middle-click launch"
1012 msgstr "Befehl für Klick mit mittlerer Maustaste"
1013
1014-#: ../src/dockedapp.c:371
1015+#: ../src/dockedapp.c:372
1016 #, c-format
1017 msgid "%s will be replaced with current selection"
1018 msgstr "%s wird durch die aktuelle Auswahl ersetzt"
1019
1020-#: ../src/dockedapp.c:376
1021+#: ../src/dockedapp.c:377
1022 msgid "Command for files dropped with DND"
1023 msgstr "Befehl für per DND-Operationen"
1024
1025-#: ../src/dockedapp.c:390
1026+#: ../src/dockedapp.c:391
1027 #, c-format
1028 msgid "%d will be replaced with the file name"
1029 msgstr "%d wird durch den Dateinamen ersetzt"
1030
1031-#: ../src/dockedapp.c:394
1032+#: ../src/dockedapp.c:395
1033 msgid "DND support was not compiled in"
1034 msgstr "keine einkompilierte DND-Unterstützung"
1035
1036-#: ../src/dockedapp.c:399
1037+#: ../src/dockedapp.c:400
1038 msgid "Icon Image"
1039 msgstr "Symbol"
1040
1041-#: ../src/dockedapp.c:413 ../src/winspector.c:1513
1042+#: ../src/dockedapp.c:414 ../src/winspector.c:1521
1043 msgid "Browse..."
1044 msgstr "Suchen..."
1045
1046-#: ../src/dockedapp.c:466
1047+#: ../src/dockedapp.c:475
1048 msgid "Docked Application Settings"
1049 msgstr "Einstellungen für gedockte Anwendungen"
1050
1051-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456
1052+#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463
1053 #: ../src/texture.c:594
1054 #, c-format
1055 msgid "could not render texture: %s"
1056 msgstr "Textur %s konnte nicht angezeigt werden"
1057
1058-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
1059-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
1060-#: ../src/icon.c:350 ../src/menu.c:485
1061+#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697
1062+#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722
1063+#: ../src/icon.c:360 ../src/menu.c:492
1064 #, c-format
1065 msgid "error rendering image:%s"
1066 msgstr "Fehler beim Anzeigen des Bildes: %s"
1067
1068-#: ../src/framewin.c:777
1069+#: ../src/framewin.c:775
1070 #, c-format
1071 msgid "error rendering image: %s"
1072 msgstr "Fehler beim Anzeigen des Bildes: %s"
1073
1074-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
1075-msgid "out of memory while updating GNOME hints"
1076-msgstr "zuwenig Speicher beim Erneuern der GNOME-Hinweise"
1077-
1078-#: ../src/icon.c:229 ../src/wdefaults.c:443
1079+#: ../src/icon.c:239 ../src/wdefaults.c:443
1080 #, c-format
1081 msgid "error loading image file \"%s\""
1082 msgstr "Fehler beim Laden der Bilddatei \"%s\""
1083
1084-#: ../src/icon.c:491 ../src/icon.c:500
1085+#: ../src/icon.c:503 ../src/icon.c:512
1086 #, c-format
1087 msgid "could not create directory %s"
1088 msgstr "Vezeichnis %s konnte nicht erstellt werden"
1089
1090-#: ../src/icon.c:767
1091+#: ../src/icon.c:782
1092 #, c-format
1093 msgid "could not find default icon \"%s\""
1094 msgstr "Standardsymbol \"%s\" konnte nicht gefunden werden"
1095
1096-#: ../src/icon.c:773
1097+#: ../src/icon.c:788
1098 #, c-format
1099 msgid "could not load default icon \"%s\":%s"
1100 msgstr "Standardsymbol \"%s\" (%s) konnte nicht geöffnet werden"
1101
1102-#.
1103-#. * Warning: If you make some change that affects the order of the
1104-#. * entries, you must update the command #defines in the top of
1105-#. * this file.
1106-#.
1107-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
1108-msgid "Maximize"
1109-msgstr "Maximieren"
1110-
1111-#: ../src/kwm.c:634 ../src/winmenu.c:566
1112-msgid "Unmaximize"
1113-msgstr "Ursprüngliche Größe"
1114-
1115-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
1116-msgid "Miniaturize"
1117-msgstr "Minimieren"
1118-
1119-#: ../src/kwm.c:636 ../src/winmenu.c:552
1120-msgid "Deminiaturize"
1121-msgstr "Wiederherstellen"
1122-
1123-#: ../src/kwm.c:638
1124-msgid "Not Omnipresent"
1125-msgstr "Nicht haftend"
1126-
1127-#: ../src/kwm.c:639
1128-msgid "Move"
1129-msgstr "Bewegen"
1130-
1131-#: ../src/kwm.c:640
1132-msgid "Resize"
1133-msgstr "Größe ändern"
1134-
1135-#.
1136-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
1137-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
1138-#.
1139-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
1140-msgid "Close"
1141-msgstr "Schließen"
1142-
1143-#: ../src/kwm.c:642 ../src/winmenu.c:485
1144-msgid "Move To"
1145-msgstr "Bewegen nach..."
1146-
1147-#: ../src/kwm.c:1096
1148-msgid "%a(Run Command,Type the command to run:)"
1149-msgstr "%a (Befehl zum Ausführen eintippen)"
1150-
1151-#: ../src/main.c:222
1152+#: ../src/main.c:220
1153 msgid "failed to restart Window Maker."
1154 msgstr "Window Maker-Neustart schlug fehl"
1155
1156-#: ../src/main.c:225
1157+#: ../src/main.c:223
1158 #, c-format
1159 msgid "could not exec %s"
1160 msgstr "%s konnte nicht ausgeführt werden"
1161
1162-#: ../src/main.c:271
1163+#: ../src/main.c:269
1164 msgid "Could not execute command: "
1165 msgstr "Befehl konnte nicht ausgeführt werden: "
1166
1167-#: ../src/main.c:428
1168+#: ../src/main.c:426
1169 #, c-format
1170 msgid "%s aborted.\n"
1171 msgstr "%s wurde abgebrochen.\n"
1172
1173-#: ../src/main.c:439
1174+#: ../src/main.c:437
1175 #, c-format
1176 msgid "Usage: %s [options]\n"
1177 msgstr "Benutzung: %s [Optionen]\n"
1178
1179-#: ../src/main.c:440
1180+#: ../src/main.c:438
1181 msgid "The Window Maker window manager for the X window system"
1182-msgstr "Der Window Maker Windowmanager für das X-Window System"
1183+msgstr "Der Window Maker-Windowmanager für das X-Window System"
1184
1185-#: ../src/main.c:442
1186+#: ../src/main.c:440
1187 msgid " -display host:dpy\tdisplay to use"
1188 msgstr " -display host:dpy\tverwendetes Display"
1189
1190-#: ../src/main.c:444
1191+#: ../src/main.c:442
1192 msgid " --no-cpp \t\tdisable preprocessing of configuration files"
1193-msgstr " --no-cpp \t\tkein Abarbeiten der Konfigurationsdateien"
1194+msgstr " --no-cpp \t\tkein Präprozessieren der Konfigurationsdateien"
1195
1196-#: ../src/main.c:446
1197+#: ../src/main.c:444
1198 msgid " --no-dock\t\tdo not open the application Dock"
1199 msgstr " --no-dock\t\tAnwendungsdock nicht öffnen"
1200
1201-#: ../src/main.c:447
1202+#: ../src/main.c:445
1203 msgid " --no-clip\t\tdo not open the workspace Clip"
1204 msgstr " --no-clip\t\tArbeitsflächen-Clip nicht öffnen"
1205
1206-#: ../src/main.c:448
1207+#: ../src/main.c:446
1208 msgid " --no-autolaunch\tdo not autolaunch applications"
1209-msgstr " --no-autolaunch\tkein Anwendungs-Autostart"
1210+msgstr " --no-autolaunch\tkein Autostart von Anwendungen"
1211
1212-#: ../src/main.c:449
1213+#: ../src/main.c:447
1214 msgid " --dont-restore\t\tdo not restore saved session"
1215 msgstr " --dont-restore\t\tgespeicherte Sitzung nicht wiederherstellen"
1216
1217-#: ../src/main.c:451
1218+#: ../src/main.c:449
1219 msgid " --locale locale\tlocale to use"
1220-msgstr " --locale locale\tbenutzte Lokale"
1221+msgstr " --locale locale\tzu benutzende Lokalisierung"
1222
1223-#: ../src/main.c:453
1224+#: ../src/main.c:451
1225 msgid " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
1226-msgstr " --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit Pseudofarben"
1227+msgstr ""
1228+" --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit "
1229+"Pseudofarben"
1230
1231-#: ../src/main.c:454
1232+#: ../src/main.c:452
1233 msgid " --visual-id visualid\tvisual id of visual to use"
1234 msgstr " --visual-id visualid\tID des zu benutzenden Visuals"
1235
1236-#: ../src/main.c:455
1237+#: ../src/main.c:453
1238 msgid " --static\t\tdo not update or save configurations"
1239 msgstr " --static\t\tKonfiguration nicht ändern oder speichern"
1240
1241-#: ../src/main.c:456
1242+#: ../src/main.c:454
1243 msgid " --no-polling\t\tdo not periodically check for configuration updates"
1244 msgstr " --no-polling\t\tnicht periodisch auf Konfigurationsänderungen testen"
1245
1246-#: ../src/main.c:458
1247+#: ../src/main.c:456
1248 msgid " --synchronous\t\tturn on synchronous display mode"
1249 msgstr " --synchronous\t\tsnychronen Display-Modus einschalten"
1250
1251-#: ../src/main.c:460
1252+#: ../src/main.c:458
1253 msgid " --version\t\tprint version and exit"
1254 msgstr " --version\t\tVersion anzeigen und beenden"
1255
1256-#: ../src/main.c:461
1257+#: ../src/main.c:459
1258 msgid " --help\t\t\tshow this message"
1259 msgstr " --help\t\t\tdiese Nachricht anzeigen"
1260
1261-#: ../src/main.c:474
1262+#: ../src/main.c:473
1263 #, c-format
1264 msgid ""
1265 "could not find user GNUstep directory (%s).\n"
1266 "Make sure you have installed Window Maker correctly and run wmaker.inst"
1267 msgstr ""
1268 "GNUstep-Verzeichnis (%s) konnte nicht gefunden werden.\n"
1269-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben"
1270+"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker."
1271+"inst aufgerufen haben"
1272
1273-#: ../src/main.c:479
1274+#: ../src/main.c:478
1275 #, c-format
1276 msgid "could not find user GNUstep directory (%s)."
1277 msgstr "GNUstep-Verzeichnis (%s) konnte nicht gefunden werden."
1278
1279-#: ../src/main.c:482
1280+#: ../src/main.c:481
1281 msgid ""
1282 "There was an error while creating GNUstep directory, please make sure you "
1283 "have installed Window Maker correctly and run wmaker.inst"
1284 msgstr ""
1285-"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler aufgetreten, "
1286-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben"
1287+"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler "
1288+"aufgetreten, Stellen Sie sicher, dass sie Window Maker korrekt installiert "
1289+"und wmaker.inst aufgerufen haben"
1290
1291-#: ../src/main.c:485
1292+#: ../src/main.c:484
1293 #, c-format
1294 msgid "%s directory created with default configuration."
1295 msgstr "Verzeichnis %s wurde mit Standardkonfiguration erstellt"
1296
1297-#: ../src/main.c:505 ../src/main.c:510
1298+#: ../src/main.c:506 ../src/main.c:511
1299 #, c-format
1300 msgid "%s:could not execute initialization script"
1301 msgstr "%s:Initialisierungsskript konnte nicht ausgeführt werden"
1302
1303-#: ../src/main.c:530 ../src/main.c:535
1304+#: ../src/main.c:533 ../src/main.c:538
1305 #, c-format
1306 msgid "%s:could not execute exit script"
1307 msgstr "%s: Beendigungsskript konnte nicht ausgeführt werden"
1308
1309-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
1310+#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738
1311+#: ../src/main.c:758
1312 #, c-format
1313 msgid "too few arguments for %s"
1314 msgstr "zuwenig Argumente für %s"
1315
1316-#: ../src/main.c:671
1317+#: ../src/main.c:742
1318 #, c-format
1319 msgid "bad value for visualid: \"%s\""
1320 msgstr "falscher Wert für Visual-ID: \"%s\""
1321
1322-#: ../src/main.c:695
1323+#: ../src/main.c:766
1324 #, c-format
1325 msgid "%s: invalid argument '%s'\n"
1326 msgstr "%s: falsches Argument '%s'\n"
1327
1328-#: ../src/main.c:696
1329+#: ../src/main.c:767
1330 #, c-format
1331 msgid "Try '%s --help' for more information\n"
1332 msgstr "Versuchen Sie '%s --help' für mehr Informationen\n"
1333
1334-#: ../src/main.c:727
1335+#: ../src/main.c:802
1336 msgid "X server does not support locale"
1337-msgstr "X-Server unterstützt keine Locales"
1338+msgstr "X-Server unterstützt gewählte Lokalisierung nicht"
1339
1340-#: ../src/main.c:731
1341+#: ../src/main.c:806
1342 msgid "cannot set locale modifiers"
1343-msgstr "Lokalen-Modifikator konnte nicht gesetzt werden"
1344+msgstr "Lokalisierungs-Modifikator konnte nicht gesetzt werden"
1345
1346-#: ../src/main.c:747
1347+#: ../src/main.c:822
1348 #, c-format
1349 msgid "could not open display \"%s\""
1350 msgstr "Display \"%s\" konnte nicht geöffnet werden"
1351
1352-#: ../src/menu.c:1255
1353+#: ../src/menu.c:1276
1354 msgid "could not grab keyboard"
1355 msgstr "Tastatur konnte nicht abfangen werden"
1356
1357-#: ../src/menu.c:2569
1358+#: ../src/menu.c:2615
1359 #, c-format
1360 msgid "bad value in menus state info:%s"
1361 msgstr "falsche Werte in Menü-Statusinfo: %s"
1362
1363-#: ../src/misc.c:71
1364+#: ../src/misc.c:65
1365 #, c-format
1366 msgid "could not define value for %s for cpp"
1367-msgstr "Wert für %s für cpp konnte nicht definiert werden"
1368+msgstr "Wert des Symbols %s für cpp konnte nicht definiert werden"
1369
1370-#: ../src/misc.c:101
1371+#: ../src/misc.c:95
1372 #, c-format
1373 msgid "could not get password entry for UID %i"
1374-msgstr "Passwort für UID %i konnte nicht ermittelt werden"
1375+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
1376
1377-#: ../src/misc.c:126
1378+#: ../src/misc.c:120
1379 #, c-format
1380 msgid "your machine is misconfigured. HOSTNAME is set to %s"
1381 msgstr "Ihr System ist falsch konfiguriert. HOSTNAME wird auf %s gesetzt."
1382
1383-#: ../src/misc.c:132
1384+#: ../src/misc.c:126
1385 #, c-format
1386 msgid "your machine is misconfigured. HOST is set to %s"
1387 msgstr "Ihr System ist falsch konfiguriert. HOST wird auf %s gesetzt."
1388
1389-#: ../src/misc.c:630
1390+#: ../src/misc.c:621
1391 msgid "Program Arguments"
1392 msgstr "Programmargumente"
1393
1394-#: ../src/misc.c:631
1395+#: ../src/misc.c:622
1396 msgid "Enter command arguments:"
1397 msgstr "Programmargumente eintragen"
1398
1399-#: ../src/misc.c:724
1400-msgid "unable to get dropped data from DND drop"
1401-msgstr "Daten der DND-Operation konnten nicht ermittelt werden"
1402-
1403-#: ../src/misc.c:732
1404-msgid "error getting dropped data from DND drop"
1405-msgstr "beim Ermitteln der Daten der DND-Operation ist ein Fehler aufgetreten"
1406-
1407-#: ../src/misc.c:738
1408-msgid "out of memory while getting data from DND drop"
1409-msgstr "zuwenig Speicher beim Ermitteln der Daten der DND-Operation"
1410-
1411-#: ../src/misc.c:783 ../src/misc.c:923
1412+#: ../src/misc.c:736 ../src/misc.c:874
1413 #, c-format
1414 msgid "out of memory during expansion of \"%s\""
1415 msgstr "zuwenig Speicher bei der Expansion von \"%s\""
1416
1417-#: ../src/misc.c:837
1418+#: ../src/misc.c:790
1419 msgid "out of memory during expansion of \"%w\""
1420 msgstr "zuwenig Speicher bei der Expansion von \"%w\""
1421
1422-#: ../src/misc.c:855
1423+#: ../src/misc.c:808
1424 msgid "out of memory during expansion of \"%W\""
1425 msgstr "zuwenig Speicher bei der Expansion von \"%W\""
1426
1427-#: ../src/misc.c:871
1428+#: ../src/misc.c:824
1429+#, c-format
1430 msgid "out of memory during expansion of \"%a\""
1431 msgstr "zuwenig Speicher bei der Expansion von \"%a\""
1432
1433-#: ../src/misc.c:902
1434+#: ../src/misc.c:853
1435 #, c-format
1436 msgid "out of memory during expansion of \"%d\""
1437 msgstr "zuwenig Speicher bei der Expansion von \"%d\""
1438
1439-#: ../src/misc.c:916
1440+#: ../src/misc.c:867
1441 msgid "selection not available"
1442 msgstr "keine Auswahl verfügbar"
1443
1444-#: ../src/misc.c:972 ../src/misc.c:978
1445+#: ../src/misc.c:911 ../src/misc.c:917
1446 #, c-format
1447 msgid "bad window name value in %s state info"
1448 msgstr "falscher Fenstername in Statusinfo von %s"
1449
1450-#: ../src/misc.c:1235
1451+#: ../src/misc.c:1156
1452 msgid "could not send message to background image helper"
1453 msgstr "Nachricht an Hintergrundbild-Anwendung konnte nicht gesendet werden"
1454
1455@@ -1109,6 +1096,14 @@
1456 "Windowsystem-Sitzung beenden?\n"
1457 "Ungespeicherte Daten in Anwendungen können verloren gehen."
1458
1459+#.
1460+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
1461+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
1462+#.
1463+#: ../src/rootmenu.c:248 ../src/winmenu.c:501
1464+msgid "Close"
1465+msgstr "Schließen"
1466+
1467 #: ../src/rootmenu.c:261
1468 msgid "Kill X session"
1469 msgstr "Töte X-Sitzung"
1470@@ -1121,194 +1116,200 @@
1471 "Windowsystem-Sitzung töten?\n"
1472 "(alle Anwendungen werden geschlossen)"
1473
1474-#: ../src/rootmenu.c:536
1475+#: ../src/rootmenu.c:544
1476 #, c-format
1477 msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
1478 msgstr "%s: ungültiges Tastaturkürzel \"%s\" für Eintrag %s"
1479
1480-#: ../src/rootmenu.c:544
1481+#: ../src/rootmenu.c:552
1482 #, c-format
1483 msgid "%s:invalid key in shortcut \"%s\" for entry %s"
1484 msgstr "%s: ungültige Taste in Kürzel \"%s\" für Eintrag %s"
1485
1486-#: ../src/rootmenu.c:597
1487+#: ../src/rootmenu.c:605
1488 #, c-format
1489 msgid "%s: unmatched '\"' in menu file"
1490 msgstr "%s: fehlendes \" in Menüdatei"
1491
1492-#: ../src/rootmenu.c:647
1493+#: ../src/rootmenu.c:655
1494 #, c-format
1495 msgid "%s: missing command"
1496 msgstr "%s: fehlender Befehl"
1497
1498-#: ../src/rootmenu.c:679
1499+#: ../src/rootmenu.c:687
1500 #, c-format
1501 msgid "invalid OPEN_MENU specification: %s"
1502 msgstr "ungültige OPEN_MENU-Beschreibung: %s"
1503
1504-#: ../src/rootmenu.c:730
1505+#: ../src/rootmenu.c:738
1506 #, c-format
1507 msgid "%s:could not stat menu"
1508 msgstr "%s: Menü konnte nicht erzeugt werden"
1509
1510-#: ../src/rootmenu.c:738
1511+#: ../src/rootmenu.c:746
1512 #, c-format
1513 msgid "%s:could not stat menu:%s"
1514 msgstr "%s: Menü konnte nicht erzeugt werden: %s"
1515
1516-#: ../src/rootmenu.c:756
1517+#: ../src/rootmenu.c:764
1518 #, c-format
1519 msgid "too many parameters in OPEN_MENU: %s"
1520 msgstr "zuviele Parameter in OPEN_MENU: %s"
1521
1522-#: ../src/rootmenu.c:800
1523+#: ../src/rootmenu.c:808
1524 msgid ""
1525 "There are more than one WORKSPACE_MENU commands in the applications menu. "
1526 "Only one is allowed."
1527-msgstr "Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer ist erlaubt."
1528+msgstr ""
1529+"Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer "
1530+"ist erlaubt."
1531
1532-#: ../src/rootmenu.c:834
1533+#: ../src/rootmenu.c:842
1534 msgid ""
1535 "There are more than one WINDOWS_MENU commands in the applications menu. Only "
1536 "one is allowed."
1537-msgstr "Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist erlaubt."
1538+msgstr ""
1539+"Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist "
1540+"erlaubt."
1541
1542-#: ../src/rootmenu.c:839
1543+#: ../src/rootmenu.c:847
1544 msgid "Window List"
1545 msgstr "Fenster-Liste"
1546
1547-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
1548+#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904
1549 #, c-format
1550 msgid "%s:missing parameter for menu command \"%s\""
1551 msgstr "%s: fehlender Parameter für Menübefehl \"%s\""
1552
1553-#: ../src/rootmenu.c:964
1554+#: ../src/rootmenu.c:972
1555 #, c-format
1556 msgid "%s:unknown command \"%s\" in menu config."
1557 msgstr "%s: unbekannter Befehl \"%s\" in Menükonfiguration"
1558
1559-#: ../src/rootmenu.c:972
1560+#: ../src/rootmenu.c:980
1561 #, c-format
1562 msgid "%s:can't add shortcut for entry \"%s\""
1563 msgstr "%s: Tastaturkürzel für Eintrag \"%s\" kann nicht hinzugefügt werden"
1564
1565-#: ../src/rootmenu.c:1109
1566+#: ../src/rootmenu.c:1117
1567 #, c-format
1568 msgid "%s:maximal line size exceeded in menu config: %s"
1569 msgstr "%s: überlange Zeilen in Menükonfiguration: %s"
1570
1571-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
1572+#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336
1573 #, c-format
1574 msgid "%s:missing command in menu config: %s"
1575 msgstr "%s: fehlender Befehl in Menükonfiguration: %s"
1576
1577-#: ../src/rootmenu.c:1161
1578+#: ../src/rootmenu.c:1169
1579 #, c-format
1580 msgid "%s:syntax error in menu file:END declaration missing"
1581 msgstr "%s: Syntaxfehler in Menüdatei: END-Schlüsselwort fehlt."
1582
1583-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
1584+#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300
1585 msgid "could not make arguments for menu file preprocessor"
1586 msgstr "Argumente für Menüdatei-Präprozessort konnten nicht gesetzt werden"
1587
1588-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
1589+#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308
1590 #, c-format
1591 msgid "%s:could not open/preprocess menu file"
1592 msgstr "%s: Menüdatei konnte nicht geöffnet/bearbeitet werden"
1593
1594-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
1595+#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
1596 #, c-format
1597 msgid "%s:could not open menu file"
1598 msgstr "%s: Menüdatei konnte nicht geöffnet werden"
1599
1600-#: ../src/rootmenu.c:1236
1601+#: ../src/rootmenu.c:1244
1602 #, c-format
1603 msgid "%s:invalid menu file. MENU command is missing"
1604 msgstr "%s: ungültige Menüdatei: MENU-Befehl fehlt"
1605
1606-#: ../src/rootmenu.c:1245
1607+#: ../src/rootmenu.c:1253
1608 msgid "error reading preprocessed menu data"
1609 msgstr "Fehler beim Lesen der aufbereiteten Menüdaten"
1610
1611-#: ../src/rootmenu.c:1338
1612+#: ../src/rootmenu.c:1348
1613 #, c-format
1614 msgid "%s:no title given for the root menu"
1615 msgstr "%s: kein Titel für das Stammenü"
1616
1617-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
1618+#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553
1619 #, c-format
1620 msgid "out of memory while constructing directory menu %s"
1621 msgstr "zuwenig Speicher beim Erstellen des Verzeichnismenüs %s"
1622
1623-#: ../src/rootmenu.c:1439
1624+#: ../src/rootmenu.c:1449
1625 #, c-format
1626 msgid "%s:could not stat file \"%s\" in menu directory"
1627 msgstr "%s: Datei \"%s\" in Menü-Verzeichnis konnte nicht erstellt werden"
1628
1629-#: ../src/rootmenu.c:1597
1630+#: ../src/rootmenu.c:1607
1631 msgid "Commands"
1632 msgstr "Befehle"
1633
1634-#: ../src/rootmenu.c:1600
1635+#: ../src/rootmenu.c:1610
1636 msgid "Restart"
1637 msgstr "Neustart"
1638
1639-#: ../src/rootmenu.c:1601
1640+#: ../src/rootmenu.c:1611
1641 msgid "Exit..."
1642 msgstr "Beenden..."
1643
1644-#: ../src/rootmenu.c:1646
1645+#: ../src/rootmenu.c:1656
1646 #, c-format
1647 msgid "could not find menu file \"%s\" referenced in WMRootMenu"
1648-msgstr "Menüdate \"%s\" aus WMRootMenu konnte nicht gefunden werden"
1649+msgstr "Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden"
1650
1651-#: ../src/rootmenu.c:1653
1652+#: ../src/rootmenu.c:1663
1653 #, c-format
1654 msgid "could not access menu \"%s\" referenced in WMRootMenu"
1655-msgstr "auf Menüdate \"%s\" aus WMRootMenu konnte nicht zugegriffen werden"
1656+msgstr "auf Menüdatei \"%s\" aus WMRootMenu konnte nicht zugegriffen werden"
1657
1658-#: ../src/rootmenu.c:1664
1659+#: ../src/rootmenu.c:1674
1660 #, c-format
1661 msgid ""
1662 "using default menu file \"%s\" as the menu referenced in WMRootMenu could "
1663 "not be found "
1664 msgstr "Standard-Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden "
1665
1666-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
1667+#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773
1668 #, c-format
1669 msgid "%s:format error in root menu configuration \"%s\""
1670 msgstr "%s: Formatierungsfehler in Stammenü-Konfiguration \"%s\""
1671
1672-#: ../src/rootmenu.c:1851
1673+#: ../src/rootmenu.c:1855
1674 msgid ""
1675 "The applications menu could not be loaded. Look at the console output for a "
1676 "detailed description of the errors."
1677-msgstr "Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte Fehlerbeschreibungen bitte die Konsolenausgabe ansehen."
1678+msgstr ""
1679+"Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte "
1680+"Fehlerbeschreibungen bitte die Konsolenausgabe ansehen."
1681
1682-#: ../src/screen.c:740
1683+#: ../src/screen.c:709
1684 #, c-format
1685 msgid "could not initialize graphics library context: %s"
1686 msgstr "Kontext der Grafikbibliothek konnte nicht initialisiert werden: %s"
1687
1688-#: ../src/screen.c:771
1689-msgid "could not do initialization of WINGs widget set"
1690-msgstr "WINGs Widgets konnten nicht initialisiert werden"
1691+#: ../src/screen.c:737
1692+msgid "could not initialize WINGs widget set"
1693+msgstr "WINGs-Widgets konnten nicht initialisiert werden"
1694
1695-#: ../src/screen.c:1139
1696+#: ../src/screen.c:1144
1697 #, c-format
1698 msgid "could not save session state in %s"
1699 msgstr "Sitzung konnte nicht in %s gespeichert werden"
1700
1701-#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454
1702+#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459
1703 #, c-format
1704 msgid "can't convert \"%s\" to boolean"
1705-msgstr "\"%s\" konnte nicht in Wahrheitswert konvertiert werden"
1706+msgstr "\"%s\" konnte nicht in Boolean konvertiert werden"
1707
1708-#: ../src/session.c:1021
1709+#: ../src/session.c:1018
1710 msgid "out of memory while saving session state"
1711 msgstr "zuwenig Speicher beim Sichern der Sitzung"
1712
1713-#: ../src/session.c:1104
1714+#: ../src/session.c:1101
1715 msgid "end of memory while saving session state"
1716 msgstr "zuwenig Speicher beim Sichern der Sitzung"
1717
1718@@ -1318,107 +1319,42 @@
1719 #. * If the sm was the last client of session, then we'll die
1720 #. * anyway, otherwise we can continue doing our stuff.
1721 #.
1722-#: ../src/session.c:1242
1723+#: ../src/session.c:1239
1724 msgid "connection to the session manager was lost"
1725 msgstr "Verbindung zum Sitzungsmanager verloren"
1726
1727-#: ../src/stacking.c:79
1728+#: ../src/stacking.c:81
1729 msgid "could not get window list!!"
1730 msgstr "Konnte Fensterliste nicht erstellen!"
1731
1732-#: ../src/startup.c:202
1733+#: ../src/startup.c:195
1734 #, c-format
1735 msgid "internal X error: %s\n"
1736 msgstr "interner X-Fehler %s\n"
1737
1738-#: ../src/startup.c:260
1739-#, c-format
1740-msgid "got signal %i (%s) - restarting\n"
1741-msgstr "Signal %i (%s) erhalten - starte neu...\n"
1742-
1743-#: ../src/startup.c:262
1744-#, c-format
1745-msgid "got signal %i - restarting\n"
1746-msgstr "Signal %i erhalten - starte neu...\n"
1747-
1748-#: ../src/startup.c:272
1749-#, c-format
1750-msgid "got signal %i (%s) - rereading defaults\n"
1751-msgstr "Signal %i (%s) erhalten - Standard werden neu eingelesen\n"
1752-
1753-#: ../src/startup.c:274
1754-#, c-format
1755-msgid "got signal %i - rereading defaults\n"
1756-msgstr "Signal %i erhalten - Standard werden neu eingelesen\n"
1757-
1758-#: ../src/startup.c:284
1759-#, c-format
1760-msgid "got signal %i (%s) - exiting...\n"
1761-msgstr "Signal %i (%s) erhalten - beende...\n"
1762-
1763-#: ../src/startup.c:286
1764-#, c-format
1765-msgid "got signal %i - exiting...\n"
1766-msgstr "Signal %i erhalten - beende...\n"
1767-
1768-#: ../src/startup.c:329
1769-#, c-format
1770-msgid "got signal %i (%s)\n"
1771-msgstr "Signal %i (%s) erhalten\n"
1772-
1773-#: ../src/startup.c:331
1774-#, c-format
1775-msgid "got signal %i\n"
1776-msgstr "Signal %i erhalten\n"
1777-
1778-#: ../src/startup.c:342
1779-msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly."
1780-msgstr "Beim Aufräumen nach einem Fehler trat ein weiterer Fehler auf. Programm wird sofort angebrochen."
1781-
1782-#. we try to restart Window Maker
1783-#: ../src/startup.c:407
1784-msgid "trying to restart Window Maker..."
1785-msgstr "versuche, Window Maker neu zu starten..."
1786-
1787-#: ../src/startup.c:412
1788-msgid "trying to start alternate window manager..."
1789-msgstr "versuche, anderen Windowmanager zu starten..."
1790-
1791-#: ../src/startup.c:417
1792-msgid "failed to start alternate window manager. Aborting."
1793-msgstr "Start eines anderen Windowmanagers schlug fehl. Breche ab."
1794-
1795-#: ../src/startup.c:419
1796-msgid ""
1797-"a fatal error has occured, probably due to a bug. Please fill the included "
1798-"BUGFORM and report it."
1799-msgstr ""
1800-"Ein fataler Fehler ist möglicherweise aufgrund eines Programmfehlers aufgetreten. Bitte füllen Sie die "
1801-"mitgelieferte BUGFORM aus und schicken sie an bugs@windowmaker.org"
1802-
1803-#: ../src/startup.c:894
1804+#: ../src/startup.c:772
1805 #, c-format
1806 msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
1807-msgstr "Symbolgröße ist eingestellt auf %i, aber zu klein. Neue Größe ist 16\n"
1808+msgstr "Symbolgröße ist eingestellt auf %i, dieser Wert ist zu klein. Neue Größe ist 16\n"
1809
1810-#: ../src/startup.c:922
1811+#: ../src/startup.c:801
1812 msgid "XKB is not supported. KbdModeLock is automatically disabled."
1813 msgstr "XKB wird nicht unterstützt. KbdModeLock wird ausgeschaltet"
1814
1815-#: ../src/startup.c:941
1816+#: ../src/startup.c:820
1817 msgid "it seems that there is already a window manager running"
1818-msgstr "Läuft da nicht schon ein anderer Windowmanager;-)?"
1819+msgstr "Es sieht aus, als ob schon ein anderer Windowmanager liefe."
1820
1821-#: ../src/startup.c:947
1822+#: ../src/startup.c:826
1823 #, c-format
1824 msgid "could not manage screen %i"
1825 msgstr "Konnte Bildschirm %i nicht ansprechen"
1826
1827-#: ../src/startup.c:1015
1828+#: ../src/startup.c:885
1829 msgid "could not manage any screen"
1830 msgstr "kein Bildschirm konnte angesprochen werden"
1831
1832-#: ../src/switchmenu.c:137
1833+#: ../src/switchmenu.c:145
1834 msgid "Windows"
1835 msgstr "Fenster"
1836
1837@@ -1448,20 +1384,21 @@
1838
1839 #: ../src/texture.c:598
1840 msgid "could not allocate image buffer"
1841-msgstr "Bildpuffer konnte nicht allokiert werden"
1842+msgstr "Bildpuffer konnte nicht erstellt werden"
1843
1844 #: ../src/wdefaults.c:437
1845 #, c-format
1846 msgid "could not find icon file \"%s\""
1847 msgstr "Symboldatei \"%s\" konnte nicht gefunden werden"
1848
1849-#: ../src/window.c:2936 ../src/window.c:3075
1850+#: ../src/window.c:3052 ../src/window.c:3193
1851 msgid ""
1852 "the NumLock, ScrollLock or similar key seems to be turned on.\n"
1853 "Turn it off or some mouse actions and keyboard shortcuts will not work."
1854 msgstr ""
1855 "Es scheint, dass NumLock, ScrollLock oder ähnliche Tasten aktiviert sind.\n"
1856-"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel nicht funktionieren."
1857+"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel "
1858+"nicht funktionieren."
1859
1860 #: ../src/winmenu.c:125
1861 msgid ""
1862@@ -1473,30 +1410,39 @@
1863 "dabei gehen alle ungespeicherten Daten verloren.\n"
1864 "Bitte bestätigen."
1865
1866-#: ../src/winmenu.c:267 ../src/winmenu.c:276
1867+#: ../src/winmenu.c:268 ../src/winmenu.c:277
1868 msgid "Set Shortcut"
1869 msgstr "Setze Kürzel"
1870
1871-#: ../src/winmenu.c:354 ../src/winmenu.c:399
1872+#: ../src/winmenu.c:355 ../src/winmenu.c:400
1873 msgid "could not create submenu for window menu"
1874 msgstr "Untermenü für Fenstermenü konnte nicht erstellt werden"
1875
1876-#: ../src/winmenu.c:403
1877+#: ../src/winmenu.c:404
1878 msgid "Keep on top"
1879 msgstr "Immer oben"
1880
1881-#: ../src/winmenu.c:408
1882+#: ../src/winmenu.c:409
1883 msgid "Keep at bottom"
1884 msgstr "Immer unten"
1885
1886+#.
1887+#. * Warning: If you make some change that affects the order of the
1888+#. * entries, you must update the command #defines in the top of
1889+#. * this file.
1890+#.
1891+#: ../src/winmenu.c:437 ../src/winmenu.c:571
1892+msgid "Maximize"
1893+msgstr "Maximieren"
1894+
1895+#: ../src/winmenu.c:445 ../src/winmenu.c:557
1896+msgid "Miniaturize"
1897+msgstr "Minimieren"
1898+
1899 #: ../src/winmenu.c:453 ../src/winmenu.c:588
1900 msgid "Shade"
1901 msgstr "Aufrollen"
1902
1903-#: ../src/winmenu.c:473
1904-msgid "Hide Others"
1905-msgstr "Andere Verstecken"
1906-
1907 #: ../src/winmenu.c:469
1908 msgid "Resize/Move"
1909 msgstr "Größe/ Position ändern"
1910@@ -1505,6 +1451,10 @@
1911 msgid "Select"
1912 msgstr "Auswählen"
1913
1914+#: ../src/winmenu.c:485
1915+msgid "Move To"
1916+msgstr "Bewegen nach..."
1917+
1918 #: ../src/winmenu.c:490
1919 msgid "Attributes..."
1920 msgstr "Eigenschaften"
1921@@ -1513,30 +1463,38 @@
1922 msgid "Options"
1923 msgstr "Optionen"
1924
1925+#: ../src/winmenu.c:552
1926+msgid "Deminiaturize"
1927+msgstr "Wiederherstellen"
1928+
1929+#: ../src/winmenu.c:566
1930+msgid "Unmaximize"
1931+msgstr "Ursprüngliche Größe"
1932+
1933 #: ../src/winmenu.c:583
1934 msgid "Unshade"
1935 msgstr "Abrollen"
1936
1937-#: ../src/winspector.c:387
1938+#: ../src/winspector.c:392
1939 #, c-format
1940 msgid "Could not find icon \"%s\" specified for this window"
1941 msgstr "Symbol \"%s\" für dieses Fenster konnte nicht gefunden werden"
1942
1943-#: ../src/winspector.c:404
1944+#: ../src/winspector.c:409
1945 #, c-format
1946 msgid "Could not open specified icon \"%s\":%s"
1947 msgstr "Symbol \"%s\" konnte nicht geöffnet werden: %s"
1948
1949-#: ../src/winspector.c:1121
1950+#: ../src/winspector.c:1129
1951 #, c-format
1952 msgid "Inspecting %s.%s"
1953 msgstr "Untersuchen von %s.%s"
1954
1955-#: ../src/winspector.c:1147
1956+#: ../src/winspector.c:1155
1957 msgid "Click in the window you wish to inspect."
1958 msgstr "Klicken Sie auf das Fenster, das untersucht werden soll."
1959
1960-#: ../src/winspector.c:1186
1961+#: ../src/winspector.c:1194
1962 msgid ""
1963 "The configuration will apply to all\n"
1964 "windows that have their WM_CLASS\n"
1965@@ -1546,57 +1504,57 @@
1966 "Beim Speichern wirkt sich diese\n"
1967 "Konfiguration auf alle Fenster aus,\n"
1968 "deren WM_CLASS-Eigenschaft den\n"
1969-"obigen Namen hat."
1970+"obigen Wert hat."
1971
1972-#: ../src/winspector.c:1215
1973+#: ../src/winspector.c:1223
1974 msgid "Save"
1975 msgstr "Speichern"
1976
1977-#: ../src/winspector.c:1223
1978+#: ../src/winspector.c:1231
1979 msgid "Apply"
1980 msgstr "Anwenden"
1981
1982-#: ../src/winspector.c:1229
1983+#: ../src/winspector.c:1237
1984 msgid "Reload"
1985 msgstr "Neu laden"
1986
1987-#: ../src/winspector.c:1238 ../src/winspector.c:1248
1988+#: ../src/winspector.c:1246 ../src/winspector.c:1256
1989 msgid "Window Specification"
1990 msgstr "Fensterbeschreibung"
1991
1992-#: ../src/winspector.c:1239
1993+#: ../src/winspector.c:1247
1994 msgid "Window Attributes"
1995 msgstr "Fenstereigenschaften"
1996
1997-#: ../src/winspector.c:1240
1998+#: ../src/winspector.c:1248
1999 msgid "Advanced Options"
2000 msgstr "Erweiterte Optionen"
2001
2002-#: ../src/winspector.c:1241
2003+#: ../src/winspector.c:1249
2004 msgid "Icon and Initial Workspace"
2005 msgstr "Symbol und Start-Arbeitsfläche"
2006
2007-#: ../src/winspector.c:1242
2008+#: ../src/winspector.c:1250
2009 msgid "Application Specific"
2010 msgstr "Anwendungsspezifisches"
2011
2012-#: ../src/winspector.c:1256
2013+#: ../src/winspector.c:1264
2014 msgid "Defaults for all windows"
2015 msgstr "Standards für alle Fenster"
2016
2017-#: ../src/winspector.c:1310
2018+#: ../src/winspector.c:1318
2019 msgid "Select window"
2020 msgstr "Fenster auswählen"
2021
2022-#: ../src/winspector.c:1324
2023+#: ../src/winspector.c:1332
2024 msgid "Attributes"
2025 msgstr "Eigenschaften"
2026
2027-#: ../src/winspector.c:1335
2028+#: ../src/winspector.c:1343
2029 msgid "Disable titlebar"
2030 msgstr "Keine Titelleiste"
2031
2032-#: ../src/winspector.c:1337
2033+#: ../src/winspector.c:1345
2034 msgid ""
2035 "Remove the titlebar of this window.\n"
2036 "To access the window commands menu of a window\n"
2037@@ -1608,43 +1566,43 @@
2038 "Für das Fenstermenü drücken Sie bitte Strg+Esc\n"
2039 "bzw. die von Ihnen eingestellte Tastenkombination."
2040
2041-#: ../src/winspector.c:1344
2042+#: ../src/winspector.c:1352
2043 msgid "Disable resizebar"
2044-msgstr "Keine Leiste zum Ändern der Größe"
2045+msgstr "Keine Leiste für Größenänderung"
2046
2047-#: ../src/winspector.c:1346
2048+#: ../src/winspector.c:1354
2049 msgid "Remove the resizebar of this window."
2050 msgstr "Entfernen der Leiste zum Ändern der Größe bei diesem Fenster."
2051
2052-#: ../src/winspector.c:1349
2053+#: ../src/winspector.c:1357
2054 msgid "Disable close button"
2055 msgstr "Keine Schließen-Schaltfläche"
2056
2057-#: ../src/winspector.c:1351
2058+#: ../src/winspector.c:1359
2059 msgid "Remove the `close window' button of this window."
2060 msgstr "Entfernen der 'Fenster schließen'-Schaltfläche für dieses Fensters"
2061
2062-#: ../src/winspector.c:1354
2063+#: ../src/winspector.c:1362
2064 msgid "Disable miniaturize button"
2065 msgstr "Keine Minimieren-Schaltfläche"
2066
2067-#: ../src/winspector.c:1356
2068+#: ../src/winspector.c:1364
2069 msgid "Remove the `miniaturize window' button of the window."
2070 msgstr "Entfernen der 'Fenster minimieren'-Schaltfläche für dieses Fenster"
2071
2072-#: ../src/winspector.c:1359
2073+#: ../src/winspector.c:1367
2074 msgid "Disable border"
2075 msgstr "Kein Rand"
2076
2077-#: ../src/winspector.c:1361
2078+#: ../src/winspector.c:1369
2079 msgid "Remove the 1 pixel black border around the window."
2080-msgstr "Entfernen des ein Pixel breiten schwarzen Randes um das Fenster."
2081+msgstr "Entfernen des einen Pixel breiten schwarzen Randes um das Fenster."
2082
2083-#: ../src/winspector.c:1364
2084+#: ../src/winspector.c:1372
2085 msgid "Keep on top (floating)"
2086 msgstr "Immer oben"
2087
2088-#: ../src/winspector.c:1366
2089+#: ../src/winspector.c:1374
2090 msgid ""
2091 "Keep the window over other windows, not allowing\n"
2092 "them to cover it."
2093@@ -1652,43 +1610,43 @@
2094 "Dieses Fenster immer oben halten, sodass es nicht\n"
2095 "von anderen Fenstern verdeckt wird"
2096
2097-#: ../src/winspector.c:1370
2098+#: ../src/winspector.c:1378
2099 msgid "Keep at bottom (sunken)"
2100 msgstr "Immer unten"
2101
2102-#: ../src/winspector.c:1372
2103+#: ../src/winspector.c:1380
2104 msgid "Keep the window under all other windows."
2105 msgstr "Dieses Fenster unter allen anderen Fenster platzieren"
2106
2107-#: ../src/winspector.c:1377
2108+#: ../src/winspector.c:1385
2109 msgid "Make window present in all workspaces."
2110 msgstr "Dieses Fenster auf allen Arbeitsflächen sichtbar machen"
2111
2112-#: ../src/winspector.c:1380
2113+#: ../src/winspector.c:1388
2114 msgid "Start miniaturized"
2115 msgstr "Minimiert starten"
2116
2117-#: ../src/winspector.c:1382
2118+#: ../src/winspector.c:1390
2119 msgid ""
2120 "Make the window be automatically miniaturized when it's\n"
2121 "first shown."
2122 msgstr "Dieses Fenster beim Start automatisch minimieren"
2123
2124-#: ../src/winspector.c:1386
2125+#: ../src/winspector.c:1394
2126 msgid "Start maximized"
2127 msgstr "Maximiert starten"
2128
2129-#: ../src/winspector.c:1388
2130+#: ../src/winspector.c:1396
2131 msgid ""
2132 "Make the window be automatically maximized when it's\n"
2133 "first shown."
2134-msgstr "Dieses Fenster wird beim Start automatisch maximiert"
2135+msgstr "Dieses Fenster beim Start automatisch maximieren"
2136
2137-#: ../src/winspector.c:1392
2138+#: ../src/winspector.c:1400
2139 msgid "Full screen maximization"
2140 msgstr "Vollbild-Maximierung"
2141
2142-#: ../src/winspector.c:1394
2143+#: ../src/winspector.c:1402
2144 msgid ""
2145 "Make the window use the whole screen space when it's\n"
2146 "maximized. The titlebar and resizebar will be moved\n"
2147@@ -1698,15 +1656,15 @@
2148 "ausdehnen, Titel- und Größenleiste befinden sich dann außerhalb\n"
2149 "des Bildschirms."
2150
2151-#: ../src/winspector.c:1411
2152+#: ../src/winspector.c:1419
2153 msgid "Advanced"
2154 msgstr "Erweitert"
2155
2156-#: ../src/winspector.c:1428
2157+#: ../src/winspector.c:1436
2158 msgid "Do not bind keyboard shortcuts"
2159 msgstr "Keine Tastatur-Kürzel abfangen"
2160
2161-#: ../src/winspector.c:1430
2162+#: ../src/winspector.c:1438
2163 msgid ""
2164 "Do not bind keyboard shortcuts from Window Maker\n"
2165 "when this window is focused. This will allow the\n"
2166@@ -1714,14 +1672,14 @@
2167 "of your shortcut configuration."
2168 msgstr ""
2169 "Keine globalen Window Maker-Tastaturkürzel abfangen,\n"
2170-"wenn dieses Fenster maximiert ist. Dadurch erhalt dieses\n"
2171+"wenn dieses Fenster maximiert ist. Dadurch erhält dieses\n"
2172 "Fenster alle Tastendrücke."
2173
2174-#: ../src/winspector.c:1436
2175+#: ../src/winspector.c:1444
2176 msgid "Do not bind mouse clicks"
2177 msgstr "Kein Mausklicks abfangen"
2178
2179-#: ../src/winspector.c:1438
2180+#: ../src/winspector.c:1446
2181 msgid ""
2182 "Do not bind mouse actions, such as `Alt'+drag\n"
2183 "in the window (when alt is the modifier you haveconfigured)."
2184@@ -1729,29 +1687,29 @@
2185 "Für dieses Fenster keine Mausaktionen abfangen,\n"
2186 "zum Beispiel Alt+Ziehen."
2187
2188-#: ../src/winspector.c:1443
2189+#: ../src/winspector.c:1451
2190 msgid "Do not show in the window list"
2191 msgstr "Nicht in der Fensterliste zeigen"
2192
2193-#: ../src/winspector.c:1445
2194+#: ../src/winspector.c:1453
2195 msgid "Do not list the window in the window list menu."
2196 msgstr "Dieses Fenster nicht in der Fensterliste aufführen."
2197
2198-#: ../src/winspector.c:1448
2199+#: ../src/winspector.c:1456
2200 msgid "Do not let it take focus"
2201 msgstr "Keinen Fokus erlauben"
2202
2203-#: ../src/winspector.c:1450
2204+#: ../src/winspector.c:1458
2205 msgid ""
2206 "Do not let the window take keyboard focus when you\n"
2207 "click on it."
2208 msgstr "Diesem Fenster beim Klick nicht den Tastaturfokus geben."
2209
2210-#: ../src/winspector.c:1454
2211+#: ../src/winspector.c:1462
2212 msgid "Keep inside screen"
2213 msgstr "Immer innerhalb des Bildschirmes"
2214
2215-#: ../src/winspector.c:1456
2216+#: ../src/winspector.c:1464
2217 msgid ""
2218 "Do not allow the window to move itself completely\n"
2219 "outside the screen. For bug compatibility.\n"
2220@@ -1759,21 +1717,21 @@
2221 "Diesem Fenster nicht erlauben, ganz aus dem Bildschirm\n"
2222 "bewegt zu werden.\n"
2223
2224-#: ../src/winspector.c:1460
2225+#: ../src/winspector.c:1468
2226 msgid "Ignore 'Hide Others'"
2227-msgstr "Ignoriere 'Andere Verstecken'"
2228+msgstr "Ignoriere 'Andere verstecken'"
2229
2230-#: ../src/winspector.c:1462
2231+#: ../src/winspector.c:1470
2232 msgid ""
2233 "Do not hide the window when issuing the\n"
2234 "`HideOthers' command."
2235-msgstr "Beim AndereVerstecken-Befehl dieses Fenster auslassen."
2236+msgstr "Beim 'Andere verstecken'-Befehl dieses Fenster auslassen."
2237
2238-#: ../src/winspector.c:1466
2239+#: ../src/winspector.c:1474
2240 msgid "Ignore 'Save Session'"
2241 msgstr "'Sitzung speichern' ignorieren"
2242
2243-#: ../src/winspector.c:1468
2244+#: ../src/winspector.c:1476
2245 msgid ""
2246 "Do not save the associated application in the\n"
2247 "session's state, so that it won't be restarted\n"
2248@@ -1784,11 +1742,11 @@
2249 "im Sitzungszustand speichern, sodass sie beim\n"
2250 "Start von Window Maker nicht gestartet wird."
2251
2252-#: ../src/winspector.c:1474
2253+#: ../src/winspector.c:1482
2254 msgid "Emulate application icon"
2255 msgstr "Anwendungssymbol ignorieren"
2256
2257-#: ../src/winspector.c:1476
2258+#: ../src/winspector.c:1484
2259 msgid ""
2260 "Make this window act as an application that provides\n"
2261 "enough information to Window Maker for a dockable\n"
2262@@ -1798,55 +1756,55 @@
2263 "es genügend Informationen für eine dockbare\n"
2264 "Anwendung an Window Maker liefern würde."
2265
2266-#: ../src/winspector.c:1482
2267+#: ../src/winspector.c:1490
2268 msgid "Disable language button"
2269 msgstr "Keine Sprachen-Schaltfläche"
2270
2271-#: ../src/winspector.c:1484
2272+#: ../src/winspector.c:1492
2273 msgid "Remove the `toggle language' button of the window."
2274 msgstr "Entfern der 'Wechsle Sprache'-Schaltfläche bei diesem Fenster"
2275
2276-#: ../src/winspector.c:1501
2277+#: ../src/winspector.c:1509
2278 msgid "Miniwindow Image"
2279 msgstr "Minifenster-Bild"
2280
2281-#: ../src/winspector.c:1528
2282+#: ../src/winspector.c:1536
2283 msgid "Icon filename:"
2284 msgstr "Symboldateiname"
2285
2286-#: ../src/winspector.c:1541
2287+#: ../src/winspector.c:1549
2288 msgid "Ignore client supplied icon"
2289 msgstr "Ignoriere zur Verfügung gestelltes Symbol"
2290
2291-#: ../src/winspector.c:1548
2292+#: ../src/winspector.c:1556
2293 msgid "Initial Workspace"
2294 msgstr "Start-Arbeitsfläche"
2295
2296-#: ../src/winspector.c:1550
2297+#: ../src/winspector.c:1558
2298 msgid "The workspace to place the window when it'sfirst shown."
2299 msgstr "Die Arbeitsfläche, auf dem das Fenster beim Start erscheinen soll"
2300
2301-#: ../src/winspector.c:1556
2302+#: ../src/winspector.c:1564
2303 msgid "Nowhere in particular"
2304-msgstr "Ist mir eigentlich egal"
2305+msgstr "Keine Angabe"
2306
2307-#: ../src/winspector.c:1574
2308+#: ../src/winspector.c:1582
2309 msgid "Application Attributes"
2310 msgstr "Anwendungseigenschaften"
2311
2312-#: ../src/winspector.c:1585
2313+#: ../src/winspector.c:1593
2314 msgid "Start hidden"
2315 msgstr "Versteckt starten"
2316
2317-#: ../src/winspector.c:1587
2318+#: ../src/winspector.c:1595
2319 msgid "Automatically hide application when it's started."
2320 msgstr "Anwendung beim Start automatisch verstecken"
2321
2322-#: ../src/winspector.c:1590
2323+#: ../src/winspector.c:1598
2324 msgid "No application icon"
2325 msgstr "Kein Anwendungssymbol"
2326
2327-#: ../src/winspector.c:1592
2328+#: ../src/winspector.c:1600
2329 msgid ""
2330 "Disable the application icon for the application.\n"
2331 "Note that you won't be able to dock it anymore,\n"
2332@@ -1858,36 +1816,36 @@
2333 "docken lässt und bereits gedockte Symbole nicht mehr korrekt\n"
2334 "arbeiten."
2335
2336-#: ../src/winspector.c:1598
2337+#: ../src/winspector.c:1606
2338 msgid "Shared application icon"
2339 msgstr "Geteiltes Anwendungssymbol"
2340
2341-#: ../src/winspector.c:1600
2342+#: ../src/winspector.c:1608
2343 msgid ""
2344 "Use a single shared application icon for all of\n"
2345 "the instances of this application.\n"
2346 msgstr ""
2347 "Für alle Instanzen dieser Anwendung ein\n"
2348-"einziges Symbol verwenden.\n"
2349+"einziges Anwendungssymbol verwenden.\n"
2350
2351-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
2352+#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302
2353 #, c-format
2354 msgid "Workspace %i"
2355 msgstr "Arbeitsfläche: %i"
2356
2357-#: ../src/workspace.c:926
2358+#: ../src/workspace.c:1352
2359 msgid "Workspaces"
2360 msgstr "Arbeitsflächen"
2361
2362-#: ../src/workspace.c:928
2363+#: ../src/workspace.c:1354
2364 msgid "could not create Workspace menu"
2365 msgstr "Arbeitsflächenmenü konnte nicht erstellt werden"
2366
2367-#: ../src/workspace.c:935
2368+#: ../src/workspace.c:1361
2369 msgid "New"
2370 msgstr "Neu"
2371
2372-#: ../src/workspace.c:936
2373+#: ../src/workspace.c:1362
2374 msgid "Destroy Last"
2375-msgstr "Letztes zerstören"
2376+msgstr "Letzten zerstören"
2377
2378diff -Nur WindowMaker-0.92.0.orig/po/et.po WindowMaker-0.92.0/po/et.po
2379--- WindowMaker-0.92.0.orig/po/et.po 2004-10-26 05:52:38.000000000 +0200
2380+++ WindowMaker-0.92.0/po/et.po 2006-01-22 20:07:15.000000000 +0100
2381@@ -1,10 +1,14 @@
2382-# Estonian translation of Window Maker
2383-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
2384-# Ivar Smolin <okul@linux.ee>, 2000, 2001
2385+# Window Maker'i eesti keele tõlge.
2386+# Estonian translation of Window Maker.
2387+#
2388+# Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
2389+# Ivar Smolin <okul@linux.ee>, 2000, 2001, 2005
2390+#
2391 msgid ""
2392 msgstr ""
2393-"Project-Id-Version: Window Maker 0.70.0\n"
2394-"POT-Creation-Date: 2001-12-17 23:29+0200\n"
2395+"Project-Id-Version: Window Maker 0.92.0\n"
2396+"Report-Msgid-Bugs-To: \n"
2397+"POT-Creation-Date: 2005-08-11 23:45+0300\n"
2398 "PO-Revision-Date: 2001-12-17 23:30+0200\n"
2399 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
2400 "Language-Team: Estonian <et@li.org>\n"
2401@@ -12,25 +16,25 @@
2402 "Content-Type: text/plain; charset=UTF-8\n"
2403 "Content-Transfer-Encoding: 8bit\n"
2404
2405-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
2406-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
2407-#: ../src/winspector.c:389 ../src/winspector.c:406
2408+#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335
2409+#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854
2410+#: ../src/winspector.c:394 ../src/winspector.c:411
2411 msgid "Error"
2412 msgstr "Viga"
2413
2414-#: ../src/appicon.c:427
2415+#: ../src/appicon.c:416
2416 msgid "Could not open specified icon file"
2417-msgstr "Ei õnnestu avada kirjeldatud ikoonifaili"
2418+msgstr "Kirjeldatud ikoonifaili pole võimalik avada"
2419
2420-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
2421-#: ../src/dialog.c:729 ../src/dialog.c:1792 ../src/dock.c:526
2422-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
2423-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
2424-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
2425+#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295
2426+#: ../src/dialog.c:725 ../src/dialog.c:1797 ../src/dock.c:515
2427+#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336
2428+#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271
2429+#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412
2430 msgid "OK"
2431-msgstr "OK"
2432+msgstr "Olgu"
2433
2434-#: ../src/appicon.c:456 ../src/dock.c:264
2435+#: ../src/appicon.c:445 ../src/dock.c:244
2436 msgid ""
2437 " will be forcibly closed.\n"
2438 "Any unsaved changes will be lost.\n"
2439@@ -38,344 +42,377 @@
2440 msgstr ""
2441 " suletakse jõuga.\n"
2442 "Kõik salvestamata andmed lähevad kaotsi.\n"
2443-"Kas soovite seda teha?"
2444+"Kas soovid seda teha?"
2445
2446-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
2447+#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124
2448 msgid "Kill Application"
2449 msgstr "Programmi kõrvaldamine"
2450
2451-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
2452+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
2453 msgid "Yes"
2454 msgstr "Jah"
2455
2456-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
2457+#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
2458 msgid "No"
2459 msgstr "Ei"
2460
2461-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
2462+#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501
2463 msgid "Unhide Here"
2464 msgstr "Too siia töölauale"
2465
2466-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
2467-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
2468+#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170
2469+#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461
2470 msgid "Hide"
2471 msgstr "Peida"
2472
2473-#: ../src/appicon.c:497
2474+#: ../src/appicon.c:486
2475 msgid "Set Icon..."
2476-msgstr "Vali ikoon..."
2477+msgstr "Ikooni määramine..."
2478
2479-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
2480+#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
2481 #: ../src/rootmenu.c:264 ../src/winmenu.c:508
2482 msgid "Kill"
2483 msgstr "Kõrvalda"
2484
2485-#: ../src/appicon.c:519 ../src/dock.c:3501
2486+#: ../src/appicon.c:508 ../src/dock.c:3511
2487 msgid "Unhide"
2488 msgstr "Too nähtavale"
2489
2490-#: ../src/application.c:397
2491+#: ../src/application.c:405
2492 #, c-format
2493 msgid "recreating missing icon '%s'"
2494-msgstr "loon uuesti puuduva ikooni '%s'"
2495+msgstr "puuduva ikooni '%s' uuestiloomine"
2496
2497-#: ../src/defaults.c:923 ../src/startup.c:885 ../src/startup.c:903
2498-#: ../src/startup.c:909
2499+#: ../src/defaults.c:930 ../src/defaults.c:1148
2500+#, c-format
2501+msgid "Domain %s (%s) of global defaults database is corrupted!"
2502+msgstr "Üldiste vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!"
2503+
2504+#: ../src/defaults.c:935
2505+#, c-format
2506+msgid "could not load domain %s from global defaults database"
2507+msgstr ""
2508+"domeeni %s pole võimalik globaalsete vaikeväärtuste andmebaasist laadida"
2509+
2510+#: ../src/defaults.c:1034 ../src/defaults.c:1049
2511+#, c-format
2512+msgid "invalid global menu file %s"
2513+msgstr "vigane globaalmenüü fail %s"
2514+
2515+#: ../src/defaults.c:1077 ../src/startup.c:761 ../src/startup.c:779
2516+#: ../src/startup.c:786
2517 #, c-format
2518 msgid "could not read domain \"%s\" from defaults database"
2519-msgstr "ei õnnestu lugeda domeeni \"%s\" vaikeväärtuste andmebaasist"
2520+msgstr "domeeni \"%s\" pole võimalik vaikeväärtuste andmebaasist lugeda"
2521
2522-#: ../src/defaults.c:969 ../src/defaults.c:1086 ../src/defaults.c:1124
2523-#: ../src/defaults.c:1170
2524+#: ../src/defaults.c:1123 ../src/defaults.c:1237 ../src/defaults.c:1278
2525+#: ../src/defaults.c:1334
2526 #, c-format
2527 msgid "Domain %s (%s) of defaults database is corrupted!"
2528-msgstr "Domeen %s (%s) vaikeväärtuste andmebaasis on katki!"
2529+msgstr "Vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!"
2530
2531-#: ../src/defaults.c:974 ../src/defaults.c:1106 ../src/defaults.c:1153
2532-#: ../src/defaults.c:1179 ../src/menureader.c:397
2533+#: ../src/defaults.c:1137 ../src/defaults.c:1257 ../src/defaults.c:1314
2534+#: ../src/defaults.c:1344
2535 #, c-format
2536 msgid "could not load domain %s from user defaults database"
2537-msgstr "ei õnnestu lugeda domeeni %s kasutaja vaikeväärtuste andmebaasist"
2538+msgstr "domeeni %s pole võimalik kasutaja vaikeväärtuste andmebaasist lugeda"
2539
2540-#: ../src/defaults.c:985 ../src/defaults.c:1071
2541-#, c-format
2542-msgid "Domain %s (%s) of global defaults database is corrupted!"
2543-msgstr "Üldise vaikeväärtuste andmebaasi domeen %s (%s) on katki!"
2544-
2545-#: ../src/defaults.c:1004
2546+#: ../src/defaults.c:1167
2547 #, c-format
2548 msgid "could not load domain %s from global defaults database (%s)"
2549 msgstr ""
2550-"ei õnnestu laadida domeeni %s üldisest vaikeväärtuste andmebaasist (%s)"
2551-
2552-#: ../src/defaults.c:1076
2553-#, c-format
2554-msgid "could not load domain %s from global defaults database"
2555-msgstr "ei õnnestu laadida domeeni %s globaalsete vaikeväärtuste andmebaasist"
2556+"domeeni %s pole võimalik üldisest vaikeväärtuste andmebaasist (%s) laadida"
2557
2558-#: ../src/defaults.c:1143 ../src/screen.c:458
2559+#: ../src/defaults.c:1304 ../src/screen.c:419
2560 #, c-format
2561 msgid "could not load logo image for panels: %s"
2562-msgstr "ei õnnestu laadida paneelide logopilti: %s"
2563+msgstr "paneelidele pole logopilti võimalik laadida: %s"
2564
2565 #. --------------------------- Local -----------------------
2566-#: ../src/defaults.c:1388 ../src/defaults.c:1530 ../src/defaults.c:1642
2567-#: ../src/defaults.c:2121 ../src/defaults.c:2138 ../src/defaults.c:2183
2568-#: ../src/defaults.c:2230 ../src/defaults.c:2703 ../src/wdefaults.c:570
2569-#: ../src/wdefaults.c:606
2570+#: ../src/defaults.c:1553 ../src/defaults.c:1692 ../src/defaults.c:1812
2571+#: ../src/defaults.c:2290 ../src/defaults.c:2307 ../src/defaults.c:2352
2572+#: ../src/defaults.c:2399 ../src/defaults.c:2872 ../src/wdefaults.c:571
2573+#: ../src/wdefaults.c:604
2574 #, c-format
2575 msgid "Wrong option format for key \"%s\". Should be %s."
2576-msgstr "Vigane formaat võtmele \"%s\". Peaks olema %s."
2577+msgstr "Vigane vorming võtmele \"%s\". Peaks olema %s."
2578
2579-#: ../src/defaults.c:1390 ../src/defaults.c:1471 ../src/defaults.c:1503
2580-#: ../src/defaults.c:1535 ../src/defaults.c:1548 ../src/defaults.c:1563
2581-#: ../src/defaults.c:1577 ../src/defaults.c:1647 ../src/defaults.c:1659
2582-#: ../src/defaults.c:2126 ../src/defaults.c:2143 ../src/defaults.c:2156
2583-#: ../src/defaults.c:2188 ../src/defaults.c:2204 ../src/defaults.c:2235
2584-#: ../src/defaults.c:2322 ../src/defaults.c:2708 ../src/defaults.c:2719
2585+#: ../src/defaults.c:1555 ../src/defaults.c:1636 ../src/defaults.c:1666
2586+#: ../src/defaults.c:1697 ../src/defaults.c:1710 ../src/defaults.c:1725
2587+#: ../src/defaults.c:1739 ../src/defaults.c:1817 ../src/defaults.c:1829
2588+#: ../src/defaults.c:2295 ../src/defaults.c:2312 ../src/defaults.c:2325
2589+#: ../src/defaults.c:2357 ../src/defaults.c:2373 ../src/defaults.c:2404
2590+#: ../src/defaults.c:2491 ../src/defaults.c:2877 ../src/defaults.c:2888
2591 #, c-format
2592 msgid "using default \"%s\" instead"
2593-msgstr "selle asemel kasutan vaikimisi \"%s\""
2594+msgstr "selle asemel kasutatakse vaikimisi \"%s\""
2595
2596-#: ../src/defaults.c:1421
2597+#: ../src/defaults.c:1586
2598 #, c-format
2599 msgid "wrong option value for key \"%s\". Should be one of %s"
2600-msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks %s väärtustest"
2601+msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks väärtustest %s"
2602
2603-#: ../src/defaults.c:1466
2604+#: ../src/defaults.c:1631
2605 #, c-format
2606 msgid "can't convert \"%s\" to boolean for key \"%s\""
2607-msgstr "ei õnnestu teisendada \"%s\" võtme \"%s\" loogikaväärtuseks"
2608+msgstr ""
2609+"väärtust \"%s\" pole võimalik võtme \"%s\" loogikaväärtuseks teisendada"
2610
2611-#: ../src/defaults.c:1500
2612+#: ../src/defaults.c:1663
2613 #, c-format
2614 msgid "can't convert \"%s\" to integer for key \"%s\""
2615-msgstr "ei õnnestu teisendada \"%s\" täisarvuks võtmele \"%s\""
2616+msgstr ""
2617+"väärtust \"%s\" pole võimalik võtme \"%s\" täisarvuliseks väärtuseks "
2618+"teisendada"
2619
2620-#: ../src/defaults.c:1543
2621+#: ../src/defaults.c:1705
2622 #, c-format
2623 msgid "Incorrect number of elements in array for key \"%s\"."
2624-msgstr "Ebatäpne massiivi elementide arv võtmele \"%s\"."
2625+msgstr "Vigane massiivi elementide arv võtmele \"%s\"."
2626
2627-#: ../src/defaults.c:1558
2628+#: ../src/defaults.c:1720
2629 #, c-format
2630 msgid "Wrong value for key \"%s\". Should be Coordinate."
2631-msgstr "Vale võtme \"%s\" väärtus. Peaksid olemad koordinaadid."
2632+msgstr "Vale väärtus võtmele \"%s\". Peaks olema koordinaat."
2633
2634-#: ../src/defaults.c:1573
2635+#: ../src/defaults.c:1735
2636 #, c-format
2637 msgid "can't convert array to integers for \"%s\"."
2638-msgstr "ei õnnestu teisendada massiivi täisarvudeks \"%s\" jaoks."
2639+msgstr "väärtust pole võimalik \"%s\" täisarvude massiiviks teisendada."
2640
2641-#: ../src/defaults.c:1771 ../src/defaults.c:1803 ../src/defaults.c:1819
2642-#: ../src/defaults.c:1848 ../src/defaults.c:1871 ../src/defaults.c:1924
2643-#: ../src/defaults.c:1964 ../src/defaults.c:2002 ../src/defaults.c:2018
2644+#: ../src/defaults.c:1940 ../src/defaults.c:1972 ../src/defaults.c:1988
2645+#: ../src/defaults.c:2017 ../src/defaults.c:2040 ../src/defaults.c:2093
2646+#: ../src/defaults.c:2133 ../src/defaults.c:2171 ../src/defaults.c:2187
2647 #, c-format
2648 msgid "\"%s\" is not a valid color name"
2649-msgstr "\"%s\" ei ole korrektne värvi nimetus"
2650+msgstr "\"%s\" pole korrektne värvi nimetus"
2651
2652-#: ../src/defaults.c:1784 ../src/defaults.c:1836
2653+#: ../src/defaults.c:1953 ../src/defaults.c:2005
2654 msgid "bad number of arguments in gradient specification"
2655 msgstr "vigane argumentide arv hajusülemineku kirjelduses"
2656
2657-#: ../src/defaults.c:1897
2658+#: ../src/defaults.c:2066
2659 msgid "too few arguments in multicolor gradient specification"
2660 msgstr "liiga vähe argumente mitmevärvilise hajusülemineku kirjelduses"
2661
2662-#: ../src/defaults.c:1991
2663+#: ../src/defaults.c:2160
2664 msgid "bad number of arguments in textured gradient specification"
2665 msgstr "vigane argumentide arv tekstuuriga hajusülemineku kirjelduses"
2666
2667-#: ../src/defaults.c:2034
2668+#: ../src/defaults.c:2203
2669 #, c-format
2670 msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
2671 msgstr ""
2672 "vigane tumeduse väärtus tgradient tekstuurile \"%s\". Peaks olema [0..255]"
2673
2674-#: ../src/defaults.c:2094
2675+#: ../src/defaults.c:2263
2676 #, c-format
2677 msgid "could not initialize library %s"
2678-msgstr "ei õnnestu lähtestada teeki %s"
2679+msgstr "teeki %s pole võimalik lähtestada"
2680
2681-#: ../src/defaults.c:2097
2682+#: ../src/defaults.c:2266
2683 #, c-format
2684 msgid "could not find function %s::%s"
2685-msgstr "ei õnnestu leida funktsiooni %s::%s"
2686+msgstr "funktsiooni %s::%s pole võimalik leida"
2687
2688-#: ../src/defaults.c:2104
2689+#: ../src/defaults.c:2273
2690 #, c-format
2691 msgid "invalid texture type %s"
2692 msgstr "vigane tekstuuri tüüp %s"
2693
2694-#: ../src/defaults.c:2151
2695+#: ../src/defaults.c:2320
2696 #, c-format
2697 msgid "Error in texture specification for key \"%s\""
2698 msgstr "Viga võtme \"%s\" tekstuuri kirjelduses"
2699
2700-#: ../src/defaults.c:2200
2701+#: ../src/defaults.c:2369
2702 msgid "Wrong type for workspace background. Should be a texture type."
2703 msgstr "Vigane töölaua tausta tüüp. Peaks olema tekstuur-tüüpi."
2704
2705-#: ../src/defaults.c:2248
2706+#: ../src/defaults.c:2417
2707 #, c-format
2708 msgid "Wrong type for background of workspace %i. Should be a texture."
2709 msgstr "Vigane töölaua %i tausta tüüp. Peaks olema tekstuur-tüüpi."
2710
2711-#: ../src/defaults.c:2290
2712+#: ../src/defaults.c:2459
2713 msgid "could not load any usable font!!!"
2714-msgstr "ei õnnestu laadid ühtki kasutuskõlblikku shrifti!!!"
2715+msgstr "ei õnnestu laadida ühtki kasutuskõlblikku kirjatüüpi!!!"
2716
2717-#: ../src/defaults.c:2317
2718+#: ../src/defaults.c:2486
2719 #, c-format
2720 msgid "could not get color for key \"%s\""
2721-msgstr "ei õnnestu leida värvi võtmele \"%s\""
2722+msgstr "võtmele \"%s\" pole võimali värvi hankida"
2723
2724-#: ../src/defaults.c:2375 ../src/rootmenu.c:523
2725+#: ../src/defaults.c:2544 ../src/rootmenu.c:531
2726 #, c-format
2727-msgid "%s:invalid key modifier \"%s\""
2728-msgstr "%s: vigane võtme muutja \"%s\""
2729+msgid "%s: invalid key modifier \"%s\""
2730+msgstr "%s: vigane võtmemuutja \"%s\""
2731
2732-#: ../src/defaults.c:2387
2733+#: ../src/defaults.c:2556
2734 #, c-format
2735 msgid "%s:invalid kbd shortcut specification \"%s\""
2736 msgstr "%s: vigane kiirklahvi kirjeldus \"%s\""
2737
2738-#: ../src/defaults.c:2394
2739+#: ../src/defaults.c:2563
2740 #, c-format
2741 msgid "%s:invalid key in shortcut \"%s\""
2742-msgstr "%s: vigane võti kiirklahvil \"%s\""
2743+msgstr "%s: vigane võti kiirklahvile \"%s\""
2744
2745-#: ../src/defaults.c:2419
2746+#: ../src/defaults.c:2588
2747 #, c-format
2748 msgid "%s: modifier key %s is not valid"
2749-msgstr "%s: muutmisklahv %s on vigane"
2750+msgstr "%s: muuteklahv %s on vigane"
2751
2752-#: ../src/defaults.c:2451
2753+#: ../src/defaults.c:2620
2754 #, c-format
2755 msgid "could not load image in option %s: %s"
2756-msgstr "ei õnnestu pildi laadimine valikus %s: %s"
2757+msgstr "pildi laadimine valikus %s pole võimalik: %s"
2758
2759-#: ../src/defaults.c:2568
2760+#: ../src/defaults.c:2737
2761 #, c-format
2762 msgid "failed to open bitmap file \"%s\""
2763-msgstr "ei õnnestu avada pildifaili \"%s\""
2764+msgstr "pildifaili \"%s\" pole võimalik avada"
2765
2766-#: ../src/defaults.c:2571
2767+#: ../src/defaults.c:2740
2768 #, c-format
2769 msgid "\"%s\" is not a valid bitmap file"
2770 msgstr "\"%s\" ei ole korrektne pildifail"
2771
2772-#: ../src/defaults.c:2574
2773+#: ../src/defaults.c:2743
2774 #, c-format
2775 msgid "out of memory reading bitmap file \"%s\""
2776-msgstr "mälu lõppes pildifaili \"%s\" lugemisel"
2777+msgstr "pildifaili \"%s\" lugemisel lõppes mälu"
2778
2779-#: ../src/defaults.c:2613 ../src/defaults.c:2646
2780+#: ../src/defaults.c:2782 ../src/defaults.c:2815
2781 msgid "bad number of arguments in cursor specification"
2782 msgstr "vigane argumentide arv kursori kirjelduses"
2783
2784-#: ../src/defaults.c:2629
2785+#: ../src/defaults.c:2798
2786 #, c-format
2787 msgid "unknown builtin cursor name \"%s\""
2788 msgstr "tundmatu sisseehitatud kursori nimi: \"%s\""
2789
2790-#: ../src/defaults.c:2656 ../src/defaults.c:2668
2791+#: ../src/defaults.c:2825 ../src/defaults.c:2837
2792 #, c-format
2793 msgid "could not find cursor bitmap file \"%s\""
2794-msgstr "ei õnnestu leida kursori pildifaili \"%s\""
2795+msgstr "kursori pildifaili \"%s\" pole võimalik leida"
2796
2797-#: ../src/defaults.c:2715
2798+#: ../src/defaults.c:2884
2799 #, c-format
2800 msgid "Error in cursor specification for key \"%s\""
2801 msgstr "Viga võtme \"%s\" kursori kirjelduses"
2802
2803-#: ../src/defaults.c:2800
2804+#: ../src/defaults.c:2969
2805 msgid "could not render texture for icon background"
2806-msgstr "tekstuuri renderdamine ikooni taustapildiks ei õnnestu"
2807+msgstr "tekstuuri pole võimalik ikooni taustapildiks renderdada"
2808+
2809+#: ../src/defaults.c:3597 ../src/defaults.c:3672
2810+#, c-format
2811+msgid "Invalid arguments for option \"%s\""
2812+msgstr "Vigased argumendid võtmele \"%s\""
2813+
2814+#: ../src/defaults.c:3604 ../src/defaults.c:3679
2815+#, c-format
2816+msgid "Could not find image \"%s\" for option \"%s\""
2817+msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik leida"
2818
2819-#: ../src/dialog.c:135
2820+#: ../src/defaults.c:3610 ../src/defaults.c:3687
2821+#, c-format
2822+msgid "Could not load image \"%s\" for option \"%s\""
2823+msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik laadida"
2824+
2825+#: ../src/defaults.c:3622
2826+msgid "Invalid split sizes for SwitchPanel back image."
2827+msgstr ""
2828+
2829+#: ../src/defaults.c:3695
2830+#, c-format
2831+msgid "Invalid number of arguments for option \"%s\""
2832+msgstr "Vigane argumentide arv võtmele \"%s\""
2833+
2834+#: ../src/dialog.c:147
2835 msgid "Save workspace state"
2836-msgstr "Salvesta töölaua olek"
2837+msgstr "Töölaua oleku salvestamine"
2838
2839-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
2840-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
2841+#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547
2842+#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248
2843 #: ../src/rootmenu.c:264
2844 msgid "Cancel"
2845-msgstr "Tühista"
2846+msgstr "Loobu"
2847
2848-#: ../src/dialog.c:277
2849+#: ../src/dialog.c:290
2850 msgid "Could not open directory "
2851-msgstr "Ei õnnestu avada kataloogi "
2852+msgstr "Pole võimalik avada kataloogi "
2853
2854-#: ../src/dialog.c:332
2855+#: ../src/dialog.c:345
2856 msgid "Could not load image file "
2857-msgstr "Ei õnnestu avada pildifaili "
2858+msgstr "Pole võimalik avada pildifaili "
2859
2860-#: ../src/dialog.c:663
2861+#: ../src/dialog.c:659
2862 msgid "Directories"
2863 msgstr "Kataloogid"
2864
2865-#: ../src/dialog.c:672
2866+#: ../src/dialog.c:668
2867 msgid "Icons"
2868 msgstr "Ikoonid"
2869
2870-#: ../src/dialog.c:705
2871+#: ../src/dialog.c:701
2872 msgid "Preview"
2873 msgstr "Eelvaade"
2874
2875-#: ../src/dialog.c:718
2876+#: ../src/dialog.c:714
2877 msgid "File Name:"
2878 msgstr "Faili nimi:"
2879
2880-#: ../src/dialog.c:742
2881+#: ../src/dialog.c:738
2882 msgid "Choose File"
2883 msgstr "Vali fail"
2884
2885-#: ../src/dialog.c:760 ../src/dialog.c:762
2886+#: ../src/dialog.c:757 ../src/dialog.c:759
2887 msgid "Icon Chooser"
2888-msgstr "Ikooni valija"
2889+msgstr "Ikoonivalik"
2890
2891-#: ../src/dialog.c:1219 ../src/dialog.c:1329
2892+#: ../src/dialog.c:1197 ../src/dialog.c:1305
2893 #, c-format
2894 msgid "Version %s"
2895 msgstr "Versioon %s"
2896
2897-#: ../src/dialog.c:1326
2898+#: ../src/dialog.c:1303
2899 msgid "Window Manager for X"
2900 msgstr "X'i aknahaldur"
2901
2902-#: ../src/dialog.c:1349
2903+#: ../src/dialog.c:1326
2904 #, c-format
2905 msgid "Using visual 0x%x: %s %ibpp "
2906-msgstr "Kasutan visuaali 0x%x: %s %ibpp "
2907+msgstr "Kasutatakse visuaali 0x%x: %s %ibpp "
2908
2909-#: ../src/dialog.c:1357
2910+#: ../src/dialog.c:1334
2911 msgid "(32 thousand colors)\n"
2912 msgstr "(32 tuhat värvi)\n"
2913
2914-#: ../src/dialog.c:1360
2915+#: ../src/dialog.c:1337
2916 msgid "(64 thousand colors)\n"
2917 msgstr "(64 tuhat värvi)\n"
2918
2919-#: ../src/dialog.c:1364
2920+#: ../src/dialog.c:1341
2921 msgid "(16 million colors)\n"
2922 msgstr "(16 miljonit värvi)\n"
2923
2924-#: ../src/dialog.c:1367
2925+#: ../src/dialog.c:1344
2926 #, c-format
2927 msgid "(%d colors)\n"
2928 msgstr "(%d värvi)\n"
2929
2930-#: ../src/dialog.c:1377
2931+#: ../src/dialog.c:1354
2932 #, c-format
2933 msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
2934-msgstr "Eraldatud mälu kokku: %i kB. Mälu kasutuses: %i kB.\n"
2935+msgstr "Kogu eraldatud mälu: %i kB. Kogu kasutusel olev mälu: %i kB.\n"
2936
2937-#: ../src/dialog.c:1384
2938+#: ../src/dialog.c:1361
2939 msgid "Supported image formats: "
2940 msgstr "Toetatud pildivormingud: "
2941
2942-#: ../src/dialog.c:1391
2943+#: ../src/dialog.c:1368
2944 msgid ""
2945 "\n"
2946 "Additional support for: "
2947@@ -383,11 +420,11 @@
2948 "\n"
2949 "Lisaks on toetatud: "
2950
2951-#: ../src/dialog.c:1414
2952+#: ../src/dialog.c:1385
2953 msgid " and "
2954 msgstr " ja "
2955
2956-#: ../src/dialog.c:1424
2957+#: ../src/dialog.c:1395
2958 msgid ""
2959 "\n"
2960 "Sound disabled"
2961@@ -395,7 +432,7 @@
2962 "\n"
2963 "Heli on keelatud"
2964
2965-#: ../src/dialog.c:1426
2966+#: ../src/dialog.c:1397
2967 msgid ""
2968 "\n"
2969 "Sound enabled"
2970@@ -403,28 +440,46 @@
2971 "\n"
2972 "Heli on lubatud"
2973
2974-#: ../src/dialog.c:1450
2975+#: ../src/dialog.c:1402
2976+msgid ", VirtualDesktop enabled"
2977+msgstr ", VirtualDesktop on lubatud"
2978+
2979+#: ../src/dialog.c:1404
2980+msgid ", VirtualDesktop disabled"
2981+msgstr ", VirtualDesktop on keelatud"
2982+
2983+#: ../src/dialog.c:1408
2984+msgid "\n"
2985+msgstr "\n"
2986+
2987+#: ../src/dialog.c:1410
2988+msgid "Solaris "
2989+msgstr "Solaris "
2990+
2991+#: ../src/dialog.c:1412
2992+msgid "Xinerama: "
2993+msgstr "Xinerama: "
2994+
2995+#: ../src/dialog.c:1446
2996 msgid "Info"
2997-msgstr "Info"
2998+msgstr "Andmed"
2999
3000-#: ../src/dialog.c:1473
3001-msgid "Merry X'mas!"
3002+#: ../src/dialog.c:1470
3003+msgid "Merry Christmas!"
3004 msgstr "Häid jõule!"
3005
3006-#: ../src/dialog.c:1543
3007+#: ../src/dialog.c:1540
3008 msgid ""
3009 " Window Maker is free software; you can redistribute it and/or\n"
3010 "modify it under the terms of the GNU General Public License as\n"
3011 "published by the Free Software Foundation; either version 2 of the\n"
3012 "License, or (at your option) any later version.\n"
3013 "\n"
3014-"\n"
3015 " Window Maker is distributed in the hope that it will be useful,\n"
3016 "but WITHOUT ANY WARRANTY; without even the implied warranty\n"
3017 "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
3018 "See the GNU General Public License for more details.\n"
3019 "\n"
3020-"\n"
3021 " You should have received a copy of the GNU General Public\n"
3022 "License along with this program; if not, write to the Free Software\n"
3023 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
3024@@ -436,13 +491,11 @@
3025 "avaldatud; kas Litsentsi versioon number 2 või (vastavalt\n"
3026 "Teie valikule) ükskõik milline hilisem versioon.\n"
3027 "\n"
3028-"\n"
3029 "Seda programmi levitatakse lootuses, et see on kasulik, kuid\n"
3030 "ILMA IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI\n"
3031 "GARANTIITA või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS.\n"
3032 "Üksikasjade suhtes vaata GNU Üldist Avalikku Litsentsi.\n"
3033 "\n"
3034-"\n"
3035 "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n"
3036 "koos selle programmiga, kui ei, siis kontakteeruge Free\n"
3037 "Software Foundation'iga, 59 Temple Place - Suite 330,\n"
3038@@ -450,17 +503,17 @@
3039
3040 #: ../src/dialog.c:1564
3041 msgid "Legal"
3042-msgstr "Litsentsiinfo"
3043+msgstr "Litsentsiandmed"
3044
3045-#: ../src/dialog.c:1715 ../src/startup.c:395
3046+#: ../src/dialog.c:1720
3047 msgid "cannot open connection for crashing dialog panel. Aborting."
3048-msgstr "ei õnnestu luua ühendust avariipaneeliga. Annan alla."
3049+msgstr "krahhidialoogi paneeliga pole võimalik ühendust luua. Annan alla."
3050
3051-#: ../src/dialog.c:1741
3052+#: ../src/dialog.c:1746
3053 msgid "Fatal error"
3054 msgstr "Fataalviga"
3055
3056-#: ../src/dialog.c:1752
3057+#: ../src/dialog.c:1757
3058 #, c-format
3059 msgid ""
3060 "Window Maker received signal %i\n"
3061@@ -469,41 +522,41 @@
3062 "Window Maker võttis vastu signaali %i\n"
3063 "(%s)."
3064
3065-#: ../src/dialog.c:1755
3066+#: ../src/dialog.c:1760
3067 #, c-format
3068 msgid "Window Maker received signal %i."
3069 msgstr "Window Maker võttis vastu signaali %i."
3070
3071-#: ../src/dialog.c:1764
3072+#: ../src/dialog.c:1769
3073 msgid ""
3074 " This fatal error occured probably due to a bug. Please fill the included "
3075 "BUGFORM and report it to bugs@windowmaker.org."
3076 msgstr ""
3077 " See fataalviga on arvatavasti põhjustatud programmi enese veast. Palun "
3078-"täitke kaasasolev vigadest teatamise vorm (BUGFORM) ja saatke see aadressil "
3079+"täida kaasasolev vigadest teatamise vorm (BUGFORM) ja saada see aadressil "
3080 "bugs@windowmaker.org."
3081
3082-#: ../src/dialog.c:1773
3083+#: ../src/dialog.c:1778
3084 msgid "What do you want to do now?"
3085 msgstr "Mida sa nüüd soovid teha?"
3086
3087-#: ../src/dialog.c:1779
3088+#: ../src/dialog.c:1784
3089 msgid "Select action"
3090-msgstr "Vali tegevus"
3091+msgstr "Tegevuse valimine"
3092
3093-#: ../src/dialog.c:1780
3094+#: ../src/dialog.c:1785
3095 msgid "Abort and leave a core file"
3096-msgstr "Lõpetan töö ja salvestan mälutõmmise"
3097+msgstr "Töö lõpetamine ja mälutõmmise salvestan"
3098
3099-#: ../src/dialog.c:1781
3100+#: ../src/dialog.c:1786
3101 msgid "Restart Window Maker"
3102-msgstr "Taaskäivitan Window Makeri"
3103+msgstr "Window Maker'i taaskäivitamine"
3104
3105-#: ../src/dialog.c:1782
3106+#: ../src/dialog.c:1787
3107 msgid "Start alternate window manager"
3108-msgstr "Käivitan alternatiivse aknahalduri"
3109+msgstr "Alternatiivse aknahalduri käivitamine"
3110
3111-#: ../src/dialog.c:1960
3112+#: ../src/dialog.c:1965
3113 msgid ""
3114 "Window Maker is part of the GNUstep project.\n"
3115 "The GNUstep project aims to create a free\n"
3116@@ -517,441 +570,387 @@
3117 msgstr ""
3118 "Window Maker on osa GNUstep projektist. GNUstep\n"
3119 "projekti eesmärgiks on OpenStep(tm) kirjelduse\n"
3120-"(objektorienteeritud framework graafiliste\n"
3121-"multiplatvorm rakenduste jaoks) vaba\n"
3122+"(objektorienteeritud raamistik graafiliste\n"
3123+"mitme platvormi toega rakenduste jaoks) vaba\n"
3124 "implementatsiooni loomine. Lisaeesmärgiks on \n"
3125-"ka sellel baseeruva ka arenduskeskkonna ja\n"
3126-"kasutaja töölauakeskkonna loomine. Lisateabe\n"
3127-"saamiseks palun külasada saidi www.gnustep.org"
3128+"ka sellel põhineva arenduskeskkonna ja kasutaja\n"
3129+"töölauakeskkonna loomine. Lisateabe saamiseks\n"
3130+"palun külasta saiti www.gnustep.org"
3131
3132-#: ../src/dialog.c:1980
3133+#: ../src/dialog.c:1988
3134 msgid "About GNUstep"
3135 msgstr "GNUstep'ist lähemalt"
3136
3137-#: ../src/dock.c:213
3138+#: ../src/dock.c:193
3139 #, c-format
3140 msgid "Type the name for workspace %i:"
3141 msgstr "Sisesta töölaua %i nimi:"
3142
3143-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
3144+#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419
3145 msgid "Rename Workspace"
3146 msgstr "Töölaua ümbernimetamine"
3147
3148-#: ../src/dock.c:520 ../src/dock.c:528
3149+#: ../src/dock.c:509 ../src/dock.c:517
3150 msgid "Warning"
3151 msgstr "Hoiatus"
3152
3153-#: ../src/dock.c:521
3154+#: ../src/dock.c:510
3155 msgid ""
3156 "Some icons cannot be made omnipresent. Please make sure that no other icon "
3157 "is docked in the same positions on the other workspaces and the Clip is not "
3158 "full in some workspace."
3159 msgstr ""
3160-"Mõningaid ikoone ei ole võimalik kõikidel töölaudadel nähtavaks teha. "
3161-"Veenduge, et teistel töölaudadel ei ole ükski ikoon dokitud samale "
3162+"Mõningaid ikoone pole võimalik kõikidel töölaudadel nähtavaks teha. "
3163+"Veendu, et teistel töölaudadel ei ole ükski ikoon dokitud samale "
3164 "positsioonile ja Klamber ei ole mõnel töölaual täis."
3165
3166-#: ../src/dock.c:529
3167+#: ../src/dock.c:518
3168 msgid ""
3169 "Icon cannot be made omnipresent. Please make sure that no other icon is "
3170 "docked in the same position on the other workspaces and the Clip is not full "
3171 "in some workspace."
3172 msgstr ""
3173-"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veenduge, et "
3174+"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veendu, et "
3175 "teistel töölaudadel ei ole ükski ikoon dokitud samale positsioonile ja "
3176 "Klamber ei ole mõnel töölaual täis."
3177
3178-#: ../src/dock.c:556
3179+#: ../src/dock.c:545
3180 msgid "Workspace Clip"
3181 msgstr "Töölaua Klamber"
3182
3183-#: ../src/dock.c:557
3184+#: ../src/dock.c:546
3185 msgid "All selected icons will be removed!"
3186 msgstr "Kõik valitud ikoonid eemaldatakse!"
3187
3188-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
3189+#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455
3190 msgid "Keep Icon"
3191 msgstr "Hoia ikooni"
3192
3193-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
3194+#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276
3195 msgid "Type the command used to launch the application"
3196 msgstr "Tipi korraldus, mida kasutada rakenduse käivitamiseks"
3197
3198-#: ../src/dock.c:965
3199+#: ../src/dock.c:954
3200 #, c-format
3201 msgid "could not launch application %s\n"
3202 msgstr "ei õnnestu käivitada rakendust %s\n"
3203
3204-#: ../src/dock.c:1020
3205+#: ../src/dock.c:1010
3206 msgid "could not create workspace submenu for Clip menu"
3207 msgstr "ei õnnestu luua klambrimenüüle töölaua alammenüüd"
3208
3209-#: ../src/dock.c:1078
3210+#: ../src/dock.c:1069
3211 msgid "could not create options submenu for Clip menu"
3212 msgstr "ei õnnestu luua klambrimenüüle valikute alammenüüd"
3213
3214-#: ../src/dock.c:1082 ../src/dock.c:1130
3215+#: ../src/dock.c:1073 ../src/dock.c:1121
3216 msgid "Keep on Top"
3217-msgstr "Hoitakse esiplaanil"
3218+msgstr "Hoia esiplaanil"
3219
3220-#: ../src/dock.c:1088
3221+#: ../src/dock.c:1079
3222 msgid "Collapsed"
3223 msgstr "Ahendatud"
3224
3225-#: ../src/dock.c:1094
3226+#: ../src/dock.c:1085
3227 msgid "Autocollapse"
3228 msgstr "Automaatselt ahenev"
3229
3230-#: ../src/dock.c:1100
3231+#: ../src/dock.c:1091
3232 msgid "Autoraise"
3233 msgstr "Automaatselt esile tõusev"
3234
3235-#: ../src/dock.c:1106
3236+#: ../src/dock.c:1097
3237 msgid "Autoattract Icons"
3238 msgstr "Ikoonide automaatne külgehaakimine"
3239
3240-#: ../src/dock.c:1136
3241+#: ../src/dock.c:1127
3242 msgid "Clip Options"
3243 msgstr "Klambri valikud"
3244
3245-#: ../src/dock.c:1146
3246+#: ../src/dock.c:1137
3247 msgid "Selected"
3248 msgstr "Valitud"
3249
3250-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
3251+#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446
3252 msgid "Select All Icons"
3253 msgstr "Vali kõik ikoonid"
3254
3255-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
3256+#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463
3257 msgid "Move Icon To"
3258 msgstr "Teisalda ikoon->"
3259
3260-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
3261+#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474
3262 msgid "Remove Icon"
3263 msgstr "Eemalda ikoon"
3264
3265-#: ../src/dock.c:1172
3266+#: ../src/dock.c:1163
3267 msgid "Attract Icons"
3268 msgstr "Haagi ikoonid külge"
3269
3270-#: ../src/dock.c:1175
3271+#: ../src/dock.c:1166
3272 msgid "Launch"
3273 msgstr "Käivita programm"
3274
3275-#: ../src/dock.c:1183
3276+#: ../src/dock.c:1174
3277 msgid "Settings..."
3278-msgstr "Määrangud..."
3279+msgstr "Sätted..."
3280
3281-#: ../src/dock.c:1548 ../src/dock.c:1655
3282+#: ../src/dock.c:1538 ../src/dock.c:1645
3283 #, c-format
3284 msgid "bad value in docked icon state info %s"
3285 msgstr "vigane väärtus dokitud ikooni olekuinfos %s "
3286
3287-#: ../src/dock.c:1663
3288+#: ../src/dock.c:1653
3289 #, c-format
3290 msgid "bad value in docked icon position %i,%i"
3291 msgstr "vigane väärtus dokitud ikooni asukohal %i,%i"
3292
3293-#: ../src/dock.c:1683
3294+#: ../src/dock.c:1673
3295 #, c-format
3296 msgid "bad value in dock state info:%s"
3297 msgstr "vigane väärtus doki olekuinfos:%s"
3298
3299-#: ../src/dock.c:1919
3300+#: ../src/dock.c:1923
3301 msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
3302 msgstr ""
3303 "dokki on salvestatud liiga palju ikoone. Eiran neid, mida ei suuda hallata"
3304
3305 #. icon->forced_dock = 1;
3306-#: ../src/dock.c:2136 ../src/dock.c:2277
3307+#: ../src/dock.c:2138 ../src/dock.c:2275
3308 msgid "Dock Icon"
3309 msgstr "Dokin ikooni"
3310
3311-#: ../src/dock.c:3323
3312+#: ../src/dock.c:3333
3313 #, c-format
3314 msgid "Could not execute command \"%s\""
3315 msgstr "Ei õnnestu täita korraldust \"%s\""
3316
3317-#: ../src/dock.c:3415
3318+#: ../src/dock.c:3425
3319 msgid "Toggle Omnipresent"
3320 msgstr "Näita/ära näita kõigil töölaudadel"
3321
3322-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
3323-#: ../src/winspector.c:1389
3324+#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383
3325 msgid "Omnipresent"
3326-msgstr "Näha kõigil töölaudadel"
3327+msgstr "Nähtav kõigil töölaudadel"
3328
3329-#: ../src/dock.c:3434
3330+#: ../src/dock.c:3444
3331 msgid "Unselect All Icons"
3332 msgstr "Tühista ikoonivalik"
3333
3334-#: ../src/dock.c:3443
3335+#: ../src/dock.c:3453
3336 msgid "Keep Icons"
3337 msgstr "Hoia ikoone"
3338
3339-#: ../src/dock.c:3451
3340+#: ../src/dock.c:3461
3341 msgid "Move Icons To"
3342 msgstr "Teisalda ikoonid->"
3343
3344-#: ../src/dock.c:3462
3345+#: ../src/dock.c:3472
3346 msgid "Remove Icons"
3347 msgstr "Eemalda ikoonid"
3348
3349-#: ../src/dock.c:3493 ../src/kwm.c:643
3350+#: ../src/dock.c:3503
3351 msgid "Bring Here"
3352 msgstr "Too siia"
3353
3354-#: ../src/dockedapp.c:149
3355+#: ../src/dockedapp.c:150
3356 #, c-format
3357 msgid "could not find icon %s, used in a docked application"
3358 msgstr "ei leia dokitud rakenduses kasutatavat ikooni %s"
3359
3360-#: ../src/dockedapp.c:229
3361+#: ../src/dockedapp.c:230
3362 #, c-format
3363 msgid "Could not open specified icon file: %s"
3364 msgstr "Ei õnnestu avada määratud ikoonifaili: %s"
3365
3366-#: ../src/dockedapp.c:231
3367+#: ../src/dockedapp.c:232
3368 msgid "Ignore"
3369 msgstr "Eira"
3370
3371-#: ../src/dockedapp.c:333
3372+#: ../src/dockedapp.c:334
3373 msgid "Start when Window Maker is started"
3374-msgstr "Käivita koos Window Maker'iga"
3375+msgstr "Käivitada koos Window Maker'iga"
3376
3377-#: ../src/dockedapp.c:340
3378+#: ../src/dockedapp.c:341
3379 msgid "Lock (prevent accidental removal)"
3380 msgstr "Lukustatud (ei saa kogemata kustutada)"
3381
3382-#: ../src/dockedapp.c:344
3383+#: ../src/dockedapp.c:345
3384 msgid "Application path and arguments"
3385-msgstr "Rakenduse tee ja argumendid"
3386+msgstr "Rakenduse rada ja argumendid"
3387
3388-#: ../src/dockedapp.c:357
3389+#: ../src/dockedapp.c:358
3390 msgid "Command for middle-click launch"
3391 msgstr "Keskmise nupu korraldus"
3392
3393-#: ../src/dockedapp.c:371
3394+#: ../src/dockedapp.c:372
3395 #, c-format
3396 msgid "%s will be replaced with current selection"
3397-msgstr "%s asendatakse antud valikuga"
3398+msgstr "%s asendatakse käesoleva valikuga"
3399
3400-#: ../src/dockedapp.c:376
3401+#: ../src/dockedapp.c:377
3402 msgid "Command for files dropped with DND"
3403 msgstr "Korraldus DND abil saadetud failidele"
3404
3405-#: ../src/dockedapp.c:390
3406+#: ../src/dockedapp.c:391
3407 #, c-format
3408 msgid "%d will be replaced with the file name"
3409 msgstr "%d asendatakse failinimega"
3410
3411-#: ../src/dockedapp.c:394
3412+#: ../src/dockedapp.c:395
3413 msgid "DND support was not compiled in"
3414-msgstr "DND toetus ei ole sisse kompileeritud"
3415+msgstr "DND tugi pole sisse kompileeritud"
3416
3417-#: ../src/dockedapp.c:399
3418+#: ../src/dockedapp.c:400
3419 msgid "Icon Image"
3420 msgstr "Ikooni pilt"
3421
3422-#: ../src/dockedapp.c:413 ../src/winspector.c:1527
3423+#: ../src/dockedapp.c:414 ../src/winspector.c:1521
3424 msgid "Browse..."
3425-msgstr "Kuva..."
3426+msgstr "Sirvi..."
3427
3428-#: ../src/dockedapp.c:466
3429+#: ../src/dockedapp.c:475
3430 msgid "Docked Application Settings"
3431-msgstr "Dokitud rakenduse määrangud"
3432+msgstr "Dokitud rakenduse sätted"
3433
3434-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456
3435+#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463
3436 #: ../src/texture.c:594
3437 #, c-format
3438 msgid "could not render texture: %s"
3439-msgstr "ei õnnestu renderdada tekstuuri %s"
3440+msgstr "tekstuuri pole võimalik renderdada: %s"
3441
3442-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
3443-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
3444-#: ../src/icon.c:350 ../src/menu.c:485
3445+#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697
3446+#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722
3447+#: ../src/icon.c:360 ../src/menu.c:492
3448 #, c-format
3449 msgid "error rendering image:%s"
3450 msgstr "viga pildi renderdamisel:%s"
3451
3452-#: ../src/framewin.c:777
3453+#: ../src/framewin.c:775
3454 #, c-format
3455 msgid "error rendering image: %s"
3456 msgstr "viga pildi renderdamisel: %s"
3457
3458-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
3459-msgid "out of memory while updating GNOME hints"
3460-msgstr "mälu lõppes GNOME vihjete uuendamise käigus"
3461-
3462-#: ../src/icon.c:229 ../src/wdefaults.c:443
3463+#: ../src/icon.c:239 ../src/wdefaults.c:443
3464 #, c-format
3465 msgid "error loading image file \"%s\""
3466 msgstr "viga pildifaili \"%s\" laadimisel"
3467
3468-#: ../src/icon.c:491 ../src/icon.c:500
3469+#: ../src/icon.c:503 ../src/icon.c:512
3470 #, c-format
3471 msgid "could not create directory %s"
3472-msgstr "ei õnnestu luua kataloogi %s"
3473+msgstr "kataloogi %s pole võimalik luua"
3474
3475-#: ../src/icon.c:767
3476+#: ../src/icon.c:782
3477 #, c-format
3478 msgid "could not find default icon \"%s\""
3479-msgstr "ei õnnestu leida vaikimisi kasutatavat ikooni \"%s\""
3480+msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik leida"
3481
3482-#: ../src/icon.c:773
3483+#: ../src/icon.c:788
3484 #, c-format
3485 msgid "could not load default icon \"%s\":%s"
3486-msgstr "Ei õnnestu laadida vaikimisi kasutatavat ikooni \"%s\":%s"
3487-
3488-#.
3489-#. * Warning: If you make some change that affects the order of the
3490-#. * entries, you must update the command #defines in the top of
3491-#. * this file.
3492-#.
3493-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
3494-msgid "Maximize"
3495-msgstr "Maksimeeri"
3496-
3497-#: ../src/kwm.c:634 ../src/winmenu.c:566
3498-msgid "Unmaximize"
3499-msgstr "Taasta suurus"
3500-
3501-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
3502-msgid "Miniaturize"
3503-msgstr "Minimeeri"
3504-
3505-#: ../src/kwm.c:636 ../src/winmenu.c:552
3506-msgid "Deminiaturize"
3507-msgstr "Ava aken"
3508-
3509-#: ../src/kwm.c:638
3510-msgid "Not Omnipresent"
3511-msgstr "Näita ainult ühel töölaual"
3512-
3513-#: ../src/kwm.c:639
3514-msgid "Move"
3515-msgstr "Liiguta"
3516-
3517-#: ../src/kwm.c:640
3518-msgid "Resize"
3519-msgstr "Muuda suurust"
3520-
3521-#.
3522-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
3523-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
3524-#.
3525-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
3526-msgid "Close"
3527-msgstr "Sulge"
3528-
3529-#: ../src/kwm.c:642 ../src/winmenu.c:485
3530-msgid "Move To"
3531-msgstr "Teisalda"
3532+msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik laadida:%s"
3533
3534-#: ../src/kwm.c:1096
3535-msgid "%a(Run Command,Type the command to run:)"
3536-msgstr "%a(Käivita korraldus,Sisesta korraldus, mida käivitada:)"
3537-
3538-#: ../src/main.c:222
3539+#: ../src/main.c:220
3540 msgid "failed to restart Window Maker."
3541-msgstr "Window Makeri taaskäivitamine ebaõnnestus."
3542+msgstr "Tõrge Window Maker'i taaskäivitamisel."
3543
3544-#: ../src/main.c:225
3545+#: ../src/main.c:223
3546 #, c-format
3547 msgid "could not exec %s"
3548-msgstr "ei õnnestu käivitada %s"
3549+msgstr "%s pole võimalik käivitada"
3550
3551-#: ../src/main.c:271
3552+#: ../src/main.c:269
3553 msgid "Could not execute command: "
3554-msgstr "Ei õnnestu käivitada korraldust: "
3555+msgstr "Korraldust pole võimalik käivitada : "
3556
3557-#: ../src/main.c:428
3558+#: ../src/main.c:426
3559 #, c-format
3560 msgid "%s aborted.\n"
3561 msgstr "%s katkestatud.\n"
3562
3563-#: ../src/main.c:439
3564+#: ../src/main.c:437
3565 #, c-format
3566 msgid "Usage: %s [options]\n"
3567-msgstr "Kasuta: %s [valikud]\n"
3568+msgstr "Kasutamine: %s [võtmed]\n"
3569
3570-#: ../src/main.c:440
3571+#: ../src/main.c:438
3572 msgid "The Window Maker window manager for the X window system"
3573-msgstr "Window Maker on aknahaldur X window system'ile"
3574+msgstr "Window Maker on X window system'i aknahaldur"
3575
3576-#: ../src/main.c:442
3577+#: ../src/main.c:440
3578 msgid " -display host:dpy\tdisplay to use"
3579-msgstr " -display host:dpy\tmäärab, millist kuva kasutada"
3580+msgstr " -display host:dpy\tkasutatava kuva määramine"
3581
3582-#: ../src/main.c:444
3583+#: ../src/main.c:442
3584 msgid " --no-cpp \t\tdisable preprocessing of configuration files"
3585-msgstr " --no-cpp \t\tkeelab häälestusfailide eeltöötluse"
3586+msgstr " --no-cpp \t\tseadistusfailide eeltöötluse keelamine"
3587
3588-#: ../src/main.c:446
3589+#: ../src/main.c:444
3590 msgid " --no-dock\t\tdo not open the application Dock"
3591-msgstr " --no-dock\t\tkeelab rakenduste doki avamise"
3592+msgstr " --no-dock\t\trakenduste doki avamise keelamine"
3593
3594-#: ../src/main.c:447
3595+#: ../src/main.c:445
3596 msgid " --no-clip\t\tdo not open the workspace Clip"
3597-msgstr " --no-clip\t\tkeelab töölaua klambri avamise"
3598+msgstr " --no-clip\t\ttöölaua klambri avamise keelamine"
3599
3600-#: ../src/main.c:448
3601+#: ../src/main.c:446
3602 msgid " --no-autolaunch\tdo not autolaunch applications"
3603-msgstr " --no-autolaunch\tkeelab rakenduste automaatse käivitamise"
3604+msgstr " --no-autolaunch\trakenduste automaatse käivitamise keelamine"
3605
3606-#: ../src/main.c:449
3607+#: ../src/main.c:447
3608 msgid " --dont-restore\t\tdo not restore saved session"
3609-msgstr " --dont-restore\tei taasta salvestatud seanssi"
3610+msgstr " --dont-restore\tsalvestatud seansi taastamise keelamine"
3611
3612-#: ../src/main.c:451
3613+#: ../src/main.c:449
3614 msgid " --locale locale\tlocale to use"
3615-msgstr " --locale locale\t\tmillist locale't kasutada"
3616+msgstr " --locale locale\t\tkasutatava lokaadi määramine"
3617
3618-#: ../src/main.c:453
3619+#: ../src/main.c:451
3620 msgid ""
3621 " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
3622 msgstr ""
3623-" --create-stdcmap\tloo standardne värvikaardi vihje PseudoColor visuaalile"
3624+" --create-stdcmap\tstandardse värvikaardi vihje loomine PseudoColor visuaalile"
3625
3626-#: ../src/main.c:454
3627+#: ../src/main.c:452
3628 msgid " --visual-id visualid\tvisual id of visual to use"
3629 msgstr " --visual-id visualid\tkasutatava visuaali id"
3630
3631-#: ../src/main.c:455
3632+#: ../src/main.c:453
3633 msgid " --static\t\tdo not update or save configurations"
3634-msgstr " --static\t\thäälestusi ei salvestata ega uuendata"
3635+msgstr " --static\t\tseadistusi ei salvestata ega uuendata"
3636
3637-#: ../src/main.c:456
3638+#: ../src/main.c:454
3639 msgid " --no-polling\t\tdo not periodically check for configuration updates"
3640-msgstr " --no-polling\t\tkeelab ümberhäälestustuste regulaarse kontrolli"
3641+msgstr " --no-polling\t\tümberseadistustuste korrapärase kontrolli keelamine"
3642
3643-#: ../src/main.c:458
3644+#: ../src/main.c:456
3645 msgid " --synchronous\t\tturn on synchronous display mode"
3646-msgstr " --synchronous\t\tlülitab sisse sünkroonse ekraanirezhiimi"
3647+msgstr " --synchronous\t\tsünkroonse ekraanirezhiimi sisselülitamine"
3648
3649-#: ../src/main.c:460
3650+#: ../src/main.c:458
3651 msgid " --version\t\tprint version and exit"
3652-msgstr " --version\t\tväljastab versiooninumbri ja lõpetab programmi töö"
3653+msgstr " --version\t\tversiooninumbri väljastamine ja programmi töö lõpetamine"
3654
3655-#: ../src/main.c:461
3656+#: ../src/main.c:459
3657 msgid " --help\t\t\tshow this message"
3658-msgstr " --help\t\t\tnäitab seda teadet"
3659+msgstr " --help\t\t\tselle teate näitamine"
3660
3661-#: ../src/main.c:474
3662+#: ../src/main.c:473
3663 #, c-format
3664 msgid ""
3665 "could not find user GNUstep directory (%s).\n"
3666 "Make sure you have installed Window Maker correctly and run wmaker.inst"
3667 msgstr ""
3668-"ei õnnestu leida kasutaja GNUstep kataloogi (%s).\n"
3669+"kasutaja GNUstep kataloogi (%s) pole võimalik leida.\n"
3670 "Veendu, et Window Maker on korrektselt paigaldatud ja käivita wmaker.inst"
3671
3672-#: ../src/main.c:479
3673+#: ../src/main.c:478
3674 #, c-format
3675 msgid "could not find user GNUstep directory (%s)."
3676-msgstr "ei õnnestu leida kasutaja GNUstep kataloogi (%s)"
3677+msgstr "kasutaja GNUstep kataloogi (%s) pole võimalik leida."
3678
3679-#: ../src/main.c:482
3680+#: ../src/main.c:481
3681 msgid ""
3682 "There was an error while creating GNUstep directory, please make sure you "
3683 "have installed Window Maker correctly and run wmaker.inst"
3684@@ -959,190 +958,142 @@
3685 "Viga GNUstep kataloogi loomise käigus. Palun veendu, et Window Maker on "
3686 "korrektselt paigaldatud ja käivita wmaker.inst"
3687
3688-#: ../src/main.c:485
3689+#: ../src/main.c:484
3690 #, c-format
3691 msgid "%s directory created with default configuration."
3692-msgstr "%s kataloog loodi vaikimisi häälestusega"
3693+msgstr "%s kataloog loodi vaikimisi seadistusega"
3694
3695-#: ../src/main.c:505 ../src/main.c:510
3696+#: ../src/main.c:506 ../src/main.c:511
3697 #, c-format
3698 msgid "%s:could not execute initialization script"
3699-msgstr "%s:ei õnnestu käivitada lähtestamisskripti"
3700+msgstr "%s:lähtestamisskripti pole võimalik käivitada"
3701
3702-#: ../src/main.c:530 ../src/main.c:535
3703+#: ../src/main.c:533 ../src/main.c:538
3704 #, c-format
3705 msgid "%s:could not execute exit script"
3706-msgstr "%s:ei õnnestu käivitada lõpetamisskripti"
3707+msgstr "%s:lõpetamisskripti pole võimalik käivitada"
3708
3709-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
3710+#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738
3711+#: ../src/main.c:758
3712 #, c-format
3713 msgid "too few arguments for %s"
3714 msgstr "liiga vähe argumente %s jaoks"
3715
3716-#: ../src/main.c:671
3717+#: ../src/main.c:742
3718 #, c-format
3719 msgid "bad value for visualid: \"%s\""
3720 msgstr "vigane visualid väärtus: \"%s\""
3721
3722-#: ../src/main.c:695
3723+#: ../src/main.c:766
3724 #, c-format
3725 msgid "%s: invalid argument '%s'\n"
3726 msgstr "%s: vigane argument '%s'\n"
3727
3728-#: ../src/main.c:696
3729+#: ../src/main.c:767
3730 #, c-format
3731 msgid "Try '%s --help' for more information\n"
3732-msgstr "Et saada rohkem informatsiooni, proovi '%s --help'\n"
3733+msgstr "Täiendava teabe saamiseks proovi kasutada '%s --help'\n"
3734
3735-#: ../src/main.c:727
3736+#: ../src/main.c:802
3737 msgid "X server does not support locale"
3738 msgstr "X server ei toeta lokaliseerimist"
3739
3740-#: ../src/main.c:731
3741+#: ../src/main.c:806
3742 msgid "cannot set locale modifiers"
3743-msgstr ""
3744+msgstr "lokaadimuujaid pole võimalik määrata"
3745
3746-#: ../src/main.c:747
3747+#: ../src/main.c:822
3748 #, c-format
3749 msgid "could not open display \"%s\""
3750-msgstr "ei õnnestu avada kuva \"%s\""
3751+msgstr "kuva \"%s\" pole võimalik avada"
3752
3753-#: ../src/menu.c:1255
3754+#: ../src/menu.c:1276
3755 msgid "could not grab keyboard"
3756-msgstr "ei suuda klaviatuuriga ühendust saada"
3757-
3758-#: ../src/menu.c:2569
3759-#, c-format
3760-msgid "bad value in menus state info:%s"
3761-msgstr "vigane väärtus menüüde olekuinfos:%s"
3762+msgstr "klaviatuuriga pole võimalik ühendust saada"
3763
3764-#: ../src/menureader.c:264 ../src/rootmenu.c:730
3765+#: ../src/menu.c:2615
3766 #, c-format
3767-msgid "%s:could not stat menu"
3768-msgstr "%s:ei õnnestu tuvastada menüü atribuute"
3769-
3770-#: ../src/menureader.c:341 ../src/menureader.c:380
3771-#, c-format
3772-msgid "could not stat() menu file '%s'"
3773-msgstr "ei õnnestu lugeda (stat()) menüüfaili '%s' atribuute"
3774+msgid "bad value in menus state info: %s"
3775+msgstr "vigane väärtus menüüde olekuandmetes:%s"
3776
3777-#: ../src/menureader.c:416
3778-#, c-format
3779-msgid "could not find menu file '%s' referenced in WMRootMenu"
3780-msgstr "ei õnnestu leida menüüfaili '%s', millele viitab WMRootMenu"
3781-
3782-#: ../src/menureader.c:423
3783-#, c-format
3784-msgid "could not find any usable menu files. Please check '%s'"
3785-msgstr ""
3786-"ei õnnestu leida ühtegi kasutuskõlblikku menüüfaili. Palun kontrolli '%s'"
3787-
3788-#: ../src/menureader.c:438 ../src/rootmenu.c:1664
3789-#, c-format
3790-msgid ""
3791-"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
3792-"not be found "
3793-msgstr ""
3794-"ei õnnestu leida vaikimisi kasutatavat menüüfaili \"%s\", millele viitab "
3795-"WMRootMenu"
3796-
3797-#: ../src/menureader.c:457
3798-#, c-format
3799-msgid ""
3800-"invalid content in menu file '%s'.\n"
3801-"It should either be a property list menu or the path to the file, enclosed "
3802-"in \"."
3803-msgstr ""
3804-
3805-#: ../src/misc.c:71
3806+#: ../src/misc.c:65
3807 #, c-format
3808 msgid "could not define value for %s for cpp"
3809-msgstr "ei õnnestu defineerida %s väärtust cpp jaoks"
3810+msgstr "%s väärtust pole võimalik cpp jaoks kirjedada"
3811
3812-#: ../src/misc.c:101
3813+#: ../src/misc.c:95
3814 #, c-format
3815 msgid "could not get password entry for UID %i"
3816-msgstr "ei õnnestu leida UID %i paroolikirjet"
3817+msgstr "UID %i paroolikirjet pole võimalik leida"
3818
3819-#: ../src/misc.c:126
3820+#: ../src/misc.c:121
3821 #, c-format
3822 msgid "your machine is misconfigured. HOSTNAME is set to %s"
3823-msgstr "Teie masin on häälestamata. HOSTNAME väärtus on %s"
3824+msgstr "Teie masin on seadistamata. HOSTNAME väärtus on %s"
3825
3826-#: ../src/misc.c:132
3827+#: ../src/misc.c:127
3828 #, c-format
3829 msgid "your machine is misconfigured. HOST is set to %s"
3830-msgstr "Teie masin on häälestamata. HOST väärtus on %s"
3831+msgstr "Teie masin on seadistamata. HOST väärtus on %s"
3832
3833-#: ../src/misc.c:630
3834+#: ../src/misc.c:622
3835 msgid "Program Arguments"
3836 msgstr "Programmi argumendid"
3837
3838-#: ../src/misc.c:631
3839+#: ../src/misc.c:623
3840 msgid "Enter command arguments:"
3841 msgstr "Sisesta käsu argumendid:"
3842
3843-#: ../src/misc.c:724
3844-msgid "unable to get dropped data from DND drop"
3845-msgstr "ei õnnestu vastu võtta DND saadetud andmeid"
3846-
3847-#: ../src/misc.c:732
3848-msgid "error getting dropped data from DND drop"
3849-msgstr "viga DND saadetud andmete vastuvõtmisel"
3850-
3851-#: ../src/misc.c:738
3852-msgid "out of memory while getting data from DND drop"
3853-msgstr "mälu lõppes DND saadetud andmete vastuvõtmisel "
3854-
3855-#: ../src/misc.c:783 ../src/misc.c:923
3856+#: ../src/misc.c:737 ../src/misc.c:875
3857 #, c-format
3858 msgid "out of memory during expansion of \"%s\""
3859 msgstr "mälu lõppes \"%s\" laiendamise käigus"
3860
3861-#: ../src/misc.c:837
3862+#: ../src/misc.c:791
3863 msgid "out of memory during expansion of \"%w\""
3864 msgstr "mälu lõppes \"%w\" laiendamise käigus"
3865
3866-#: ../src/misc.c:855
3867+#: ../src/misc.c:809
3868 msgid "out of memory during expansion of \"%W\""
3869 msgstr "mälu lõppes \"%W\" laiendamise käigus"
3870
3871-#: ../src/misc.c:871
3872+#: ../src/misc.c:825
3873+#, c-format
3874 msgid "out of memory during expansion of \"%a\""
3875 msgstr "mälu lõppes \"%a\" laiendamise käigus"
3876
3877-#: ../src/misc.c:902
3878+#: ../src/misc.c:854
3879 #, c-format
3880 msgid "out of memory during expansion of \"%d\""
3881 msgstr "mälu lõppes \"%d\" laiendamise käigus"
3882
3883-#: ../src/misc.c:916
3884+#: ../src/misc.c:868
3885 msgid "selection not available"
3886 msgstr "valik ei ole kättesaadav"
3887
3888-#: ../src/misc.c:972 ../src/misc.c:978
3889+#: ../src/misc.c:912 ../src/misc.c:918
3890 #, c-format
3891 msgid "bad window name value in %s state info"
3892-msgstr "vigane akna nimi %s olekuinfos"
3893+msgstr "vigane akna nimi %s olekuandmetes"
3894
3895-#: ../src/misc.c:1235
3896+#: ../src/misc.c:1157
3897 msgid "could not send message to background image helper"
3898-msgstr "ei õnnestu saata teadet taustapildiprogrammile"
3899+msgstr "taustapildi abiprogrammile pole võimalik teadet saata"
3900
3901 #: ../src/pixmap.c:235
3902 #, c-format
3903 msgid "could not load mask bitmap file \"%s\". Won't use mask"
3904-msgstr "ei õnnestu laadida bitmap maskifaili \"%s\". Maski ei saa kasutada"
3905+msgstr "bitmap maskifaili \"%s\" pole võimalik laadida. Maski ei saa kasutada"
3906
3907 #: ../src/resources.c:44
3908 #, c-format
3909 msgid "could not parse color \"%s\""
3910-msgstr "ei õnnestu sõeluda värvi \"%s\""
3911+msgstr "värvi \"%s\" pole võimalik analüüsida"
3912
3913 #: ../src/resources.c:48
3914 #, c-format
3915 msgid "could not allocate color \"%s\""
3916-msgstr "ei õnnestu eraldada värvi \"%s\""
3917+msgstr "värvi \"%s\" pole võimalik eraldada"
3918
3919 #: ../src/rootmenu.c:196 ../src/rootmenu.c:198
3920 msgid "Exit"
3921@@ -1150,7 +1101,7 @@
3922
3923 #: ../src/rootmenu.c:197
3924 msgid "Exit window manager?"
3925-msgstr "Kas lõpetan aknahalduri töö?"
3926+msgstr "Kas lõpetada aknahalduri töö?"
3927
3928 #: ../src/rootmenu.c:245
3929 msgid "Close X session"
3930@@ -1165,6 +1116,14 @@
3931 "On võimalik, et suletakse ka mõned rakendused, mis sisaldavad salvestamata "
3932 "andmeid."
3933
3934+#.
3935+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
3936+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
3937+#.
3938+#: ../src/rootmenu.c:248 ../src/winmenu.c:501
3939+msgid "Close"
3940+msgstr "Sulge"
3941+
3942 #: ../src/rootmenu.c:261
3943 msgid "Kill X session"
3944 msgstr "X seansi kõrvaldamine"
3945@@ -1177,190 +1136,202 @@
3946 "Kas kõrvaldame X seansi?\n"
3947 "(kõik rakendused suletakse)"
3948
3949-#: ../src/rootmenu.c:536
3950+#: ../src/rootmenu.c:544
3951 #, c-format
3952 msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
3953 msgstr "%s:vigane kiirklahvi kirjeldus \"%s\" kirjele %s"
3954
3955-#: ../src/rootmenu.c:544
3956+#: ../src/rootmenu.c:552
3957 #, c-format
3958 msgid "%s:invalid key in shortcut \"%s\" for entry %s"
3959 msgstr "%s: vigane klahv kiirkorralduses \"%s\" kirjele %s"
3960
3961-#: ../src/rootmenu.c:597
3962+#: ../src/rootmenu.c:605
3963 #, c-format
3964 msgid "%s: unmatched '\"' in menu file"
3965 msgstr "%s: ebamäärane '\"' menüüfailis"
3966
3967-#: ../src/rootmenu.c:647
3968+#: ../src/rootmenu.c:655
3969 #, c-format
3970 msgid "%s: missing command"
3971 msgstr "%s: puuduv korraldus"
3972
3973-#: ../src/rootmenu.c:679
3974+#: ../src/rootmenu.c:687
3975 #, c-format
3976 msgid "invalid OPEN_MENU specification: %s"
3977 msgstr "vigane OPEN_MENU kirjeldus: %s"
3978
3979 #: ../src/rootmenu.c:738
3980 #, c-format
3981+msgid "%s:could not stat menu"
3982+msgstr "%s:menüü rekvisiite pole võimalik tuvastada"
3983+
3984+#: ../src/rootmenu.c:746
3985+#, c-format
3986 msgid "%s:could not stat menu:%s"
3987-msgstr "%s:ei õnnestu tuvastada menüü atribuute:%s"
3988+msgstr "%s:menüü rekvisiite pole võimalik tuvastada:%s"
3989
3990-#: ../src/rootmenu.c:756
3991+#: ../src/rootmenu.c:764
3992 #, c-format
3993 msgid "too many parameters in OPEN_MENU: %s"
3994-msgstr "liiga palju parameetreid OPEN_MENU's: %s"
3995+msgstr "liiga palju OPEN_MENU parameetreid: %s"
3996
3997-#: ../src/rootmenu.c:800
3998+#: ../src/rootmenu.c:808
3999 msgid ""
4000 "There are more than one WORKSPACE_MENU commands in the applications menu. "
4001 "Only one is allowed."
4002 msgstr ""
4003-"Rakenduste menüüs on rohkem kui üks WORKSPACE_MENU korraldus. Lubatud on "
4004-"ainult üks."
4005+"Rakenduste menüüs on mitu WORKSPACE_MENU korraldust. Lubatud on ainult üks."
4006
4007-#: ../src/rootmenu.c:834
4008+#: ../src/rootmenu.c:842
4009 msgid ""
4010 "There are more than one WINDOWS_MENU commands in the applications menu. Only "
4011 "one is allowed."
4012 msgstr ""
4013-"Rakenduste menüüs on rohkem kui üks WINDOWS_MENU korraldus. Lubatud on "
4014-"ainult üks."
4015+"Rakenduste menüüs on mitu WINDOWS_MENU korraldust. Lubatud on ainult üks."
4016
4017-#: ../src/rootmenu.c:839
4018+#: ../src/rootmenu.c:847
4019 msgid "Window List"
4020 msgstr "Akende nimekiri"
4021
4022-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
4023+#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904
4024 #, c-format
4025 msgid "%s:missing parameter for menu command \"%s\""
4026-msgstr "%s:puuduvad parameetrid menüükorraldusele \"%s\""
4027+msgstr "%s:menüükorraldusel \"%s\" puuduvad parameetrid"
4028
4029-#: ../src/rootmenu.c:964
4030+#: ../src/rootmenu.c:972
4031 #, c-format
4032 msgid "%s:unknown command \"%s\" in menu config."
4033-msgstr "%s:tundmatu käsk menüü seadistuses: \"%s\"."
4034+msgstr "%s:menüü seadistuses on tundmatu käsk \"%s\"."
4035
4036-#: ../src/rootmenu.c:972
4037+#: ../src/rootmenu.c:980
4038 #, c-format
4039 msgid "%s:can't add shortcut for entry \"%s\""
4040-msgstr "%s:ei õnnestu lisada kiirkorraldust kirjele \"%s\""
4041+msgstr "%s:kiirkorraldust pole võimalik kirjele \"%s\" lisada"
4042
4043-#: ../src/rootmenu.c:1109
4044+#: ../src/rootmenu.c:1117
4045 #, c-format
4046 msgid "%s:maximal line size exceeded in menu config: %s"
4047-msgstr "%s:maksimaalne rea pikkus ületatud menüü seadistuses: %s"
4048+msgstr "%s:menüü seadistustes on suurim rea pikkus ületatud: %s"
4049
4050-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
4051+#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336
4052 #, c-format
4053 msgid "%s:missing command in menu config: %s"
4054-msgstr "%s:puudub korraldus menüü seadistuses: %s"
4055+msgstr "%s:menüü seadistuses puudub korraldus: %s"
4056
4057-#: ../src/rootmenu.c:1161
4058+#: ../src/rootmenu.c:1169
4059 #, c-format
4060 msgid "%s:syntax error in menu file:END declaration missing"
4061-msgstr "%s:süntaksi viga menüüfaili: puudub lõputunnus END"
4062+msgstr "%s:menüüfaili süntaksi viga: puudub lõputunnus END"
4063
4064-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
4065+#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300
4066 msgid "could not make arguments for menu file preprocessor"
4067-msgstr "ei suuda luua argumente menüüfaili eeltöötlejale"
4068+msgstr "menüüfaili eeltöötlejale pole võimalik argumente luua"
4069
4070-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
4071+#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308
4072 #, c-format
4073 msgid "%s:could not open/preprocess menu file"
4074-msgstr "%s:ei suuda avada/eeltöödelda menüüfaili"
4075+msgstr "%s:menüüfaili pole võimalik avada või eeltöödelda"
4076
4077-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
4078+#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
4079 #, c-format
4080 msgid "%s:could not open menu file"
4081-msgstr "%s:menüüfaili avamine ebaõnnestus"
4082+msgstr "%s:menüüfaili pole võimalik avada"
4083
4084-#: ../src/rootmenu.c:1236
4085+#: ../src/rootmenu.c:1244
4086 #, c-format
4087 msgid "%s:invalid menu file. MENU command is missing"
4088 msgstr "%s:vigane menüüfail. Puudub MENU käsk"
4089
4090-#: ../src/rootmenu.c:1245
4091+#: ../src/rootmenu.c:1253
4092 msgid "error reading preprocessed menu data"
4093-msgstr "viga eelnevalt töödeldud menüüandmete lugemisel"
4094+msgstr "viga eeltöödeldud menüüandmete lugemisel"
4095
4096-#: ../src/rootmenu.c:1338
4097+#: ../src/rootmenu.c:1348
4098 #, c-format
4099 msgid "%s:no title given for the root menu"
4100 msgstr "%s:juurmenüü pealkiri on puudu"
4101
4102-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
4103+#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553
4104 #, c-format
4105 msgid "out of memory while constructing directory menu %s"
4106-msgstr "mälu lõppes menüü %s loomise käigus"
4107+msgstr "menüü %s loomise käigus lõppes mälu"
4108
4109-#: ../src/rootmenu.c:1439
4110+#: ../src/rootmenu.c:1449
4111 #, c-format
4112 msgid "%s:could not stat file \"%s\" in menu directory"
4113-msgstr "%s:ei õnnestu lugeda faili \"%s\" atribuute menüükataloogis"
4114+msgstr "%s:faili \"%s\" rekvisiite pole menüükataloogist võimalik lugeda"
4115
4116-#: ../src/rootmenu.c:1597
4117+#: ../src/rootmenu.c:1607
4118 msgid "Commands"
4119 msgstr "Korraldused"
4120
4121-#: ../src/rootmenu.c:1600
4122+#: ../src/rootmenu.c:1610
4123 msgid "Restart"
4124 msgstr "Taaskäivitamine"
4125
4126-#: ../src/rootmenu.c:1601
4127+#: ../src/rootmenu.c:1611
4128 msgid "Exit..."
4129 msgstr "Lõpetamine..."
4130
4131-#: ../src/rootmenu.c:1646
4132+#: ../src/rootmenu.c:1656
4133 #, c-format
4134 msgid "could not find menu file \"%s\" referenced in WMRootMenu"
4135-msgstr "ei õnnestu leida menüüfaili \"%s\", millele viitab WMRootMenu"
4136+msgstr "WMRootMenu poolt viidatud menüüfaili \"%s\" pole võimalik leida"
4137
4138-#: ../src/rootmenu.c:1653
4139+#: ../src/rootmenu.c:1663
4140 #, c-format
4141 msgid "could not access menu \"%s\" referenced in WMRootMenu"
4142-msgstr "ei õnnestu ligi pääseda menüüle \"%s\", millele viitab WMRootMenu"
4143+msgstr "WMRootMenu poolt viidatud menüüle \"%s\" pole võimalik ligi pääseda"
4144
4145-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
4146+#: ../src/rootmenu.c:1674
4147+#, c-format
4148+msgid ""
4149+"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
4150+"not be found "
4151+msgstr ""
4152+"WMRootMenu poolt viidatud vaikimisi kasutatavat menüüfaili \"%s\" pole "
4153+"võimalik leida"
4154+
4155+#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773
4156 #, c-format
4157 msgid "%s:format error in root menu configuration \"%s\""
4158-msgstr "%s:vormingu viga juurmenüü häälestuses \"%s\""
4159+msgstr "%s:vormingu viga juurmenüü seadistuses \"%s\""
4160
4161-#: ../src/rootmenu.c:1851
4162+#: ../src/rootmenu.c:1855
4163 msgid ""
4164 "The applications menu could not be loaded. Look at the console output for a "
4165 "detailed description of the errors."
4166 msgstr ""
4167-"Ei õnnestu lugeda rakenduste menüüd. Põhjalikuma vigade kirjelduse "
4168+"Rakenduste menüüd pole võimalik lugeda. Põhjalikuma vigade kirjelduse "
4169 "lugemiseks vaata konsooliväljundit."
4170
4171-#: ../src/screen.c:740
4172+#: ../src/screen.c:709
4173 #, c-format
4174 msgid "could not initialize graphics library context: %s"
4175-msgstr "ei õnnesta lähtestada graafikateegi konteksti: %s"
4176+msgstr "graafikateegi konteksti pole võimalik lähtestada: %s"
4177
4178-#: ../src/screen.c:771
4179-msgid "could not do initialization of WINGs widget set"
4180-msgstr ""
4181+#: ../src/screen.c:737
4182+msgid "could not initialize WINGs widget set"
4183+msgstr "WINGs vidinakomplekti pole võimalik lähtestada"
4184
4185-#: ../src/screen.c:1139
4186+#: ../src/screen.c:1148
4187 #, c-format
4188 msgid "could not save session state in %s"
4189-msgstr "ei õnnestu salvestada seansi olekut %s"
4190+msgstr "seansi olekut %s pole võimalik salvestada"
4191
4192-#: ../src/session.c:183 ../src/wdefaults.c:588 ../src/winspector.c:454
4193+#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459
4194 #, c-format
4195 msgid "can't convert \"%s\" to boolean"
4196-msgstr "ei õnnestu \"%s\" teisendamine boolean väärtuseks"
4197+msgstr "väärtust \"%s\" pole võimalik tõeväärtuseks teisendada"
4198
4199-#: ../src/session.c:1021
4200+#: ../src/session.c:1018
4201 msgid "out of memory while saving session state"
4202-msgstr "mälu lõppes seansi oleku salvestamise käigus"
4203+msgstr "seansi oleku salvestamise käigus lõppes mälu"
4204
4205-#: ../src/session.c:1104
4206+#: ../src/session.c:1101
4207 msgid "end of memory while saving session state"
4208-msgstr "mälu lõpp seansi oleku salvestamise käigus"
4209+msgstr "seansi oleku salvestamise käigus lõppes mälu"
4210
4211 #. This is not fatal but can mean the session manager exited.
4212 #. * If the session manager exited normally we would get a
4213@@ -1368,156 +1339,87 @@
4214 #. * If the sm was the last client of session, then we'll die
4215 #. * anyway, otherwise we can continue doing our stuff.
4216 #.
4217-#: ../src/session.c:1242
4218+#: ../src/session.c:1239
4219 msgid "connection to the session manager was lost"
4220 msgstr "ühendus seansihalduriga on katkenud"
4221
4222-#: ../src/stacking.c:79
4223+#: ../src/stacking.c:81
4224 msgid "could not get window list!!"
4225-msgstr "ei õnnestu saada akende nimekirja!!"
4226+msgstr "akende nimekirja pole võimalik saada!!"
4227
4228-#: ../src/startup.c:202
4229+#: ../src/startup.c:194
4230 #, c-format
4231 msgid "internal X error: %s\n"
4232 msgstr "X'i sisemine viga: %s\n"
4233
4234-#: ../src/startup.c:260
4235-#, c-format
4236-msgid "got signal %i (%s) - restarting\n"
4237-msgstr "sain signaali %i (%s) - stardin uuesti\n"
4238-
4239-#: ../src/startup.c:262
4240-#, c-format
4241-msgid "got signal %i - restarting\n"
4242-msgstr "sain signaali %i - stardin uuesti\n"
4243-
4244-#: ../src/startup.c:272
4245-#, c-format
4246-msgid "got signal %i (%s) - rereading defaults\n"
4247-msgstr "sain signaali %i (%s) - loen vaikeväärtused uuesti\n"
4248-
4249-#: ../src/startup.c:274
4250-#, c-format
4251-msgid "got signal %i - rereading defaults\n"
4252-msgstr "sain signaali %i - loen vaikeväärtused uuesti\n"
4253-
4254-#: ../src/startup.c:284
4255-#, c-format
4256-msgid "got signal %i (%s) - exiting...\n"
4257-msgstr "sain signaali %i (%s) - lõpetan...\n"
4258-
4259-#: ../src/startup.c:286
4260-#, c-format
4261-msgid "got signal %i - exiting...\n"
4262-msgstr "sain signaali %i - lõpetan...\n"
4263-
4264-#: ../src/startup.c:329
4265-#, c-format
4266-msgid "got signal %i (%s)\n"
4267-msgstr "sain signaali %i (%s)\n"
4268-
4269-#: ../src/startup.c:331
4270-#, c-format
4271-msgid "got signal %i\n"
4272-msgstr "sain signaali %i\n"
4273-
4274-#: ../src/startup.c:342
4275-msgid ""
4276-"crashed while trying to do some post-crash cleanup. Aborting immediatelly."
4277-msgstr ""
4278-"järjekordne avarii ajal, mil tehti avariijärgseid puhastusi. Katkestan "
4279-"viivitamatult."
4280-
4281-#. we try to restart Window Maker
4282-#: ../src/startup.c:407
4283-msgid "trying to restart Window Maker..."
4284-msgstr "proovin taaskäivitada Window Maker'it..."
4285-
4286-#: ../src/startup.c:412
4287-msgid "trying to start alternate window manager..."
4288-msgstr "proovin käivitada alternatiivset aknahaldurit"
4289-
4290-#: ../src/startup.c:417
4291-msgid "failed to start alternate window manager. Aborting."
4292-msgstr "ei õnnestu käivitada alternatiivset aknahaldurit. Annan alla."
4293-
4294-#: ../src/startup.c:419
4295-msgid ""
4296-"a fatal error has occured, probably due to a bug. Please fill the included "
4297-"BUGFORM and report it."
4298-msgstr ""
4299-"aset on leidnud fataalne viga, arvatavasti programmi viga. Palun täida "
4300-"programmiga kaasa tulnud vearaport (BUGFORM) ja saada see programmi "
4301-"autoritele."
4302-
4303-#: ../src/startup.c:895
4304+#: ../src/startup.c:771
4305 #, c-format
4306 msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
4307 msgstr ""
4308-"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutan suurust "
4309-"16\n"
4310+"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutatakse "
4311+"suurust 16\n"
4312
4313-#: ../src/startup.c:923
4314+#: ../src/startup.c:800
4315 msgid "XKB is not supported. KbdModeLock is automatically disabled."
4316 msgstr "Puudub XKB tugi. KbdModeLock on automaatselt keelatud."
4317
4318-#: ../src/startup.c:942
4319+#: ../src/startup.c:819
4320 msgid "it seems that there is already a window manager running"
4321 msgstr "paistab, et mingi aknahaldur juba töötab"
4322
4323-#: ../src/startup.c:948
4324+#: ../src/startup.c:825
4325 #, c-format
4326 msgid "could not manage screen %i"
4327-msgstr "ei õnnestu hallata ekraani %i"
4328+msgstr "ekraani %i pole võimalik hallata"
4329
4330-#: ../src/startup.c:1016
4331+#: ../src/startup.c:884
4332 msgid "could not manage any screen"
4333-msgstr "ei õnnestu hallata ühtegi ekraani"
4334+msgstr "ühtegi ekraani pole võimalik hallata"
4335
4336-#: ../src/switchmenu.c:137
4337+#: ../src/switchmenu.c:145
4338 msgid "Windows"
4339 msgstr "Aknad"
4340
4341 #: ../src/texture.c:329 ../src/texture.c:371
4342 #, c-format
4343 msgid "image file \"%s\" used as texture could not be found."
4344-msgstr "ei õnnestu leida tekstuuriks kasutatavat pildifaili \"%s\"."
4345+msgstr "tekstuuriks kasutatavat pildifaili \"%s\" pole võimalik leida."
4346
4347 #: ../src/texture.c:335 ../src/texture.c:377
4348 #, c-format
4349 msgid "could not load texture pixmap \"%s\":%s"
4350-msgstr "ei õnnestu laadida tekstuuri pixmap faili \"%s\":%s"
4351+msgstr "tekstuuri pildifaili \"%s\" pole võimalik laadida:%s"
4352
4353 #: ../src/texture.c:437
4354 #, c-format
4355 msgid "library \"%s\" cound not be opened."
4356-msgstr "ei õnnestu avada teeki \"%s\""
4357+msgstr "teeki \"%s\" pole võimalik avada."
4358
4359 #: ../src/texture.c:446
4360 #, c-format
4361 msgid "function \"%s\" not found in library \"%s\""
4362-msgstr "ei leia funktsiooni \"%s\" teegist \"%s\""
4363+msgstr "funktsiooni \"%s\" pole teegist \"%s\" võimalik leida"
4364
4365 #: ../src/texture.c:453
4366 msgid "function textures not supported on this system, sorry."
4367-msgstr "tekstuurifunktsioon ei ole selles süsteemis toetatud."
4368+msgstr "tekstuurifunktsioon pole selles süsteemis toetatud. vabandust."
4369
4370 #: ../src/texture.c:598
4371 msgid "could not allocate image buffer"
4372-msgstr "ei õnnestu eraldada pildi puhvrit"
4373+msgstr "pildipuhvrit pole võimalik eraldada"
4374
4375 #: ../src/wdefaults.c:437
4376 #, c-format
4377 msgid "could not find icon file \"%s\""
4378-msgstr "ei õnnestu leida ikoonifaili \"%s\""
4379+msgstr "ikoonifaili \"%s\" pole võimalik leida"
4380
4381-#: ../src/window.c:2884 ../src/window.c:3023
4382+#: ../src/window.c:3041 ../src/window.c:3182
4383 msgid ""
4384 "the NumLock, ScrollLock or similar key seems to be turned on.\n"
4385 "Turn it off or some mouse actions and keyboard shortcuts will not work."
4386 msgstr ""
4387 "klahvid NumLock, ScrollLock (või sarnased) näivad olevat sisse lülitatud.\n"
4388-"Lülita need välja või muidu ei tööta mõned hiire toimingud ja klaviatuuri\n"
4389+"Lülita need välja või muidu ei tööta mõned hiiretoimingud ja klaviatuuri\n"
4390 "kiirkorraldused."
4391
4392 #: ../src/winmenu.c:125
4393@@ -1528,24 +1430,37 @@
4394 msgstr ""
4395 "Programm suletakse jõuga.\n"
4396 "Kõik salvestamata andmed lähevad kaotsi.\n"
4397-"Kas soovite seda teha?"
4398+"Kas soovid seda teha?"
4399
4400-#: ../src/winmenu.c:267 ../src/winmenu.c:276
4401+#: ../src/winmenu.c:268 ../src/winmenu.c:277
4402 msgid "Set Shortcut"
4403 msgstr "Määra kiirkorraldus"
4404
4405-#: ../src/winmenu.c:354 ../src/winmenu.c:399
4406+#: ../src/winmenu.c:355 ../src/winmenu.c:400
4407 msgid "could not create submenu for window menu"
4408 msgstr "ei õnnestu luua aknamenüü alammenüüd"
4409
4410-#: ../src/winmenu.c:403
4411+#: ../src/winmenu.c:404
4412 msgid "Keep on top"
4413 msgstr "Hoia esiplaanil"
4414
4415-#: ../src/winmenu.c:408
4416+#: ../src/winmenu.c:409
4417 msgid "Keep at bottom"
4418 msgstr "Hoia tagaplaanil"
4419
4420+#.
4421+#. * Warning: If you make some change that affects the order of the
4422+#. * entries, you must update the command #defines in the top of
4423+#. * this file.
4424+#.
4425+#: ../src/winmenu.c:437 ../src/winmenu.c:571
4426+msgid "Maximize"
4427+msgstr "Maksimeeri"
4428+
4429+#: ../src/winmenu.c:445 ../src/winmenu.c:557
4430+msgid "Miniaturize"
4431+msgstr "Minimeeri"
4432+
4433 #: ../src/winmenu.c:453 ../src/winmenu.c:588
4434 msgid "Shade"
4435 msgstr "Keri kokku"
4436@@ -1558,6 +1473,10 @@
4437 msgid "Select"
4438 msgstr "Vali"
4439
4440+#: ../src/winmenu.c:485
4441+msgid "Move To"
4442+msgstr "Teisalda"
4443+
4444 #: ../src/winmenu.c:490
4445 msgid "Attributes..."
4446 msgstr "Rekvisiidid..."
4447@@ -1566,89 +1485,97 @@
4448 msgid "Options"
4449 msgstr "Valikud"
4450
4451+#: ../src/winmenu.c:552
4452+msgid "Deminiaturize"
4453+msgstr "Ava aken"
4454+
4455+#: ../src/winmenu.c:566
4456+msgid "Unmaximize"
4457+msgstr "Taasta suurus"
4458+
4459 #: ../src/winmenu.c:583
4460 msgid "Unshade"
4461 msgstr "Keri lahti"
4462
4463-#: ../src/winspector.c:387
4464+#: ../src/winspector.c:392
4465 #, c-format
4466 msgid "Could not find icon \"%s\" specified for this window"
4467-msgstr "Ei õnnestu leida selle akna jaoks määratud ikooni \"%s\""
4468+msgstr "Selle akna jaoks määratud ikooni \"%s\" pole võimalik leida"
4469
4470-#: ../src/winspector.c:404
4471+#: ../src/winspector.c:409
4472 #, c-format
4473 msgid "Could not open specified icon \"%s\":%s"
4474-msgstr "Ei õnnestu avada kirjeldatud ikooni \"%s\":%s"
4475+msgstr "Kirjeldatud ikooni \"%s\" pole võimalik avada:%s"
4476
4477-#: ../src/winspector.c:1135
4478+#: ../src/winspector.c:1129
4479 #, c-format
4480 msgid "Inspecting %s.%s"
4481-msgstr "Vaatlen %s.%s"
4482+msgstr "%s.%s vaatlemine"
4483
4484-#: ../src/winspector.c:1161
4485+#: ../src/winspector.c:1155
4486 msgid "Click in the window you wish to inspect."
4487 msgstr "Kliki aknale, mida soovid vaadelda."
4488
4489-#: ../src/winspector.c:1200
4490+#: ../src/winspector.c:1194
4491 msgid ""
4492 "The configuration will apply to all\n"
4493 "windows that have their WM_CLASS\n"
4494 "property set to the above selected\n"
4495 "name, when saved."
4496 msgstr ""
4497-"Häälestuse salvestamisel laieneb see\n"
4498+"Seadistuste salvestamisel laieneb see\n"
4499 "kõigile akendele, mille WM_CLASS\n"
4500 "omadus on üks ülalloetletud nimedest."
4501
4502-#: ../src/winspector.c:1229
4503+#: ../src/winspector.c:1223
4504 msgid "Save"
4505 msgstr "Salvesta"
4506
4507-#: ../src/winspector.c:1237
4508+#: ../src/winspector.c:1231
4509 msgid "Apply"
4510 msgstr "Rakenda"
4511
4512-#: ../src/winspector.c:1243
4513+#: ../src/winspector.c:1237
4514 msgid "Reload"
4515 msgstr "Taasta"
4516
4517-#: ../src/winspector.c:1252 ../src/winspector.c:1262
4518+#: ../src/winspector.c:1246 ../src/winspector.c:1256
4519 msgid "Window Specification"
4520 msgstr "Akna kirjeldus"
4521
4522-#: ../src/winspector.c:1253
4523+#: ../src/winspector.c:1247
4524 msgid "Window Attributes"
4525 msgstr "Akna rekvisiidid"
4526
4527-#: ../src/winspector.c:1254
4528+#: ../src/winspector.c:1248
4529 msgid "Advanced Options"
4530 msgstr "Laiendatud valikud"
4531
4532-#: ../src/winspector.c:1255
4533+#: ../src/winspector.c:1249
4534 msgid "Icon and Initial Workspace"
4535 msgstr "Ikoon ja töölaud"
4536
4537-#: ../src/winspector.c:1256
4538+#: ../src/winspector.c:1250
4539 msgid "Application Specific"
4540 msgstr "Rakendusele omane"
4541
4542-#: ../src/winspector.c:1270
4543+#: ../src/winspector.c:1264
4544 msgid "Defaults for all windows"
4545 msgstr "Vaikimisi kõigile akendele"
4546
4547-#: ../src/winspector.c:1324
4548+#: ../src/winspector.c:1318
4549 msgid "Select window"
4550 msgstr "Vali aken"
4551
4552-#: ../src/winspector.c:1338
4553+#: ../src/winspector.c:1332
4554 msgid "Attributes"
4555 msgstr "Rekvisiidid"
4556
4557-#: ../src/winspector.c:1349
4558+#: ../src/winspector.c:1343
4559 msgid "Disable titlebar"
4560 msgstr "Tiitliriba peidus"
4561
4562-#: ../src/winspector.c:1351
4563+#: ../src/winspector.c:1345
4564 msgid ""
4565 "Remove the titlebar of this window.\n"
4566 "To access the window commands menu of a window\n"
4567@@ -1656,298 +1583,304 @@
4568 "equivalent shortcut, if you changed the default\n"
4569 "settings)."
4570 msgstr ""
4571-"Eemaldab akna tiitliriba. Ilma tiitliribata\n"
4572-"akna parameetreid saab muuta,\n"
4573-"vajutadades Control+Esc (või kui\n"
4574-"kontrollklahve on muudetud, siis sellele\n"
4575+"Aknalt tiitliriba eemaldamine. Ilma\n"
4576+"tiitliribata akna parameetreid saab\n"
4577+"muuta,vajutadades Control+Esc (või kui\n"
4578+"juhtklahve on muudetud, siis sellele\n"
4579 "vastavat klahvikombinatsiooni)."
4580
4581-#: ../src/winspector.c:1358
4582+#: ../src/winspector.c:1352
4583 msgid "Disable resizebar"
4584 msgstr "Suuruse muutmise riba peidus"
4585
4586-#: ../src/winspector.c:1360
4587+#: ../src/winspector.c:1354
4588 msgid "Remove the resizebar of this window."
4589-msgstr "Eemaldab riba, mille abil muudetakse akna suurust."
4590+msgstr "Akna suuruse muutmise riba eemaldamine sellelt aknalt."
4591
4592-#: ../src/winspector.c:1363
4593+#: ../src/winspector.c:1357
4594 msgid "Disable close button"
4595 msgstr "Sulgemisnupp peidus"
4596
4597-#: ../src/winspector.c:1365
4598+#: ../src/winspector.c:1359
4599 msgid "Remove the `close window' button of this window."
4600-msgstr "Eemaldab sulgemisnupu akna tiitliribalt."
4601+msgstr "Akna sulgemisnupu eemaldamine selle akna tiitliribalt."
4602
4603-#: ../src/winspector.c:1368
4604+#: ../src/winspector.c:1362
4605 msgid "Disable miniaturize button"
4606 msgstr "Minimeerimisnupp peidus"
4607
4608-#: ../src/winspector.c:1370
4609+#: ../src/winspector.c:1364
4610 msgid "Remove the `miniaturize window' button of the window."
4611-msgstr "Eemaldab minimeerimisnupu akna tiitliribalt."
4612+msgstr "Akna minimeerimisnupu eemaldamine selle akna tiitliribalt."
4613
4614-#: ../src/winspector.c:1373
4615+#: ../src/winspector.c:1367
4616 msgid "Disable border"
4617 msgstr "Raam peidus"
4618
4619-#: ../src/winspector.c:1375
4620+#: ../src/winspector.c:1369
4621 msgid "Remove the 1 pixel black border around the window."
4622-msgstr "Eemaldab akna ümbert ühepikslise musta raami."
4623+msgstr "Akna ümbert ühepikslise musta raami eemaldamine."
4624
4625-#: ../src/winspector.c:1378
4626+#: ../src/winspector.c:1372
4627 msgid "Keep on top (floating)"
4628-msgstr "Hoia esiplaanil"
4629+msgstr "Hoitakse esiplaanil (ujuv)"
4630
4631-#: ../src/winspector.c:1380
4632+#: ../src/winspector.c:1374
4633 msgid ""
4634 "Keep the window over other windows, not allowing\n"
4635 "them to cover it."
4636-msgstr "Hoiab akent teiste akende suhtes esiplaanil."
4637+msgstr "Akna hoidmine teiste akende peal."
4638
4639-#: ../src/winspector.c:1384
4640+#: ../src/winspector.c:1378
4641+#, fuzzy
4642 msgid "Keep at bottom (sunken)"
4643-msgstr "Hoia tagaplaanil"
4644+msgstr "Hoitakse tagaplaanil"
4645
4646-#: ../src/winspector.c:1386
4647+#: ../src/winspector.c:1380
4648 msgid "Keep the window under all other windows."
4649-msgstr "Hoiab akent kõigi teiste akende taga."
4650+msgstr "Akna hoidmine kõigi teiste akende taga."
4651
4652-#: ../src/winspector.c:1391
4653+#: ../src/winspector.c:1385
4654 msgid "Make window present in all workspaces."
4655-msgstr "Näitab akent kõigil töölaudadel."
4656+msgstr "Aken on kõigil töölaudadel."
4657
4658-#: ../src/winspector.c:1394
4659+#: ../src/winspector.c:1388
4660 msgid "Start miniaturized"
4661-msgstr "Käivita minimeerituna"
4662+msgstr "Käivitatakse minimeerituna"
4663
4664-#: ../src/winspector.c:1396
4665+#: ../src/winspector.c:1390
4666 msgid ""
4667 "Make the window be automatically miniaturized when it's\n"
4668 "first shown."
4669-msgstr "Programmi käivitamise hetkel minimeerib akna."
4670+msgstr ""
4671+"Programmi esmasel näitamisel minimeeritakse\n"
4672+"aken automaatselt."
4673
4674-#: ../src/winspector.c:1400
4675+#: ../src/winspector.c:1394
4676 msgid "Start maximized"
4677 msgstr "Käivita maksimeerituna"
4678
4679-#: ../src/winspector.c:1402
4680+#: ../src/winspector.c:1396
4681 msgid ""
4682 "Make the window be automatically maximized when it's\n"
4683 "first shown."
4684-msgstr "Programmi käivitamise hetkel maksimeerib akna."
4685+msgstr ""
4686+"Programmi esmasel näitamisel maksimeeritakse\n"
4687+"aken automaatselt."
4688
4689-#: ../src/winspector.c:1406
4690+#: ../src/winspector.c:1400
4691 msgid "Full screen maximization"
4692-msgstr "Maksimeeri üle kogu ekraani"
4693+msgstr "Maksimeeritakse üle kogu ekraani"
4694
4695-#: ../src/winspector.c:1408
4696+#: ../src/winspector.c:1402
4697 msgid ""
4698 "Make the window use the whole screen space when it's\n"
4699 "maximized. The titlebar and resizebar will be moved\n"
4700 "to outside the screen."
4701 msgstr ""
4702-"Lubab akent maksimeerida kogu ekraani ulatuses.\n"
4703-"Kui lubatud, siis akna maksimeerimise korral\n"
4704-"jäävad akna tiitliriba ja suuruse muutmise riba\n"
4705-"väljapoole ekraani piirkonda."
4706+"Akent lubatakse suurendada kogu ekraani ulatuses.\n"
4707+"Akna tiitliriba ja suuruse muutmise riba jäävad\n"
4708+"siis väljaspoole ekraani piirkonda."
4709
4710-#: ../src/winspector.c:1425
4711+#: ../src/winspector.c:1419
4712 msgid "Advanced"
4713 msgstr "Laiendatud võimalused"
4714
4715-#: ../src/winspector.c:1442
4716+#: ../src/winspector.c:1436
4717 msgid "Do not bind keyboard shortcuts"
4718 msgstr "Kiirklahvidele ei reageerita"
4719
4720-#: ../src/winspector.c:1444
4721+#: ../src/winspector.c:1438
4722 msgid ""
4723 "Do not bind keyboard shortcuts from Window Maker\n"
4724 "when this window is focused. This will allow the\n"
4725 "window to receive all key combinations regardless\n"
4726 "of your shortcut configuration."
4727 msgstr ""
4728-"Keelab fookuses oleval aknal reageerimase\n"
4729+"Fookuses oleval aknal keelatakse reageerimast\n"
4730 "Window Maker'i kiirklahvidele. See võimaldab\n"
4731 "aknal vastu võtta kõiki klaviatuurilt tulevaid\n"
4732 "koode."
4733
4734-#: ../src/winspector.c:1450
4735+#: ../src/winspector.c:1444
4736 msgid "Do not bind mouse clicks"
4737 msgstr "Hiirevajutustele ei reageerita"
4738
4739-#: ../src/winspector.c:1452
4740+#: ../src/winspector.c:1446
4741 msgid ""
4742 "Do not bind mouse actions, such as `Alt'+drag\n"
4743-"in the window (when alt is the modifier you haveconfigured)."
4744+"in the window (when alt is the modifier you have\n"
4745+"configured)."
4746 msgstr ""
4747-"Keelab aknal reageerimast hiiretoimingutele.\n"
4748+"Aknal keelatakse reageerimast hiiretoimingutele.\n"
4749 "Näiteks `Alt'+lohistamine (kui alt on määratud\n"
4750 "muuteklahviks)."
4751
4752-#: ../src/winspector.c:1457
4753+#: ../src/winspector.c:1451
4754 msgid "Do not show in the window list"
4755 msgstr "Akende nimekirjas ei näidata"
4756
4757-#: ../src/winspector.c:1459
4758+#: ../src/winspector.c:1453
4759 msgid "Do not list the window in the window list menu."
4760-msgstr "Keelab akna nime näitamise akende nimekirjas."
4761+msgstr "Akna nime ei näidata akende nimekirjas."
4762
4763-#: ../src/winspector.c:1462
4764+#: ../src/winspector.c:1456
4765 msgid "Do not let it take focus"
4766 msgstr "Akna fokuseerimine keelatud"
4767
4768-#: ../src/winspector.c:1464
4769+#: ../src/winspector.c:1458
4770 msgid ""
4771 "Do not let the window take keyboard focus when you\n"
4772 "click on it."
4773 msgstr ""
4774-"Keelab akna fokuseerimise. Aknale ei\n"
4775+"Akna fokuseerimine on keelatud. Aknale ei\n"
4776 "mõju klaviatuurilt saabuvad vajutused."
4777
4778-#: ../src/winspector.c:1468
4779+#: ../src/winspector.c:1462
4780 msgid "Keep inside screen"
4781 msgstr "Hoia ekraani sees"
4782
4783-#: ../src/winspector.c:1470
4784+#: ../src/winspector.c:1464
4785 msgid ""
4786 "Do not allow the window to move itself completely\n"
4787 "outside the screen. For bug compatibility.\n"
4788 msgstr ""
4789-"Keelab akna liigutamise\n"
4790-"väljapoole ekraani pinda.\n"
4791+"Aknent ei saa liigutada\n"
4792+"väljaspoole ekraani pinda.\n"
4793
4794-#: ../src/winspector.c:1474
4795+#: ../src/winspector.c:1468
4796 msgid "Ignore 'Hide Others'"
4797-msgstr "Eira käsku 'Peida teised aknad'"
4798+msgstr "Käsu 'Peida teised aknad' eiramine"
4799
4800-#: ../src/winspector.c:1476
4801+#: ../src/winspector.c:1470
4802 msgid ""
4803 "Do not hide the window when issuing the\n"
4804 "`HideOthers' command."
4805 msgstr ""
4806-"Keelab reageerimise käsule\n"
4807-"\"Peida teised aknad\"."
4808+"Akent ei peideta käsu\n"
4809+"\"Peida teised aknad\" puhul."
4810
4811-#: ../src/winspector.c:1480
4812+#: ../src/winspector.c:1474
4813 msgid "Ignore 'Save Session'"
4814-msgstr "Eira seansi salvestamist"
4815+msgstr "Seansi salvestamist eiratakse"
4816
4817-#: ../src/winspector.c:1482
4818+#: ../src/winspector.c:1476
4819 msgid ""
4820 "Do not save the associated application in the\n"
4821 "session's state, so that it won't be restarted\n"
4822 "together with other applications when Window Maker\n"
4823 "starts."
4824 msgstr ""
4825-"Keelab akna andmete salvestamise seansi\n"
4826-"andmetesse. Rakendust ei käivitata koos\n"
4827-"seansi koosseisu kuuluvate akendega."
4828+"Akna andmeid ei salvestata seansi\n"
4829+"andmetesse ja seetõttu ei käivitata\n"
4830+"rakendust koos seansi koosseisu\n"
4831+"kuuluvate akendega."
4832
4833-#: ../src/winspector.c:1488
4834+#: ../src/winspector.c:1482
4835 msgid "Emulate application icon"
4836-msgstr "Emuleeri rakenduse ikooni"
4837+msgstr "Rakenduse ikooni emuleeritakse"
4838
4839-#: ../src/winspector.c:1490
4840+#: ../src/winspector.c:1484
4841 msgid ""
4842 "Make this window act as an application that provides\n"
4843 "enough information to Window Maker for a dockable\n"
4844 "application icon to be created."
4845-msgstr "Loob aknale dokitava rakenduse ikooni."
4846+msgstr ""
4847+"Aknale luuakse dokitava rakenduse ikoon, mille alusel\n"
4848+"Window Maker on suuteline looma rakenduse ikooni."
4849
4850-#: ../src/winspector.c:1496
4851+#: ../src/winspector.c:1490
4852 msgid "Disable language button"
4853 msgstr "Keelenupp peidus"
4854
4855-#: ../src/winspector.c:1498
4856+#: ../src/winspector.c:1492
4857 msgid "Remove the `toggle language' button of the window."
4858 msgstr ""
4859-"Eemaldab keele sisse- ja väljalülitamise\n"
4860-"nupu akna tiitliribalt."
4861+"Keele sisse- ja väljalülitamise\n"
4862+"nupp on akna tiitliribalt eemaldatud."
4863
4864-#: ../src/winspector.c:1515
4865+#: ../src/winspector.c:1509
4866 msgid "Miniwindow Image"
4867 msgstr "Pisiakna pilt"
4868
4869-#: ../src/winspector.c:1542
4870+#: ../src/winspector.c:1536
4871 msgid "Icon filename:"
4872 msgstr "Ikoonifaili nimi:"
4873
4874-#: ../src/winspector.c:1555
4875+#: ../src/winspector.c:1549
4876 msgid "Ignore client supplied icon"
4877-msgstr "Eira kliendi enda ikooni"
4878+msgstr "Kliendi enda ikooni eiramine"
4879
4880-#: ../src/winspector.c:1562
4881+#: ../src/winspector.c:1556
4882 msgid "Initial Workspace"
4883 msgstr "Töölaud, millel käivitatakse"
4884
4885-#: ../src/winspector.c:1564
4886+#: ../src/winspector.c:1558
4887 msgid "The workspace to place the window when it'sfirst shown."
4888 msgstr "Töölaua nimi, mille peal akent esimest korda näidatakse."
4889
4890-#: ../src/winspector.c:1570
4891+#: ../src/winspector.c:1564
4892 msgid "Nowhere in particular"
4893 msgstr "Ei oma tähtsust"
4894
4895-#: ../src/winspector.c:1588
4896+#: ../src/winspector.c:1582
4897 msgid "Application Attributes"
4898 msgstr "Rakenduse rekvisiidid"
4899
4900-#: ../src/winspector.c:1599
4901+#: ../src/winspector.c:1593
4902 msgid "Start hidden"
4903 msgstr "Käivita peidetuna"
4904
4905-#: ../src/winspector.c:1601
4906+#: ../src/winspector.c:1595
4907 msgid "Automatically hide application when it's started."
4908-msgstr "Peidab akna programmi käivitamise hetkel."
4909+msgstr "Akna peitmine rakenduse käivitamise hetkel."
4910
4911-#: ../src/winspector.c:1604
4912+#: ../src/winspector.c:1598
4913 msgid "No application icon"
4914 msgstr "Rakenduse ikoon peidus"
4915
4916-#: ../src/winspector.c:1606
4917+#: ../src/winspector.c:1600
4918 msgid ""
4919 "Disable the application icon for the application.\n"
4920 "Note that you won't be able to dock it anymore,\n"
4921 "and any icons that are already docked will stop\n"
4922 "working correctly."
4923 msgstr ""
4924-"Keelab rakenduse ikooni. Keelamise korral ei ole\n"
4925-"võimalik rakendust dokkida ja kõik selle rakenduse\n"
4926-"juba dokitud ikoonid ei toimi enam korrektselt."
4927+"Rakenduse ikooni keelamine. Sel juhul pole\n"
4928+"rakendust võimalik dokkida ja kõik selle\n"
4929+"rakenduse juba dokitud ikoonid ei toimi enam\n"
4930+"korrektselt."
4931
4932-#: ../src/winspector.c:1612
4933+#: ../src/winspector.c:1606
4934 msgid "Shared application icon"
4935 msgstr "Rakenduse ikoon jagatud"
4936
4937-#: ../src/winspector.c:1614
4938+#: ../src/winspector.c:1608
4939 msgid ""
4940 "Use a single shared application icon for all of\n"
4941 "the instances of this application.\n"
4942 msgstr ""
4943-"Kasutab ühte jagatud ikooni kõigi\n"
4944+"Ühe jagatud ikooni kasutamine kõigi\n"
4945 "rakenduse instantside jaoks.\n"
4946
4947-#: ../src/wmspec.c:277
4948-msgid "out of memory while updating wm hints"
4949-msgstr "mälu lõppes wm vihjete uuendamise käigus"
4950-
4951-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
4952+#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302
4953 #, c-format
4954 msgid "Workspace %i"
4955 msgstr "Töölaud %i"
4956
4957-#: ../src/workspace.c:926
4958+#: ../src/workspace.c:1352
4959 msgid "Workspaces"
4960 msgstr "Töölauad"
4961
4962-#: ../src/workspace.c:928
4963+#: ../src/workspace.c:1354
4964 msgid "could not create Workspace menu"
4965-msgstr "ei õnnestu luua töölaua menüüd"
4966+msgstr "töölaua menüüd pole võimalik luua"
4967
4968-#: ../src/workspace.c:935
4969+#: ../src/workspace.c:1361
4970 msgid "New"
4971 msgstr "Uus"
4972
4973-#: ../src/workspace.c:936
4974+#: ../src/workspace.c:1362
4975 msgid "Destroy Last"
4976 msgstr "Eemalda viimane"
4977+
4978diff -Nur WindowMaker-0.92.0.orig/src/actions.c WindowMaker-0.92.0/src/actions.c
4979--- WindowMaker-0.92.0.orig/src/actions.c 2005-07-03 19:25:14.000000000 +0200
4980+++ WindowMaker-0.92.0/src/actions.c 2005-08-23 01:23:41.000000000 +0200
4981@@ -365,7 +365,8 @@
4982 void
4983 wMaximizeWindow(WWindow *wwin, int directions)
4984 {
4985- int new_width, new_height, new_x, new_y;
4986+ int new_x, new_y;
4987+ unsigned int new_width, new_height;
4988 int changed_h, changed_v, shrink_h, shrink_v;
4989 WArea usableArea, totalArea;
4990
4991diff -Nur WindowMaker-0.92.0.orig/src/event.c WindowMaker-0.92.0/src/event.c
4992--- WindowMaker-0.92.0.orig/src/event.c 2005-03-13 01:13:55.000000000 +0100
4993+++ WindowMaker-0.92.0/src/event.c 2005-12-07 20:22:09.000000000 +0100
4994@@ -559,6 +559,10 @@
4995 wwin->flags.skip_next_animation = 1;
4996 wIconifyWindow(wwin);
4997 }
4998+ if (wwin->flags.fullscreen) {
4999+ wwin->flags.fullscreen = 0;
5000+ wFullscreenWindow(wwin);
5001+ }
5002 if (wwin->flags.hidden) {
5003 WApplication *wapp = wApplicationOf(wwin->main_window);
5004
5005diff -Nur WindowMaker-0.92.0.orig/src/icon.c WindowMaker-0.92.0/src/icon.c
5006--- WindowMaker-0.92.0.orig/src/icon.c 2005-03-11 23:27:58.000000000 +0100
5007+++ WindowMaker-0.92.0/src/icon.c 2005-08-23 00:18:46.000000000 +0200
5008@@ -651,7 +651,7 @@
5009 if (icon->icon_win!=None) {
5010 XWindowAttributes attr;
5011 int resize=0;
5012- int width, height, depth;
5013+ unsigned int width, height, depth;
5014 int theight;
5015 Pixmap pixmap;
5016
5017diff -Nur WindowMaker-0.92.0.orig/src/misc.c WindowMaker-0.92.0/src/misc.c
5018--- WindowMaker-0.92.0.orig/src/misc.c 2004-11-11 14:31:47.000000000 +0100
5019+++ WindowMaker-0.92.0/src/misc.c 2005-08-23 00:46:24.000000000 +0200
5020@@ -1128,7 +1128,7 @@
5021 void
5022 SendHelperMessage(WScreen *scr, char type, int workspace, char *msg)
5023 {
5024- unsigned char *buffer;
5025+ char *buffer;
5026 int len;
5027 int i;
5028 char buf[16];
5029diff -Nur WindowMaker-0.92.0.orig/src/moveres.c WindowMaker-0.92.0/src/moveres.c
5030--- WindowMaker-0.92.0.orig/src/moveres.c 2004-10-24 21:36:09.000000000 +0200
5031+++ WindowMaker-0.92.0/src/moveres.c 2005-08-23 01:27:24.000000000 +0200
5032@@ -1471,7 +1471,7 @@
5033
5034 ww=w;wh=h;
5035 wh-=vert_border;
5036- wWindowConstrainSize(wwin, &ww, &wh);
5037+ wWindowConstrainSize(wwin, (unsigned int*)&ww, (unsigned int*)&wh);
5038 wh+=vert_border;
5039
5040 if (wPreferences.ws_cycle){
5041@@ -2070,7 +2070,7 @@
5042 rh += dh;
5043 fw = rw;
5044 fh = rh - vert_border;
5045- wWindowConstrainSize(wwin, &fw, &fh);
5046+ wWindowConstrainSize(wwin, (unsigned int*)&fw, (unsigned int*)&fh);
5047 fh += vert_border;
5048 if (res & LEFT)
5049 fx = rx2 - fw + 1;
5050diff -Nur WindowMaker-0.92.0.orig/src/properties.c WindowMaker-0.92.0/src/properties.c
5051--- WindowMaker-0.92.0.orig/src/properties.c 2004-10-14 23:11:52.000000000 +0200
5052+++ WindowMaker-0.92.0/src/properties.c 2005-08-23 00:19:58.000000000 +0200
5053@@ -234,8 +234,8 @@
5054 if (image->format == RRGBAFormat) {
5055 memcpy(&tmp[4], image->data, image->width*image->height*4);
5056 } else {
5057- char *ptr = tmp+4;
5058- char *src = image->data;
5059+ char *ptr = (char*)(tmp+4);
5060+ char *src = (char*)image->data;
5061
5062 for (y = 0; y < image->height; y++) {
5063 for (x = 0; x < image->width; x++) {
5064diff -Nur WindowMaker-0.92.0.orig/src/startup.c WindowMaker-0.92.0/src/startup.c
5065--- WindowMaker-0.92.0.orig/src/startup.c 2005-03-12 02:11:30.000000000 +0100
5066+++ WindowMaker-0.92.0/src/startup.c 2005-08-23 00:20:16.000000000 +0200
5067@@ -25,6 +25,7 @@
5068 #include <stdio.h>
5069 #include <stdlib.h>
5070 #include <unistd.h>
5071+#include <string.h>
5072 #include <errno.h>
5073 #include <signal.h>
5074 #include <sys/wait.h>
5075diff -Nur WindowMaker-0.92.0.orig/src/switchpanel.c WindowMaker-0.92.0/src/switchpanel.c
5076--- WindowMaker-0.92.0.orig/src/switchpanel.c 2004-10-30 09:16:04.000000000 +0200
5077+++ WindowMaker-0.92.0/src/switchpanel.c 2006-01-22 19:08:39.000000000 +0100
5078@@ -501,6 +501,7 @@
5079
5080 if (!panel->bg) {
5081 WMFrame *frame = WMCreateFrame(panel->win);
5082+ WMColor *darkGray = WMDarkGrayColor(scr->wmscreen);
5083 WMSetFrameRelief(frame, WRSimple);
5084 WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0);
5085
5086@@ -508,10 +509,11 @@
5087 WMResizeWidget(panel->label, width, LABEL_HEIGHT);
5088 WMMoveWidget(panel->label, BORDER_SPACE, BORDER_SPACE+ICON_TILE_SIZE+5);
5089 WMSetLabelRelief(panel->label, WRSimple);
5090- WMSetWidgetBackgroundColor(panel->label, WMDarkGrayColor(scr->wmscreen));
5091+ WMSetWidgetBackgroundColor(panel->label, darkGray);
5092 WMSetLabelFont(panel->label, panel->font);
5093 WMSetLabelTextColor(panel->label, panel->white);
5094
5095+ WMReleaseColor(darkGray);
5096 height+= 5;
5097 }
5098
5099@@ -604,6 +606,8 @@
5100 RReleaseImage(panel->bg);
5101 if (panel->font)
5102 WMReleaseFont(panel->font);
5103+ if (panel->white)
5104+ WMReleaseColor(panel->white);
5105 wfree(panel);
5106 }
5107
5108diff -Nur WindowMaker-0.92.0.orig/src/window.c WindowMaker-0.92.0/src/window.c
5109--- WindowMaker-0.92.0.orig/src/window.c 2005-07-01 02:56:11.000000000 +0200
5110+++ WindowMaker-0.92.0/src/window.c 2005-08-23 01:20:14.000000000 +0200
5111@@ -2043,10 +2043,10 @@
5112 *----------------------------------------------------------------------
5113 */
5114 void
5115-wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight)
5116+wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight)
5117 {
5118- int width = *nwidth;
5119- int height = *nheight;
5120+ int width = (int)*nwidth;
5121+ int height = (int)*nheight;
5122 int winc = 1;
5123 int hinc = 1;
5124 int minW = 1, minH = 1;
5125@@ -2143,8 +2143,8 @@
5126
5127
5128 void
5129-wWindowCropSize(WWindow *wwin, int maxW, int maxH,
5130- int *width, int *height)
5131+wWindowCropSize(WWindow *wwin, unsigned int maxW, unsigned int maxH,
5132+ unsigned int *width, unsigned int *height)
5133 {
5134 int baseW = 0, baseH = 0;
5135 int winc = 1, hinc = 1;
5136diff -Nur WindowMaker-0.92.0.orig/src/window.h WindowMaker-0.92.0/src/window.h
5137--- WindowMaker-0.92.0.orig/src/window.h 2005-07-01 02:05:43.000000000 +0200
5138+++ WindowMaker-0.92.0/src/window.h 2005-08-23 01:20:31.000000000 +0200
5139@@ -388,9 +388,9 @@
5140 void wWindowUnfocus(WWindow *wwin);
5141
5142 void wWindowUpdateName(WWindow *wwin, char *newTitle);
5143-void wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight);
5144-void wWindowCropSize(WWindow *wwin, int maxw, int maxh,
5145- int *nwidth, int *nheight);
5146+void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight);
5147+void wWindowCropSize(WWindow *wwin, unsigned int maxw, unsigned int maxh,
5148+ unsigned int *nwidth, unsigned int *nheight);
5149 void wWindowConfigure(WWindow *wwin, int req_x, int req_y,
5150 int req_width, int req_height);
5151
5152diff -Nur WindowMaker-0.92.0.orig/src/wmspec.c WindowMaker-0.92.0/src/wmspec.c
5153--- WindowMaker-0.92.0.orig/src/wmspec.c 2005-05-15 18:41:09.000000000 +0200
5154+++ WindowMaker-0.92.0/src/wmspec.c 2006-01-22 18:28:21.000000000 +0100
5155@@ -35,6 +35,7 @@
5156
5157 #include <X11/Xlib.h>
5158 #include <X11/Xatom.h>
5159+#include <X11/Xarch.h>
5160 #include <string.h>
5161
5162 #include "WindowMaker.h"
5163@@ -70,22 +71,22 @@
5164 static Atom net_current_desktop;
5165 static Atom net_desktop_names;
5166 static Atom net_active_window;
5167-static Atom net_workarea; /* XXX: not xinerama compatible */
5168+static Atom net_workarea; /* XXX: not xinerama compatible */
5169 static Atom net_supporting_wm_check;
5170-static Atom net_virtual_roots; /* N/A */
5171-static Atom net_desktop_layout; /* XXX */
5172+static Atom net_virtual_roots; /* N/A */
5173+static Atom net_desktop_layout; /* XXX */
5174 static Atom net_showing_desktop;
5175
5176 /* Other Root Window Messages */
5177 static Atom net_close_window;
5178-static Atom net_moveresize_window; /* TODO */
5179-static Atom net_wm_moveresize; /* TODO */
5180+static Atom net_moveresize_window; /* TODO */
5181+static Atom net_wm_moveresize; /* TODO */
5182
5183 /* Application Window Properties */
5184 static Atom net_wm_name;
5185-static Atom net_wm_visible_name; /* TODO (unnecessary?) */
5186+static Atom net_wm_visible_name; /* TODO (unnecessary?) */
5187 static Atom net_wm_icon_name;
5188-static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
5189+static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
5190 static Atom net_wm_desktop;
5191 static Atom net_wm_window_type;
5192 static Atom net_wm_window_type_desktop;
5193@@ -97,7 +98,7 @@
5194 static Atom net_wm_window_type_dialog;
5195 static Atom net_wm_window_type_normal;
5196 static Atom net_wm_state;
5197-static Atom net_wm_state_modal; /* XXX: what is this?!? */
5198+static Atom net_wm_state_modal; /* XXX: what is this?!? */
5199 static Atom net_wm_state_sticky;
5200 static Atom net_wm_state_maximized_vert;
5201 static Atom net_wm_state_maximized_horz;
5202@@ -119,15 +120,15 @@
5203 static Atom net_wm_action_fullscreen;
5204 static Atom net_wm_action_change_desktop;
5205 static Atom net_wm_action_close;
5206-static Atom net_wm_strut; /* XXX: see net_workarea */
5207-static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */
5208-static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */
5209+static Atom net_wm_strut; /* XXX: see net_workarea */
5210+static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */
5211+static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */
5212 static Atom net_wm_icon;
5213-static Atom net_wm_pid; /* TODO */
5214-static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
5215+static Atom net_wm_pid; /* TODO */
5216+static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
5217
5218 /* Window Manager Protocols */
5219-static Atom net_wm_ping; /* TODO */
5220+static Atom net_wm_ping; /* TODO */
5221
5222 static Atom utf8_string;
5223
5224@@ -322,15 +323,15 @@
5225 void
5226 wNETWMUpdateDesktop(WScreen *scr)
5227 {
5228- CARD32 *views, sizes[2];
5229+ long *views, sizes[2];
5230 int count, i;
5231
5232 if (scr->workspace_count==0)
5233 return;
5234
5235 count = scr->workspace_count * 2;
5236- views = wmalloc(sizeof(CARD32) * count);
5237- /*memset(views, 0, sizeof(CARD32) * count);*/
5238+ views = wmalloc(sizeof(long) * count);
5239+ /*memset(views, 0, sizeof(long) * count);*/
5240
5241 #ifdef VIRTUAL_DESKTOP
5242 sizes[0] = scr->workspaces[scr->current_workspace]->width;
5243@@ -370,7 +371,7 @@
5244 0, 1, &count);
5245 if (prop)
5246 {
5247- int desktop= *(CARD32*)prop;
5248+ int desktop= *(long*)prop;
5249 XFree(prop);
5250 return desktop;
5251 }
5252@@ -389,12 +390,12 @@
5253 *
5254 * The logic can also be changed to accept bigger images and scale them down.
5255 */
5256-static CARD32*
5257-findBestIcon(CARD32 *data, unsigned long items)
5258+static unsigned long*
5259+findBestIcon(unsigned long *data, unsigned long items)
5260 {
5261 int size, wanted, d, distance;
5262 unsigned long i;
5263- CARD32 *icon;
5264+ unsigned long *icon;
5265
5266 /* better use only 75% of icon_size. For 64x64 this means 48x48
5267 * This leaves room around the icon for the miniwindow title and
5268@@ -418,12 +419,12 @@
5269
5270
5271 static RImage*
5272-makeRImageFromARGBData(CARD32 *data)
5273+makeRImageFromARGBData(unsigned long *data)
5274 {
5275 int size, width, height, i;
5276 RImage *image;
5277 unsigned char *imgdata;
5278- CARD32 pixel;
5279+ unsigned long pixel;
5280
5281 width = data[0];
5282 height = data[1];
5283@@ -436,10 +437,18 @@
5284
5285 for (imgdata=image->data, i=2; i<size+2; i++, imgdata+=4) {
5286 pixel = data[i];
5287+#if BYTE_ORDER == BIG_ENDIAN
5288+ imgdata[2] = (pixel >> 24) & 0xff; /* A */
5289+ imgdata[1] = (pixel >> 16) & 0xff; /* R */
5290+ imgdata[0] = (pixel >> 8) & 0xff; /* G */
5291+ imgdata[3] = (pixel >> 0) & 0xff; /* B */
5292+#else /* Little endian */
5293 imgdata[3] = (pixel >> 24) & 0xff; /* A */
5294 imgdata[0] = (pixel >> 16) & 0xff; /* R */
5295 imgdata[1] = (pixel >> 8) & 0xff; /* G */
5296 imgdata[2] = (pixel >> 0) & 0xff; /* B */
5297+#endif /* endianness */
5298+
5299 }
5300
5301 return image;
5302@@ -449,7 +458,7 @@
5303 static void
5304 updateIconImage(WScreen *scr, WWindow *wwin)
5305 {
5306- CARD32 *property, *data;
5307+ unsigned long *property, *data;
5308 unsigned long items, rest;
5309 Atom type;
5310 int format;
5311@@ -487,7 +496,7 @@
5312 static void
5313 updateShowDesktop(WScreen * scr, Bool show)
5314 {
5315- CARD32 foo;
5316+ long foo;
5317
5318 foo = (show == True);
5319 XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
5320@@ -660,7 +669,7 @@
5321 void
5322 wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
5323 {
5324- CARD32 *area;
5325+ long *area;
5326 int count, i;
5327
5328 /* XXX: not Xinerama compatible,
5329@@ -670,7 +679,7 @@
5330 return;
5331
5332 count = scr->workspace_count * 4;
5333- area = wmalloc(sizeof(CARD32) * count);
5334+ area = wmalloc(sizeof(long) * count);
5335 for (i=0; i<scr->workspace_count; i++) {
5336 area[4*i + 0] = usableArea.x1;
5337 area[4*i + 1] = usableArea.y1;
5338@@ -793,7 +802,7 @@
5339 static void
5340 updateWorkspaceCount(WScreen *scr) /* changeable */
5341 {
5342- CARD32 count;
5343+ long count;
5344
5345 count = scr->workspace_count;
5346
5347@@ -805,7 +814,7 @@
5348 static void
5349 updateCurrentWorkspace(WScreen *scr) /* changeable */
5350 {
5351- CARD32 count;
5352+ long count;
5353
5354 count = scr->current_workspace;
5355
5356@@ -852,7 +861,7 @@
5357 static void
5358 updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
5359 {
5360- CARD32 l;
5361+ long l;
5362
5363 if (del) {
5364 XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
5365diff -Nur WindowMaker-0.92.0.orig/test/wtest.c WindowMaker-0.92.0/test/wtest.c
5366--- WindowMaker-0.92.0.orig/test/wtest.c 2004-10-12 23:03:04.000000000 +0200
5367+++ WindowMaker-0.92.0/test/wtest.c 2005-08-23 00:40:15.000000000 +0200
5368@@ -15,11 +15,11 @@
5369 #include <X11/Xproto.h>
5370 #include <WMaker.h>
5371
5372-static unsigned char bits[] = {
5373+static char bits[] = {
5374 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
5375 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
5376
5377-static unsigned char mbits[] = {
5378+static char mbits[] = {
5379 0xff, 0x03, 0xff, 0x01, 0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00,
5380 0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00};
5381
5382diff -Nur WindowMaker-0.92.0.orig/util/wmsetbg.c WindowMaker-0.92.0/util/wmsetbg.c
5383--- WindowMaker-0.92.0.orig/util/wmsetbg.c 2004-10-27 05:01:38.000000000 +0200
5384+++ WindowMaker-0.92.0/util/wmsetbg.c 2005-08-23 00:49:29.000000000 +0200
5385@@ -787,7 +787,7 @@
5386 freeTexture(BackgroundTexture *texture)
5387 {
5388 if (texture->solid) {
5389- long pixel[1];
5390+ unsigned long pixel[1];
5391
5392 pixel[0] = texture->color.pixel;
5393 /* dont free black/white pixels */
5394@@ -966,7 +966,7 @@
5395
5396
5397 int
5398-readmsg(int fd, unsigned char *buffer, int size)
5399+readmsg(int fd, char *buffer, int size)
5400 {
5401 int count;
5402
5403@@ -998,7 +998,7 @@
5404 {
5405 BackgroundTexture *textures[WORKSPACE_COUNT];
5406 int maxTextures = 0;
5407- unsigned char buffer[2048], buf[8];
5408+ char buffer[2048], buf[8];
5409 int size;
5410 int errcount = 4;
5411
5412diff -Nur WindowMaker-0.92.0.orig/WINGs/ChangeLog WindowMaker-0.92.0/WINGs/ChangeLog
5413--- WindowMaker-0.92.0.orig/WINGs/ChangeLog 2004-10-23 04:21:59.000000000 +0200
5414+++ WindowMaker-0.92.0/WINGs/ChangeLog 2006-01-22 21:33:00.000000000 +0100
5415@@ -1,3 +1,17 @@
5416+Changes since wmaker 0.92.0:
5417+............................
5418+
5419+- updated the XDND code in to work with GDK based applications.
5420+ WINGs based applications should now work with both KDE and GNOME
5421+ applications (Sylvain Reynal <sreynal@nerim.net>)
5422+- better check for the XDND protocol version when interoperating with other
5423+ applications. As it seems xdnd version 3 (which WINGs supports) and newer
5424+ are not backward compatible with xdnd version 1 and 2. This is why WINGs
5425+ applications cannot interoperate with GNUstep applications (which uses
5426+ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
5427+ version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
5428+
5429+
5430 Changes since wmaker 0.80.1:
5431 ............................
5432
5433diff -Nur WindowMaker-0.92.0.orig/WINGs/connection.c WindowMaker-0.92.0/WINGs/connection.c
5434--- WindowMaker-0.92.0.orig/WINGs/connection.c 2004-10-23 04:46:36.000000000 +0200
5435+++ WindowMaker-0.92.0/WINGs/connection.c 2005-08-23 00:10:49.000000000 +0200
5436@@ -201,7 +201,7 @@
5437
5438 if (cPtr->state == WCInProgress) {
5439 Bool failed;
5440- int len = sizeof(result);
5441+ socklen_t len = sizeof(result);
5442
5443 WCErrorCode = 0;
5444 if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR,
5445@@ -462,8 +462,8 @@
5446 {
5447 WMConnection *cPtr;
5448 struct sockaddr_in *socketaddr;
5449+ socklen_t size;
5450 int sock, on;
5451- int size;
5452
5453 WCErrorCode = 0;
5454
5455@@ -678,7 +678,7 @@
5456 WMAcceptConnection(WMConnection *listener)
5457 {
5458 struct sockaddr_in clientname;
5459- int size;
5460+ socklen_t size;
5461 int newSock;
5462 WMConnection *newConnection;
5463
5464diff -Nur WindowMaker-0.92.0.orig/WINGs/dragcommon.c WindowMaker-0.92.0/WINGs/dragcommon.c
5465--- WindowMaker-0.92.0.orig/WINGs/dragcommon.c 2004-10-28 11:25:23.000000000 +0200
5466+++ WindowMaker-0.92.0/WINGs/dragcommon.c 2006-01-22 21:15:43.000000000 +0100
5467@@ -2,11 +2,9 @@
5468
5469 #include "WINGsP.h"
5470
5471-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
5472+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
5473 #define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
5474 #define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
5475-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\
5476- && ((dragInfo->destInfo->destView) != NULL)
5477
5478
5479 static Bool _WindowExists;
5480@@ -151,6 +149,13 @@
5481 {
5482 XEvent ev;
5483
5484+#ifdef XDND_DEBUG
5485+ char* msgName = XGetAtomName(dpy, message);
5486+
5487+ printf("sending message %s ... ", msgName);
5488+ XFree(msgName);
5489+#endif
5490+
5491 if (! windowExists(dpy, win)) {
5492 wwarning("xdnd message target %d does no longer exist.", win);
5493 return False; /* message not sent */
5494@@ -170,6 +175,9 @@
5495 XSendEvent(dpy, win, False, 0, &ev);
5496 XFlush(dpy);
5497
5498+#ifdef XDND_DEBUG
5499+ printf("sent\n");
5500+#endif
5501 return True; /* message sent */
5502 }
5503
5504@@ -178,7 +186,9 @@
5505 handleLeaveMessage(WMDraggingInfo *info)
5506 {
5507 if (XDND_DEST_INFO(info) != NULL) {
5508- if (XDND_DEST_VIEW(info) != NULL) {
5509+ /* XDND_DEST_VIEW is never NULL (it's the xdnd aware view) */
5510+ wassertr(XDND_DEST_VIEW(info) != NULL);
5511+ if (XDND_DEST_VIEW(info)->dragDestinationProcs != NULL) {
5512 XDND_DEST_VIEW(info)->dragDestinationProcs->concludeDragOperation(
5513 XDND_DEST_VIEW(info));
5514 }
5515@@ -216,11 +226,15 @@
5516
5517 /* Messages from source to destination */
5518 if (messageType == scr->xdndEnterAtom) {
5519+ Bool positionSent = (XDND_DEST_INFO(info) != NULL);
5520+
5521 W_DragDestinationStopTimer();
5522 W_DragDestinationStoreEnterMsgInfo(info, toplevel, event);
5523
5524- if (VERSION_INFO(info) <= XDND_VERSION) {
5525- if (XDND_DEST_VIEW_STORED(info)) {
5526+ /* Xdnd version 3 and up are not compatible with version 1 or 2 */
5527+ if (XDND_SOURCE_VERSION(info) > 2) {
5528+
5529+ if (positionSent) {
5530 /* xdndPosition previously received on xdnd aware view */
5531 W_DragDestinationStateHandler(info, event);
5532 return;
5533@@ -230,7 +244,7 @@
5534 }
5535 } else {
5536 wwarning("received dnd enter msg with unsupported version %i",
5537- VERSION_INFO(info));
5538+ XDND_SOURCE_VERSION(info));
5539 W_DragDestinationCancelDropOnEnter(toplevel, info);
5540 return;
5541 }
5542diff -Nur WindowMaker-0.92.0.orig/WINGs/dragdestination.c WindowMaker-0.92.0/WINGs/dragdestination.c
5543--- WindowMaker-0.92.0.orig/WINGs/dragdestination.c 2004-10-28 11:25:36.000000000 +0200
5544+++ WindowMaker-0.92.0/WINGs/dragdestination.c 2006-01-22 21:19:18.000000000 +0100
5545@@ -5,15 +5,16 @@
5546
5547 #define XDND_SOURCE_RESPONSE_MAX_DELAY 3000
5548
5549-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
5550-
5551 #define XDND_PROPERTY_FORMAT 32
5552 #define XDND_ACTION_DESCRIPTION_FORMAT 8
5553
5554+#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
5555 #define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
5556+#define XDND_AWARE_VIEW(dragInfo) dragInfo->destInfo->xdndAwareView
5557 #define XDND_SOURCE_WIN(dragInfo) dragInfo->destInfo->sourceWindow
5558 #define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
5559 #define XDND_DEST_STATE(dragInfo) dragInfo->destInfo->state
5560+#define XDND_SOURCE_ACTION_CHANGED(dragInfo) dragInfo->destInfo->sourceActionChanged
5561 #define XDND_SOURCE_TYPES(dragInfo) dragInfo->destInfo->sourceTypes
5562 #define XDND_TYPE_LIST_AVAILABLE(dragInfo) dragInfo->destInfo->typeListAvailable
5563 #define XDND_REQUIRED_TYPES(dragInfo) dragInfo->destInfo->requiredTypes
5564@@ -22,8 +23,8 @@
5565 #define XDND_SOURCE_OPERATIONS(dragInfo) dragInfo->destInfo->sourceOperations
5566 #define XDND_DROP_DATAS(dragInfo) dragInfo->destInfo->dropDatas
5567 #define XDND_DROP_DATA_COUNT(dragInfo) dragInfo->destInfo->dropDataCount
5568-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\
5569- && ((dragInfo->destInfo->destView) != NULL)
5570+#define XDND_DEST_VIEW_IS_REGISTERED(dragInfo) ((dragInfo->destInfo) != NULL)\
5571+ && ((dragInfo->destInfo->destView->dragDestinationProcs) != NULL)
5572
5573
5574 static unsigned char XDNDversion = XDND_VERSION;
5575@@ -81,7 +82,6 @@
5576 static WMArray*
5577 getTypesFromTypeList(WMScreen *scr, Window sourceWin)
5578 {
5579- /* // WMDraggingInfo *info = &scr->dragInfo;*/
5580 Atom dataType;
5581 Atom* typeAtomList;
5582 WMArray* typeList;
5583@@ -138,22 +138,29 @@
5584 WMScreen *scr = W_VIEW_SCREEN(destView);
5585 WMArray *requiredTypes;
5586
5587- /* First, see if the 3 source types are enough for dest requirements */
5588+ /* First, see if the stored source types are enough for dest requirements */
5589 requiredTypes = destView->dragDestinationProcs->requiredDataTypes(
5590 destView,
5591 W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)),
5592 XDND_SOURCE_TYPES(info));
5593
5594 if (requiredTypes == NULL && XDND_TYPE_LIST_AVAILABLE(info)) {
5595- /* None of the 3 source types fits, get the whole type list */
5596+ /* None of the stored source types fits, but the whole type list
5597+ hasn't been retrieved yet. */
5598+ WMFreeArray(XDND_SOURCE_TYPES(info));
5599+ XDND_SOURCE_TYPES(info) = getTypesFromTypeList(
5600+ scr,
5601+ XDND_SOURCE_WIN(info));
5602+ /* Don't retrieve the type list again */
5603+ XDND_TYPE_LIST_AVAILABLE(info) = False;
5604+
5605 requiredTypes =
5606 destView->dragDestinationProcs->requiredDataTypes(
5607 destView,
5608 W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)),
5609- getTypesFromTypeList(scr, XDND_SOURCE_WIN(info)));
5610+ XDND_SOURCE_TYPES(info));
5611 }
5612
5613-
5614 XDND_REQUIRED_TYPES(info) = requiredTypes;
5615 }
5616
5617@@ -219,7 +226,7 @@
5618 }
5619
5620 operationArray = WMCreateDragOperationArray(count);
5621- description = descriptionList;
5622+ description = (char*)descriptionList;
5623
5624 for (i=0; count > 0; i++) {
5625 size = strlen(description);
5626@@ -249,47 +256,35 @@
5627 }
5628
5629
5630-static Window
5631-findChildInWindow(Display *dpy, Window toplevel, int x, int y)
5632+static WMView*
5633+findChildInView(WMView* parent, int x, int y)
5634 {
5635- Window foo, bar;
5636- Window *children;
5637- unsigned nchildren;
5638- int i;
5639+ if (parent->childrenList == NULL)
5640+ return parent;
5641+ else {
5642+ WMView* child = parent->childrenList;
5643
5644- if (!XQueryTree(dpy, toplevel, &foo, &bar,
5645- &children, &nchildren) || children == NULL) {
5646- return None;
5647- }
5648-
5649- /* first window that contains the point is the one */
5650- for (i = nchildren-1; i >= 0; i--) {
5651- XWindowAttributes attr;
5652-
5653- if (XGetWindowAttributes(dpy, children[i], &attr)
5654- && attr.map_state == IsViewable
5655- && x >= attr.x && y >= attr.y
5656- && x < attr.x + attr.width && y < attr.y + attr.height) {
5657- Window child, tmp;
5658-
5659- tmp = children[i];
5660- child = findChildInWindow(dpy, tmp, x - attr.x, y - attr.y);
5661- XFree(children);
5662-
5663- if (child == None)
5664- return tmp;
5665- else
5666- return child;
5667- }
5668+ while (child != NULL
5669+ && (! child->flags.mapped
5670+ || x < WMGetViewPosition(child).x
5671+ || x > WMGetViewPosition(child).x + WMGetViewSize(child).width
5672+ || y < WMGetViewPosition(child).y
5673+ || y > WMGetViewPosition(child).y + WMGetViewSize(child).height))
5674+
5675+ child = child->nextSister;
5676+
5677+ if (child == NULL)
5678+ return parent;
5679+ else
5680+ return findChildInView(child,
5681+ x - WMGetViewPosition(child).x,
5682+ y - WMGetViewPosition(child).y);
5683 }
5684-
5685- XFree(children);
5686- return None;
5687 }
5688
5689
5690 static WMView*
5691-findXdndViewInToplevel(WMView* toplevel, int x, int y)
5692+findDestinationViewInToplevel(WMView* toplevel, int x, int y)
5693 {
5694 WMScreen *scr = W_VIEW_SCREEN(toplevel);
5695 Window toplevelWin = WMViewXID(toplevel);
5696@@ -300,20 +295,7 @@
5697 XTranslateCoordinates(scr->display, scr->rootWin, toplevelWin,
5698 x, y, &xInToplevel, &yInToplevel,
5699 &foo);
5700-
5701- child = findChildInWindow(scr->display, toplevelWin,
5702- xInToplevel, yInToplevel);
5703-
5704- if (child != None) {
5705- childView = W_GetViewForXWindow(scr->display, child);
5706-
5707- /* if childView supports Xdnd, return childView */
5708- if (childView != NULL
5709- && childView->dragDestinationProcs != NULL)
5710- return childView;
5711- }
5712-
5713- return NULL;
5714+ return findChildInView(toplevel, xInToplevel, yInToplevel);
5715 }
5716
5717
5718@@ -334,6 +316,7 @@
5719 XDND_REQUIRED_TYPES(info) = NULL;
5720 }
5721
5722+
5723 void
5724 W_DragDestinationInfoClear(WMDraggingInfo *info)
5725 {
5726@@ -347,15 +330,19 @@
5727 }
5728 }
5729
5730+
5731 static void
5732-initDestinationDragInfo(WMDraggingInfo *info)
5733+initDestinationDragInfo(WMDraggingInfo *info, WMView *destView)
5734 {
5735+ wassertr(destView != NULL);
5736+
5737 XDND_DEST_INFO(info) =
5738 (W_DragDestinationInfo*) wmalloc(sizeof(W_DragDestinationInfo));
5739
5740 XDND_DEST_STATE(info) = idleState;
5741- XDND_DEST_VIEW(info) = NULL;
5742+ XDND_DEST_VIEW(info) = destView;
5743
5744+ XDND_SOURCE_ACTION_CHANGED(info) = False;
5745 XDND_SOURCE_TYPES(info) = NULL;
5746 XDND_REQUIRED_TYPES(info) = NULL;
5747 XDND_DROP_DATAS(info) = NULL;
5748@@ -369,13 +356,19 @@
5749 WMScreen *scr = W_VIEW_SCREEN(toplevel);
5750
5751 if (XDND_DEST_INFO(info) == NULL)
5752- initDestinationDragInfo(info);
5753+ initDestinationDragInfo(info, toplevel);
5754
5755+ XDND_SOURCE_VERSION(info) = (event->data.l[1] >> 24);
5756+ XDND_AWARE_VIEW(info) = toplevel;
5757 updateSourceWindow(info, event);
5758
5759- /* store xdnd version for source */
5760- info->protocolVersion = (event->data.l[1] >> 24);
5761-
5762+/*
5763+ if (event->data.l[1] & 1)
5764+ /* XdndTypeList property is available */
5765+/* XDND_SOURCE_TYPES(info) = getTypesFromTypeList(scr, XDND_SOURCE_WIN(info));
5766+ else
5767+ XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
5768+*/
5769 XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
5770
5771 /* to use if the 3 types are not enough */
5772@@ -383,45 +376,30 @@
5773 }
5774
5775
5776-static void
5777-cancelDrop(WMView *destView, WMDraggingInfo *info);
5778-
5779-static void
5780-suspendDropAuthorization(WMView *destView, WMDraggingInfo *info);
5781-
5782-
5783 void
5784- W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
5785- WMView *toplevel, XClientMessageEvent *event)
5786+W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
5787+ WMView *toplevel, XClientMessageEvent *event)
5788 {
5789 int x = event->data.l[2] >> 16;
5790 int y = event->data.l[2] & 0xffff;
5791- WMView *oldDestView;
5792 WMView *newDestView;
5793
5794- newDestView = findXdndViewInToplevel(toplevel, x, y);
5795+ newDestView = findDestinationViewInToplevel(toplevel, x, y);
5796
5797 if (XDND_DEST_INFO(info) == NULL) {
5798- initDestinationDragInfo(info);
5799+ initDestinationDragInfo(info, newDestView);
5800+ XDND_AWARE_VIEW(info) = toplevel;
5801 updateSourceWindow(info, event);
5802- XDND_DEST_VIEW(info) = newDestView;
5803- }
5804- else {
5805- oldDestView = XDND_DEST_VIEW(info);
5806-
5807- if (newDestView != oldDestView) {
5808- if (oldDestView != NULL) {
5809- suspendDropAuthorization(oldDestView, info);
5810- XDND_DEST_STATE(info) = dropNotAllowedState;
5811- }
5812-
5813+ } else {
5814+ if (newDestView != XDND_DEST_VIEW(info)) {
5815 updateSourceWindow(info, event);
5816 XDND_DEST_VIEW(info) = newDestView;
5817+ XDND_SOURCE_ACTION_CHANGED(info) = False;
5818
5819- if (newDestView != NULL) {
5820- if (XDND_DEST_STATE(info) != waitEnterState)
5821- XDND_DEST_STATE(info) = idleState;
5822- }
5823+ if (XDND_DEST_STATE(info) != waitEnterState)
5824+ XDND_DEST_STATE(info) = idleState;
5825+ } else {
5826+ XDND_SOURCE_ACTION_CHANGED(info) = (XDND_SOURCE_ACTION(info) != event->data.l[4]);
5827 }
5828 }
5829
5830@@ -437,27 +415,62 @@
5831
5832 /* send a DnD message to the source window */
5833 static void
5834-sendDnDClientMessage(WMView *destView, Atom message,
5835+sendDnDClientMessage(WMDraggingInfo *info, Atom message,
5836 unsigned long data1,
5837 unsigned long data2,
5838 unsigned long data3,
5839 unsigned long data4)
5840 {
5841- WMScreen *scr = W_VIEW_SCREEN(destView);
5842- WMDraggingInfo *info = &scr->dragInfo;
5843+ if (! W_SendDnDClientMessage(W_VIEW_SCREEN(XDND_AWARE_VIEW(info))->display,
5844+ XDND_SOURCE_WIN(info),
5845+ message,
5846+ WMViewXID(XDND_AWARE_VIEW(info)),
5847+ data1,
5848+ data2,
5849+ data3,
5850+ data4)) {
5851+ /* drop failed */
5852+ W_DragDestinationInfoClear(info);
5853+ }
5854+}
5855
5856- if (XDND_DEST_INFO(info) != NULL) {
5857- if (! W_SendDnDClientMessage(scr->display,
5858- XDND_SOURCE_WIN(info),
5859- message,
5860- WMViewXID(destView),
5861- data1,
5862- data2,
5863- data3,
5864- data4)) {
5865- /* drop failed */
5866- W_DragDestinationInfoClear(info);
5867- }
5868+
5869+/* send a xdndStatus message to the source, with position and size
5870+ of the destination if it has no subwidget (requesting a position message
5871+ on every move otherwise) */
5872+static void
5873+sendStatusMessage(WMView *destView, WMDraggingInfo *info, Atom action)
5874+{
5875+ unsigned long data1;
5876+
5877+ data1 = (action == None) ? 0 : 1;
5878+
5879+ if (destView->childrenList == NULL) {
5880+ WMScreen *scr = W_VIEW_SCREEN(destView);
5881+ int destX, destY;
5882+ WMSize destSize = WMGetViewSize(destView);
5883+ Window foo;
5884+
5885+ XTranslateCoordinates(scr->display, WMViewXID(destView), scr->rootWin,
5886+ 0, 0, &destX, &destY,
5887+ &foo);
5888+
5889+ sendDnDClientMessage(info,
5890+ W_VIEW_SCREEN(destView)->xdndStatusAtom,
5891+ data1,
5892+ (destX << 16)|destY,
5893+ (destSize.width << 16)|destSize.height,
5894+ action);
5895+ } else {
5896+ /* set bit 1 to request explicitly position message on every move */
5897+ data1 = data1 | 2;
5898+
5899+ sendDnDClientMessage(info,
5900+ W_VIEW_SCREEN(destView)->xdndStatusAtom,
5901+ data1,
5902+ 0,
5903+ 0,
5904+ action);
5905 }
5906 }
5907
5908@@ -534,31 +547,26 @@
5909 static void
5910 cancelDrop(WMView *destView, WMDraggingInfo *info)
5911 {
5912- /* send XdndStatus with action None */
5913- sendDnDClientMessage(destView,
5914- W_VIEW_SCREEN(destView)->xdndStatusAtom,
5915- 0, 0, 0, None);
5916+ sendStatusMessage(destView, info, None);
5917 concludeDrop(destView);
5918 freeDestinationViewInfos(info);
5919 }
5920
5921
5922-/* suspend drop, when dragged icon enter an unaware subview of destView */
5923+/* suspend drop, when dragged icon enter an unregistered view
5924+ or a register view that doesn't accept the drop */
5925 static void
5926 suspendDropAuthorization(WMView *destView, WMDraggingInfo *info)
5927 {
5928- /* free datas that depend on destination behaviour */
5929- /* (in short: only keep source's types) */
5930+ sendStatusMessage(destView, info, None);
5931+
5932+ /* Free datas that depend on destination behaviour */
5933 if (XDND_DROP_DATAS(info) != NULL) {
5934 WMFreeArray(XDND_DROP_DATAS(info));
5935 XDND_DROP_DATAS(info) = NULL;
5936 }
5937- XDND_REQUIRED_TYPES(info) = NULL;
5938
5939- /* send XdndStatus with action None */
5940- sendDnDClientMessage(destView,
5941- W_VIEW_SCREEN(destView)->xdndStatusAtom,
5942- 0, 0, 0, None);
5943+ XDND_REQUIRED_TYPES(info) = NULL;
5944 }
5945
5946
5947@@ -566,14 +574,10 @@
5948 void
5949 W_DragDestinationCancelDropOnEnter(WMView *toplevel, WMDraggingInfo *info)
5950 {
5951- if (XDND_DEST_VIEW_STORED(info))
5952+ if (XDND_DEST_VIEW_IS_REGISTERED(info))
5953 cancelDrop(XDND_DEST_VIEW(info), info);
5954- else {
5955- /* send XdndStatus with action None */
5956- sendDnDClientMessage(toplevel,
5957- W_VIEW_SCREEN(toplevel)->xdndStatusAtom,
5958- 0, 0, 0, None);
5959- }
5960+ else
5961+ sendStatusMessage(toplevel, info, None);
5962
5963 W_DragDestinationInfoClear(info);
5964 }
5965@@ -582,7 +586,7 @@
5966 static void
5967 finishDrop(WMView *destView, WMDraggingInfo *info)
5968 {
5969- sendDnDClientMessage(destView,
5970+ sendDnDClientMessage(info,
5971 W_VIEW_SCREEN(destView)->xdndFinishedAtom,
5972 0, 0, 0, 0);
5973 concludeDrop(destView);
5974@@ -603,31 +607,6 @@
5975 }
5976
5977
5978-/* send the action that can be performed,
5979- and the limits outside wich the source must re-send
5980- its position and action */
5981-static void
5982-sendAllowedAction(WMView *destView, Atom action)
5983-{
5984- WMScreen *scr = W_VIEW_SCREEN(destView);
5985- /* // WMPoint destPos = WMGetViewScreenPosition(destView); */
5986- WMSize destSize = WMGetViewSize(destView);
5987- int destX, destY;
5988- Window foo;
5989-
5990- XTranslateCoordinates(scr->display, scr->rootWin, WMViewXID(destView),
5991- 0, 0, &destX, &destY,
5992- &foo);
5993-
5994- sendDnDClientMessage(destView,
5995- scr->xdndStatusAtom,
5996- 1,
5997- (destX << 16)|destY,
5998- (destSize.width << 16)|destSize.height,
5999- action);
6000-}
6001-
6002-
6003 static void*
6004 checkActionAllowed(WMView *destView, WMDraggingInfo* info)
6005 {
6006@@ -639,10 +618,11 @@
6007 return dropNotAllowedState;
6008 }
6009
6010- sendAllowedAction(destView, XDND_DEST_ACTION(info));
6011+ sendStatusMessage(destView, info, XDND_DEST_ACTION(info));
6012 return dropAllowedState;
6013 }
6014
6015+
6016 static void*
6017 checkDropAllowed(WMView *destView, XClientMessageEvent *event,
6018 WMDraggingInfo* info)
6019@@ -670,6 +650,7 @@
6020 return checkActionAllowed(destView, info);
6021 }
6022
6023+
6024 static WMPoint*
6025 getDropLocationInView(WMView *view)
6026 {
6027@@ -690,6 +671,7 @@
6028 return location;
6029 }
6030
6031+
6032 static void
6033 callPerformDragOperation(WMView *destView, WMDraggingInfo *info)
6034 {
6035@@ -721,21 +703,17 @@
6036 WMDraggingInfo *info;
6037
6038 wwarning("delay for drag source response expired");
6039- if (view != NULL) {
6040- info = &(W_VIEW_SCREEN(view)->dragInfo);
6041- if (XDND_DEST_VIEW_STORED(info))
6042- cancelDrop(view, info);
6043- else {
6044- /* send XdndStatus with action None */
6045- sendDnDClientMessage(view,
6046- W_VIEW_SCREEN(view)->xdndStatusAtom,
6047- 0, 0, 0, None);
6048- }
6049-
6050- W_DragDestinationInfoClear(info);
6051+ info = &(W_VIEW_SCREEN(view)->dragInfo);
6052+ if (XDND_DEST_VIEW_IS_REGISTERED(info))
6053+ cancelDrop(view, info);
6054+ else {
6055+ sendStatusMessage(view, info, None);
6056 }
6057+
6058+ W_DragDestinationInfoClear(info);
6059 }
6060
6061+
6062 void
6063 W_DragDestinationStopTimer()
6064 {
6065@@ -745,21 +723,17 @@
6066 }
6067 }
6068
6069+
6070 void
6071 W_DragDestinationStartTimer(WMDraggingInfo *info)
6072 {
6073 W_DragDestinationStopTimer();
6074
6075- if (XDND_DEST_STATE(info) != idleState
6076- || XDND_DEST_VIEW(info) == NULL) {
6077- /* note: info->destView == NULL means :
6078- Enter message has been received, waiting for Position message */
6079-
6080+ if (XDND_DEST_STATE(info) != idleState)
6081 dndDestinationTimer = WMAddTimerHandler(
6082 XDND_SOURCE_RESPONSE_MAX_DELAY,
6083 dragSourceResponseTimeOut,
6084 XDND_DEST_VIEW(info));
6085- }
6086 }
6087 /* ----- End of Destination timer ----- */
6088
6089@@ -795,6 +769,7 @@
6090 }
6091 #endif
6092
6093+
6094 static void*
6095 idleState(WMView *destView, XClientMessageEvent *event,
6096 WMDraggingInfo *info)
6097@@ -802,21 +777,24 @@
6098 WMScreen *scr;
6099 Atom sourceMsg;
6100
6101- scr = W_VIEW_SCREEN(destView);
6102- sourceMsg = event->message_type;
6103-
6104- if (sourceMsg == scr->xdndPositionAtom) {
6105- destView->dragDestinationProcs->prepareForDragOperation(destView);
6106+ if (destView->dragDestinationProcs != NULL) {
6107+ scr = W_VIEW_SCREEN(destView);
6108+ sourceMsg = event->message_type;
6109+
6110+ if (sourceMsg == scr->xdndPositionAtom) {
6111+ destView->dragDestinationProcs->prepareForDragOperation(destView);
6112+
6113+ if (XDND_SOURCE_TYPES(info) != NULL) {
6114+ /* enter message infos are available */
6115+ return checkDropAllowed(destView, event, info);
6116+ }
6117
6118- if (XDND_SOURCE_TYPES(info) != NULL) {
6119- /* enter message infos are available */
6120- return checkDropAllowed(destView, event, info);
6121+ /* waiting for enter message */
6122+ return waitEnterState;
6123 }
6124-
6125- /* waiting for enter message */
6126- return waitEnterState;
6127 }
6128
6129+ suspendDropAuthorization(destView, info);
6130 return idleState;
6131 }
6132
6133@@ -881,6 +859,15 @@
6134 return idleState;
6135 }
6136
6137+ if (sourceMsg == scr->xdndPositionAtom) {
6138+ if (XDND_SOURCE_ACTION_CHANGED(info)) {
6139+ return checkDropAllowed(destView, event, info);
6140+ } else {
6141+ sendStatusMessage(destView, info, None);
6142+ return dropNotAllowedState;
6143+ }
6144+ }
6145+
6146 return dropNotAllowedState;
6147 }
6148
6149@@ -912,6 +899,15 @@
6150 return idleState;
6151 }
6152
6153+ if (sourceMsg == scr->xdndPositionAtom) {
6154+ if (XDND_SOURCE_ACTION_CHANGED(info)) {
6155+ return checkDropAllowed(destView, event, info);
6156+ } else {
6157+ sendStatusMessage(destView, info, XDND_DEST_ACTION(info));
6158+ return dropAllowedState;
6159+ }
6160+ }
6161+
6162 return dropAllowedState;
6163 }
6164
6165@@ -947,29 +943,30 @@
6166 WMView *destView;
6167 W_DndState* newState;
6168
6169- if (XDND_DEST_VIEW_STORED(info)) {
6170- destView = XDND_DEST_VIEW(info);
6171- if (XDND_DEST_STATE(info) == NULL)
6172- XDND_DEST_STATE(info) = idleState;
6173+ wassertr(XDND_DEST_INFO(info) != NULL);
6174+ wassertr(XDND_DEST_VIEW(info) != NULL);
6175+
6176+ destView = XDND_DEST_VIEW(info);
6177+ if (XDND_DEST_STATE(info) == NULL)
6178+ XDND_DEST_STATE(info) = idleState;
6179
6180 #ifdef XDND_DEBUG
6181
6182- printf("current dest state: %s\n",
6183- stateName(XDND_DEST_STATE(info)));
6184+ printf("current dest state: %s\n",
6185+ stateName(XDND_DEST_STATE(info)));
6186 #endif
6187
6188- newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info);
6189+ newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info);
6190
6191 #ifdef XDND_DEBUG
6192
6193- printf("new dest state: %s\n", stateName(newState));
6194+ printf("new dest state: %s\n", stateName(newState));
6195 #endif
6196
6197- if (XDND_DEST_INFO(info) != NULL) {
6198- XDND_DEST_STATE(info) = newState;
6199- if (XDND_DEST_STATE(info) != idleState)
6200- W_DragDestinationStartTimer(info);
6201- }
6202+ if (XDND_DEST_INFO(info) != NULL) {
6203+ XDND_DEST_STATE(info) = newState;
6204+ if (XDND_DEST_STATE(info) != idleState)
6205+ W_DragDestinationStartTimer(info);
6206 }
6207 }
6208
6209@@ -1104,7 +1101,7 @@
6210 Process drop
6211 dropDatas: datas (WMData*) required by destination (self)
6212 (given in same order as returned by requiredDataTypes).
6213- A NULL data means it couldn't be retrivied.
6214+ A NULL data means it couldn't be retrieved.
6215 Destroyed when drop ends.
6216 operationList: if source operation is WDOperationAsk, contains
6217 operations (and associated texts) that can be asked
6218diff -Nur WindowMaker-0.92.0.orig/WINGs/dragsource.c WindowMaker-0.92.0/WINGs/dragsource.c
6219--- WindowMaker-0.92.0.orig/WINGs/dragsource.c 2004-10-28 11:29:59.000000000 +0200
6220+++ WindowMaker-0.92.0/WINGs/dragsource.c 2006-01-22 21:19:36.000000000 +0100
6221@@ -16,10 +16,10 @@
6222 #define MIN_Y_MOVE_OFFSET 5
6223 #define MAX_SLIDEBACK_ITER 15
6224
6225-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
6226 #define XDND_PROPERTY_FORMAT 32
6227 #define XDND_ACTION_DESCRIPTION_FORMAT 8
6228
6229+#define XDND_DEST_VERSION(dragInfo) dragInfo->protocolVersion
6230 #define XDND_SOURCE_INFO(dragInfo) dragInfo->sourceInfo
6231 #define XDND_DEST_WIN(dragInfo) dragInfo->sourceInfo->destinationWindow
6232 #define XDND_SOURCE_ACTION(dragInfo) dragInfo->sourceAction
6233@@ -415,21 +415,25 @@
6234 sendEnterMessage(WMDraggingInfo *info)
6235 {
6236 WMScreen *scr = sourceScreen(info);
6237- unsigned long data1;
6238+ unsigned long version;
6239
6240- data1 = (VERSION_INFO(info) << 24)|1; /* 1: support of type list */
6241+ if (XDND_DEST_VERSION(info) > 2) {
6242+ if (XDND_DEST_VERSION(info) < XDND_VERSION)
6243+ version = XDND_DEST_VERSION(info);
6244+ else
6245+ version = XDND_VERSION;
6246+ } else {
6247+ version = 3;
6248+ }
6249
6250 return sendDnDClientMessage(info, scr->xdndEnterAtom,
6251- data1,
6252+ (version << 24) | 1, /* 1: support of type list */
6253 XDND_3_TYPES(info)[0],
6254 XDND_3_TYPES(info)[1],
6255 XDND_3_TYPES(info)[2]);
6256 }
6257
6258
6259-/*
6260-// this functon doesn't return something in all cases.
6261-// control reaches end of non-void function. fix this -Dan */
6262 static Bool
6263 sendPositionMessage(WMDraggingInfo *info, WMPoint *mousePos)
6264 {
6265@@ -440,7 +444,7 @@
6266 if (mousePos->x < noPosZone->pos.x
6267 || mousePos->x > (noPosZone->pos.x + noPosZone->size.width)
6268 || mousePos->y < noPosZone->pos.y
6269- || mousePos->y > (noPosZone->pos.y + noPosZone->size.width)) {
6270+ || mousePos->y > (noPosZone->pos.y + noPosZone->size.height)) {
6271 /* send position if out of zone defined by destination */
6272 return sendDnDClientMessage(info, scr->xdndPositionAtom,
6273 0,
6274@@ -448,14 +452,18 @@
6275 XDND_TIMESTAMP(info),
6276 XDND_SOURCE_ACTION(info));
6277 }
6278- } else {
6279- /* send position on each move */
6280- return sendDnDClientMessage(info, scr->xdndPositionAtom,
6281- 0,
6282- mousePos->x<<16|mousePos->y,
6283- XDND_TIMESTAMP(info),
6284- XDND_SOURCE_ACTION(info));
6285+
6286+ /* Nothing to send, always succeed */
6287+ return True;
6288+
6289 }
6290+
6291+ /* send position on each move */
6292+ return sendDnDClientMessage(info, scr->xdndPositionAtom,
6293+ 0,
6294+ mousePos->x<<16|mousePos->y,
6295+ XDND_TIMESTAMP(info),
6296+ XDND_SOURCE_ACTION(info));
6297 }
6298
6299
6300@@ -846,6 +854,30 @@
6301
6302
6303 static void
6304+storeDestinationProtocolVersion(WMDraggingInfo *info)
6305+{
6306+ Atom type;
6307+ int format;
6308+ unsigned long count, remain;
6309+ unsigned char *winXdndVersion;
6310+ WMScreen *scr = W_VIEW_SCREEN(XDND_SOURCE_VIEW(info));
6311+
6312+ wassertr(XDND_DEST_WIN(info) != None);
6313+
6314+ if (XGetWindowProperty(scr->display, XDND_DEST_WIN(info),
6315+ scr->xdndAwareAtom,
6316+ 0, 1, False, XA_ATOM, &type, &format,
6317+ &count, &remain, &winXdndVersion) == Success) {
6318+ XDND_DEST_VERSION(info) = *winXdndVersion;
6319+ XFree(winXdndVersion);
6320+ } else {
6321+ XDND_DEST_VERSION(info) = 0;
6322+ wwarning("failed to read XDND version of drop target");
6323+ }
6324+}
6325+
6326+
6327+static void
6328 initMotionProcess(WMView *view, WMDraggingInfo *info,
6329 XEvent *event, WMPoint *startLocation)
6330 {
6331@@ -878,9 +910,8 @@
6332
6333
6334 static void
6335-processMotion(WMDraggingInfo *info, Window windowUnderDrag, WMPoint *mousePos)
6336+processMotion(WMDraggingInfo *info, WMPoint *mousePos)
6337 {
6338- /* // WMScreen *scr = sourceScreen(info); */
6339 Window newDestination = findDestination(info, mousePos);
6340
6341 W_DragSourceStopTimer();
6342@@ -894,20 +925,24 @@
6343 }
6344
6345 XDND_DEST_WIN(info) = newDestination;
6346- XDND_SOURCE_STATE(info) = idleState;
6347 XDND_DEST_ACTION(info) = None;
6348 XDND_NO_POS_ZONE(info).size.width = 0;
6349 XDND_NO_POS_ZONE(info).size.height = 0;
6350
6351 if (newDestination != None) {
6352 /* entering a xdnd window */
6353+ XDND_SOURCE_STATE(info) = idleState;
6354+ storeDestinationProtocolVersion(info);
6355+
6356 if (! sendEnterMessage(info)) {
6357 XDND_DEST_WIN(info) = None;
6358 return;
6359 }
6360
6361 W_DragSourceStartTimer(info);
6362- }
6363+ } else {
6364+ XDND_SOURCE_STATE(info) = NULL;
6365+ }
6366 } else {
6367 if (XDND_DEST_WIN(info) != None) {
6368 if (! sendPositionMessage(info, mousePos)) {
6369@@ -1010,9 +1045,7 @@
6370 mouseLocation.y - XDND_MOUSE_OFFSET(info).y;
6371
6372 refreshDragImage(view, info);
6373- processMotion(info,
6374- event->xmotion.window,
6375- &mouseLocation);
6376+ processMotion(info, &mouseLocation);
6377 }
6378 }
6379 }
6380@@ -1041,7 +1074,7 @@
6381 printf("Xdnd status message:\n");
6382
6383 if (statusEvent->data.l[1] & 0x2UL)
6384- printf("send position on every move\n");
6385+ printf("\tsend position on every move\n");
6386 else {
6387 int x, y, w, h;
6388 x = statusEvent->data.l[2] >> 16;
6389@@ -1049,15 +1082,15 @@
6390 w = statusEvent->data.l[3] >> 16;
6391 h = statusEvent->data.l[3] & 0xFFFFL;
6392
6393- printf("send position out of ((%d,%d) , (%d,%d))\n",
6394+ printf("\tsend position out of ((%d,%d) , (%d,%d))\n",
6395 x, y, x+w, y+h);
6396 }
6397
6398 if (statusEvent->data.l[1] & 0x1L)
6399- printf("allowed action: %s\n",
6400+ printf("\tallowed action: %s\n",
6401 XGetAtomName(dpy, statusEvent->data.l[4]));
6402 else
6403- printf("no action allowed\n");
6404+ printf("\tno action allowed\n");
6405 }
6406 #endif
6407
6408@@ -1231,23 +1264,28 @@
6409 W_DndState* newState;
6410
6411 if (XDND_SOURCE_VIEW_STORED(info)) {
6412- view = XDND_SOURCE_VIEW(info);
6413+ if (XDND_SOURCE_STATE(info) != NULL) {
6414+ view = XDND_SOURCE_VIEW(info);
6415 #ifdef XDND_DEBUG
6416
6417- printf("current source state: %s\n",
6418- stateName(XDND_SOURCE_STATE(info)));
6419+ printf("current source state: %s\n",
6420+ stateName(XDND_SOURCE_STATE(info)));
6421 #endif
6422
6423- newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info);
6424+ newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info);
6425
6426 #ifdef XDND_DEBUG
6427
6428- printf("new source state: %s\n", stateName(newState));
6429+ printf("new source state: %s\n", stateName(newState));
6430 #endif
6431
6432- if (newState != NULL)
6433- XDND_SOURCE_STATE(info) = newState;
6434- /* else drop finished, and info has been flushed */
6435+ if (newState != NULL)
6436+ XDND_SOURCE_STATE(info) = newState;
6437+ /* else drop finished, and info has been flushed */
6438+ }
6439+
6440+ } else {
6441+ wwarning("received DnD message without having a target");
6442 }
6443 }
6444
6445diff -Nur WindowMaker-0.92.0.orig/WINGs/Examples/server.c WindowMaker-0.92.0/WINGs/Examples/server.c
6446--- WindowMaker-0.92.0.orig/WINGs/Examples/server.c 2004-10-12 21:31:51.000000000 +0200
6447+++ WindowMaker-0.92.0/WINGs/Examples/server.c 2005-08-23 00:16:13.000000000 +0200
6448@@ -126,8 +126,8 @@
6449 }
6450
6451
6452-static unsigned char*
6453-findDelimiter(unsigned char *data, unsigned const char *endPtr)
6454+static char*
6455+findDelimiter(char *data, const char *endPtr)
6456 {
6457 wassertrv(data < endPtr, NULL);
6458
6459diff -Nur WindowMaker-0.92.0.orig/WINGs/Makefile.am WindowMaker-0.92.0/WINGs/Makefile.am
6460--- WindowMaker-0.92.0.orig/WINGs/Makefile.am 2004-10-30 07:44:13.000000000 +0200
6461+++ WindowMaker-0.92.0/WINGs/Makefile.am 2005-07-17 20:27:58.000000000 +0200
6462@@ -108,12 +108,12 @@
6463 wutil.c
6464
6465
6466-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
6467+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
6468
6469 AM_CFLAGS = @NOSTRICTALIASING@
6470
6471 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
6472- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
6473+ @XFTFLAGS@ @HEADER_SEARCH_PATH@
6474
6475
6476 wcolorpanel.o: wcolorpanel.c
6477diff -Nur WindowMaker-0.92.0.orig/WINGs/po/de.po WindowMaker-0.92.0/WINGs/po/de.po
6478--- WindowMaker-0.92.0.orig/WINGs/po/de.po 2005-07-03 02:45:48.000000000 +0200
6479+++ WindowMaker-0.92.0/WINGs/po/de.po 2005-07-05 21:39:14.000000000 +0200
6480@@ -1,23 +1,28 @@
6481-# KTranslator Generated File
6482-# SOME DESCRIPTIVE TITLE.
6483-# Copyright (C) YEAR Free Software Foundation, Inc.
6484-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
6485 #
6486+# German Message Catalog for WINGs
6487+#
6488+# Initial translation
6489+# Gudio Scholz <guido.scholz@bayernline.de>
6490+#
6491+# Adapted to versions 0.80 ff.
6492+# Torsten Marek <shlomme@gmx.net>
6493+#
6494+
6495 msgid ""
6496 msgstr ""
6497-"Project-Id-Version: WINGs 0.80.0\n"
6498-"POT-Creation-Date: 2002-01-09 21:06+0100\n"
6499-"PO-Revision-Date: 2002-01-09 21:20+0100\n"
6500-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
6501-"Language-Team: Deutsch <de@li.org>\n"
6502+"Project-Id-Version: WINGs\n"
6503+"POT-Creation-Date: 2004-11-01 16:24+0100\n"
6504+"PO-Revision-Date: 2004-11-05 23:48+0100\n"
6505+"Last-Translator: shlomme@gmx.net\n"
6506+"Language-Team: German\n"
6507 "MIME-Version: 1.0\n"
6508 "Content-Type: text/plain; charset=UTF-8\n"
6509-"Content-Transfer-Encoding: unknown\n"
6510+"Content-Transfer-Encoding: 8bit\n"
6511
6512-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
6513-#: ../../WINGs/connection.c:569
6514+#: ../../WINGs/connection.c:471 ../../WINGs/connection.c:536
6515+#: ../../WINGs/connection.c:579
6516 msgid "Bad address-service-protocol combination"
6517-msgstr "Ungültige Adress-Dienst-Protokoll Kombination"
6518+msgstr "Ungültige Kombination von Adresse und Dienstprotokoll"
6519
6520 #: ../../WINGs/error.c:54
6521 #, c-format
6522@@ -44,346 +49,349 @@
6523 #: ../../WINGs/findfile.c:48
6524 #, c-format
6525 msgid "could not get password entry for UID %i"
6526-msgstr "konnte Passwort nicht ermitteln für UID %i"
6527+msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
6528
6529 #: ../../WINGs/findfile.c:66
6530 #, c-format
6531 msgid "could not get password entry for user %s"
6532-msgstr "konnte Passwort nicht ermitteln für Benutzer %s"
6533+msgstr "Passworteintrag für Benutzer %s konnte nicht ermittelt werden"
6534
6535 #: ../../WINGs/host.c:114
6536 msgid "Cannot get current host name"
6537-msgstr "Kann aktuellen Hostnamen nicht ermitteln"
6538+msgstr "Aktueller Hostname kann nicht ermittelt werden"
6539+
6540+#: ../../WINGs/proplist.c:91
6541+#, c-format
6542+msgid "syntax error in %s %s, line %i: %s"
6543+msgstr "Syntaxfehler in %s %s, Zeile %i: %s"
6544
6545 #: ../../WINGs/proplist.c:150
6546 msgid "Only string or data is supported for a proplist dictionary key"
6547 msgstr ""
6548-"Nur string oder data wird als Schlüssel für ein proplist dictionary "
6549+"Nur Zeichenketten oder Binärdaten werden als Schlüssel für ein PropList-Dictionary "
6550 "unterstützt"
6551
6552 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
6553 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
6554-#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123
6555-#: ../../WINGs/proplist.c:1289 ../../WINGs/proplist.c:1368
6556-#: ../../WINGs/proplist.c:1489 ../../WINGs/proplist.c:1536
6557+#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
6558+#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
6559+#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
6560 msgid "Used proplist functions on non-WMPropLists objects"
6561-msgstr ""
6562+msgstr "PropList-Funktionen werden auf nicht-WMPropList-Objekte angewendet"
6563
6564 #: ../../WINGs/proplist.c:630
6565 msgid "unterminated PropList string"
6566-msgstr "nicht terminierter PropList string"
6567+msgstr "nicht terminierte PropList-Zeichenkette"
6568
6569 #: ../../WINGs/proplist.c:670
6570 msgid "unterminated PropList data"
6571-msgstr "nicht terminiertes PropList data"
6572+msgstr "nicht terminierte PropList-Binärdaten"
6573
6574 #: ../../WINGs/proplist.c:678
6575 msgid "unterminated PropList data (missing hexdigit)"
6576-msgstr "nicht terminiertes PropList data (fehlendes hex-Zeichen)"
6577+msgstr "nicht terminierte PropList-Binärdaten (fehlendes Hex-Zeichen)"
6578
6579-#: ../../WINGs/proplist.c:690
6580+#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
6581 msgid "non hexdigit character in PropList data"
6582-msgstr "falsches hex-Zeichen in PropList data"
6583+msgstr "falsches Hex-Zeichen in PropList-Binärdaten"
6584
6585-#: ../../WINGs/proplist.c:725
6586+#: ../../WINGs/proplist.c:729
6587 msgid "unterminated PropList array"
6588-msgstr "nicht terminiertes PropList array"
6589+msgstr "nicht terminiertes PropList-Array"
6590
6591-#: ../../WINGs/proplist.c:733
6592+#: ../../WINGs/proplist.c:737
6593 msgid "missing or unterminated PropList array"
6594-msgstr "fehlendes oder nicht terminiertes PropList array"
6595+msgstr "fehlendes oder nicht terminiertes PropList-Array"
6596
6597-#: ../../WINGs/proplist.c:743
6598+#: ../../WINGs/proplist.c:747
6599 msgid "could not get PropList array element"
6600-msgstr ""
6601+msgstr "PropList-Array-Element konnte nicht gelesen werden"
6602
6603-#: ../../WINGs/proplist.c:772
6604+#: ../../WINGs/proplist.c:776
6605 msgid "unterminated PropList dictionary"
6606-msgstr ""
6607+msgstr "nicht terminiertes PropList-Dictionary"
6608
6609-#: ../../WINGs/proplist.c:789
6610+#: ../../WINGs/proplist.c:793
6611 msgid "missing PropList dictionary key"
6612-msgstr ""
6613+msgstr "fehlender Schlüssel in PropList-Dictionary"
6614
6615-#: ../../WINGs/proplist.c:791
6616+#: ../../WINGs/proplist.c:795
6617 msgid "missing PropList dictionary entry key or unterminated dictionary"
6618-msgstr ""
6619+msgstr "fehlender Schlüssel in PropList-Dictionary oder fehlende Terminierung"
6620
6621-#: ../../WINGs/proplist.c:799
6622+#: ../../WINGs/proplist.c:803
6623 msgid "error parsing PropList dictionary key"
6624-msgstr ""
6625+msgstr "Fehler beim Parsen eines PropList-Dictionary-Schlüssels"
6626
6627-#: ../../WINGs/proplist.c:807
6628+#: ../../WINGs/proplist.c:811
6629 msgid "missing = in PropList dictionary entry"
6630-msgstr ""
6631+msgstr "fehlendes \"=\" in PropList-Dictionary-Schlüssel"
6632
6633-#: ../../WINGs/proplist.c:815
6634+#: ../../WINGs/proplist.c:819
6635 msgid "error parsing PropList dictionary entry value"
6636-msgstr ""
6637+msgstr "Fehler beim Parsen eines PropList-Dictionary-Wertes"
6638
6639-#: ../../WINGs/proplist.c:823
6640+#: ../../WINGs/proplist.c:827
6641 msgid "missing ; in PropList dictionary entry"
6642-msgstr ""
6643+msgstr "fehlendes \";\" in PropList-Dictionary-Eintrag"
6644
6645-#: ../../WINGs/proplist.c:884
6646+#: ../../WINGs/proplist.c:888
6647 msgid ""
6648 "was expecting a string, data, array or dictionary. If it's a string, try "
6649 "enclosing it with \"."
6650 msgstr ""
6651-"string, data, array oder dictionary wurde erwartet. Zeichenketten mit \" "
6652+"Zeichenkette, Binärdaten, Array oder Dictionary erwartet. Zeichenketten ggf. mit \" "
6653 "einklammern."
6654
6655-#: ../../WINGs/proplist.c:888
6656+#: ../../WINGs/proplist.c:892
6657 msgid "Comments are not allowed inside WindowMaker owned domain files."
6658-msgstr "Kommentare sind in Domaindaten von WindowMaker nicht erlaubt."
6659+msgstr "Kommentare sind in Domänendaten von WindowMaker nicht erlaubt."
6660
6661-#: ../../WINGs/proplist.c:1559 ../../WINGs/proplist.c:1624
6662+#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
6663 msgid "extra data after end of property list"
6664 msgstr "zusätzliche Daten hinter dem Ende der Propertyliste"
6665
6666-#: ../../WINGs/proplist.c:1602
6667+#: ../../WINGs/proplist.c:1606
6668 #, c-format
6669 msgid "could not get size for file '%s'"
6670-msgstr "konnte Dateigröße von '%s' nicht ermitteln"
6671+msgstr "Dateigröße von '%s' konnte nicht ermittelt werden"
6672
6673-#: ../../WINGs/proplist.c:1614
6674+#: ../../WINGs/proplist.c:1619
6675 #, c-format
6676 msgid "error reading from file '%s'"
6677 msgstr "Fehler beim Lesen der Datei '%s'"
6678
6679-#: ../../WINGs/proplist.c:1665
6680+#: ../../WINGs/proplist.c:1671
6681 #, c-format
6682 msgid "mkstemp (%s) failed"
6683-msgstr "mkstemp (%s) schlug fehl"
6684+msgstr "mkstemp (%s) fehlgeschlagen"
6685
6686-#: ../../WINGs/proplist.c:1676
6687+#: ../../WINGs/proplist.c:1682
6688 #, c-format
6689 msgid "mktemp (%s) failed"
6690-msgstr "mktemp (%s) schlug fehl"
6691+msgstr "mktemp (%s) fehlgeschlagen"
6692
6693-#: ../../WINGs/proplist.c:1687
6694+#: ../../WINGs/proplist.c:1693
6695 #, c-format
6696 msgid "open (%s) failed"
6697-msgstr "open (%s) schlug fehl"
6698+msgstr "open (%s) fehlgeschlagen"
6699
6700-#: ../../WINGs/proplist.c:1694
6701+#: ../../WINGs/proplist.c:1700
6702 #, c-format
6703 msgid "writing to file: %s failed"
6704-msgstr "Schreiben in Datei: %s schlug fehl"
6705+msgstr "Schreiben in Datei: %s fehlgeschlagen"
6706
6707-#: ../../WINGs/proplist.c:1702
6708+#: ../../WINGs/proplist.c:1708
6709 #, c-format
6710 msgid "fclose (%s) failed"
6711-msgstr "fclose (%s) schlug fehl"
6712+msgstr "fclose (%s) fehlgeschlagen"
6713
6714-#: ../../WINGs/proplist.c:1711
6715+#: ../../WINGs/proplist.c:1717
6716 #, c-format
6717 msgid "rename ('%s' to '%s') failed"
6718-msgstr "rename ('%s' to '%s') schlug fehl"
6719+msgstr "rename ('%s' nach '%s') fehlgeschlagen"
6720
6721 #. something happened with the file. just overwrite it
6722-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
6723+#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
6724 #, c-format
6725 msgid "cannot read domain from file '%s' when syncing"
6726-msgstr "Kann bei der Synchronisation nicht aus Datei '%s' lesen"
6727+msgstr "Bei der Synchronisation konnte nicht aus der Datei '%s' gelesen werden"
6728
6729-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
6730-#: ../../WINGs/wcolor.c:291
6731+#: ../../WINGs/wcolor.c:237 ../../WINGs/wcolor.c:249 ../../WINGs/wcolor.c:288
6732+#: ../../WINGs/wcolor.c:329
6733 #, c-format
6734 msgid "could not allocate %s color"
6735-msgstr "konnte die Farbe %s nicht erzeugen"
6736+msgstr "Farbe %s konnte nicht erzeugt werden"
6737
6738-#: ../../WINGs/wcolor.c:198
6739+#: ../../WINGs/wcolor.c:237
6740 msgid "white"
6741-msgstr "weiß"
6742+msgstr "Weiß"
6743
6744-#: ../../WINGs/wcolor.c:211
6745+#: ../../WINGs/wcolor.c:249
6746 msgid "black"
6747-msgstr "schwarz"
6748+msgstr "Schwarz"
6749
6750-#: ../../WINGs/wcolor.c:250
6751+#: ../../WINGs/wcolor.c:288
6752 msgid "gray"
6753-msgstr "grau"
6754+msgstr "Grau"
6755
6756-#: ../../WINGs/wcolor.c:291
6757+#: ../../WINGs/wcolor.c:329
6758 msgid "dark gray"
6759-msgstr "dunkelgrau"
6760+msgstr "Dunkelgrau"
6761
6762-#: ../../WINGs/wcolorpanel.c:415
6763+#: ../../WINGs/wcolorpanel.c:420
6764 msgid "Colors"
6765 msgstr "Farben"
6766
6767-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
6768+#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
6769 msgid "Brightness"
6770 msgstr "Helligkeit"
6771
6772-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
6773-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
6774-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
6775-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
6776-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
6777-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
6778-#: ../../WINGs/wcolorpanel.c:3746
6779+#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
6780+#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
6781+#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
6782+#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
6783+#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
6784+#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
6785+#: ../../WINGs/wcolorpanel.c:3745
6786 msgid "Color Panel: Could not allocate memory"
6787-msgstr "Color Panel: Konnte keinen Speicher reservieren"
6788+msgstr "Farb-Panel: Speicher konnte nicht reserviert werden"
6789
6790-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
6791+#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
6792 msgid "Red"
6793 msgstr "Rot"
6794
6795-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
6796+#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
6797 msgid "Green"
6798 msgstr "Grün"
6799
6800-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
6801+#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
6802 msgid "Blue"
6803 msgstr "Blau"
6804
6805-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
6806+#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
6807 msgid "Cyan"
6808 msgstr ""
6809
6810-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
6811+#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
6812 msgid "Magenta"
6813 msgstr ""
6814
6815-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
6816+#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
6817 msgid "Yellow"
6818 msgstr "Gelb"
6819
6820-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
6821+#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
6822 msgid "Black"
6823 msgstr "Schwarz"
6824
6825-#: ../../WINGs/wcolorpanel.c:991
6826+#: ../../WINGs/wcolorpanel.c:996
6827 msgid "Spectrum"
6828 msgstr "Spektrum"
6829
6830-#: ../../WINGs/wcolorpanel.c:1021
6831+#: ../../WINGs/wcolorpanel.c:1026
6832 msgid "Palette"
6833 msgstr ""
6834
6835-#: ../../WINGs/wcolorpanel.c:1027
6836+#: ../../WINGs/wcolorpanel.c:1032
6837 msgid "New from File..."
6838 msgstr "Neu aus Datei..."
6839
6840-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
6841-#: ../../WINGs/wcolorpanel.c:1093
6842+#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
6843+#: ../../WINGs/wcolorpanel.c:1098
6844 msgid "Rename..."
6845 msgstr "Umbenennen..."
6846
6847-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
6848-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
6849+#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
6850+#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
6851 msgid "Remove"
6852 msgstr "Entfernen"
6853
6854-#: ../../WINGs/wcolorpanel.c:1030
6855+#: ../../WINGs/wcolorpanel.c:1035
6856 msgid "Copy"
6857 msgstr "Kopieren"
6858
6859-#: ../../WINGs/wcolorpanel.c:1031
6860+#: ../../WINGs/wcolorpanel.c:1036
6861 msgid "New from Clipboard"
6862 msgstr "Neu aus Zwischenablage"
6863
6864-#: ../../WINGs/wcolorpanel.c:1052
6865+#: ../../WINGs/wcolorpanel.c:1057
6866 msgid "X11-Colors"
6867 msgstr "X11-Farben"
6868
6869-#: ../../WINGs/wcolorpanel.c:1069
6870+#: ../../WINGs/wcolorpanel.c:1074
6871 msgid "Color"
6872 msgstr "Farbe"
6873
6874-#: ../../WINGs/wcolorpanel.c:1075
6875+#: ../../WINGs/wcolorpanel.c:1080
6876 msgid "Add..."
6877 msgstr "Hinzufügen..."
6878
6879-#: ../../WINGs/wcolorpanel.c:1085
6880+#: ../../WINGs/wcolorpanel.c:1090
6881 msgid "List"
6882 msgstr "Liste"
6883
6884-#: ../../WINGs/wcolorpanel.c:1092
6885+#: ../../WINGs/wcolorpanel.c:1097
6886 msgid "New..."
6887 msgstr "Neu..."
6888
6889-#: ../../WINGs/wcolorpanel.c:1231
6890+#: ../../WINGs/wcolorpanel.c:1236
6891 #, c-format
6892-msgid ""
6893-"Color Panel: Could not create directory %s needed to store configurations"
6894-msgstr ""
6895-"Color Panel: Konnte das Verzeichnis %s zum Speichern der Konfiguration nicht erzeugen"
6896+msgid "Color Panel: Could not create directory %s needed to store configurations"
6897+msgstr "Farb-Panel: Verzeichnis %s konnte zum Speichern der Konfiguration nicht erzeugt werden"
6898
6899 #. Delete the file, it doesn't belong here
6900-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
6901-#: ../../WINGs/wcolorpanel.c:3211
6902+#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
6903+#: ../../WINGs/wcolorpanel.c:3216
6904 msgid "File Error"
6905 msgstr "Dateifehler"
6906
6907-#: ../../WINGs/wcolorpanel.c:1238
6908+#: ../../WINGs/wcolorpanel.c:1243
6909 msgid "Could not create ColorPanel configuration directory"
6910-msgstr "Konnte Konfigurationsverzeichnis für Farbdialog nicht erzeugen"
6911+msgstr "Konfigurationsverzeichnis für Farb-Panel konnte nicht erzeugt werden"
6912
6913-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
6914-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
6915-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
6916-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
6917-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
6918+#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
6919+#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
6920+#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
6921+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
6922+#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:591
6923 msgid "OK"
6924-msgstr "OK"
6925+msgstr ""
6926
6927-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
6928-#: ../../WINGs/wcolorpanel.c:1299
6929+#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
6930+#: ../../WINGs/wcolorpanel.c:1304
6931 msgid "Color Panel: Could not find file"
6932-msgstr "Color Panel: Konnte Datei nicht finden"
6933+msgstr "Farb-Panel: Datei konnte nicht gefunden werden"
6934
6935-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
6936-#: ../../WINGs/wcolorpanel.c:1615
6937+#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
6938+#: ../../WINGs/wcolorpanel.c:1620
6939 msgid "Color Panel: X failed request"
6940-msgstr "Color Panel: X Anfrage schlug fehl"
6941+msgstr "Farb-Panel: X-Anfrage fehlgeschlagen"
6942
6943-#: ../../WINGs/wcolorpanel.c:2860
6944+#: ../../WINGs/wcolorpanel.c:2865
6945 msgid "Saturation"
6946 msgstr "Sättigung"
6947
6948-#: ../../WINGs/wcolorpanel.c:2896
6949+#: ../../WINGs/wcolorpanel.c:2901
6950 msgid "Hue"
6951 msgstr "Farbton"
6952
6953-#: ../../WINGs/wcolorpanel.c:3146
6954+#: ../../WINGs/wcolorpanel.c:3151
6955 msgid "Open Palette"
6956 msgstr "Palette öffnen"
6957
6958-#: ../../WINGs/wcolorpanel.c:3208
6959+#: ../../WINGs/wcolorpanel.c:3213
6960 msgid "Invalid file format !"
6961 msgstr "Ungültiges Dateiformat!"
6962
6963-#: ../../WINGs/wcolorpanel.c:3210
6964+#: ../../WINGs/wcolorpanel.c:3215
6965 #, c-format
6966 msgid "can't remove file %s"
6967-msgstr "kann Datei %s nicht entfernen"
6968+msgstr "Datei %s konnte nicht entfert werden"
6969
6970-#: ../../WINGs/wcolorpanel.c:3212
6971+#: ../../WINGs/wcolorpanel.c:3217
6972 msgid "Couldn't remove file from Configuration Directory !"
6973-msgstr "Konnte Datei nicht aus Konfigurationsverzeichnis entfernen!"
6974+msgstr "Datei konnte nicht aus Konfigurationsverzeichnis entfernt werden!"
6975
6976-#: ../../WINGs/wcolorpanel.c:3239
6977+#: ../../WINGs/wcolorpanel.c:3244
6978 msgid "Rename"
6979 msgstr "Umbenennen"
6980
6981-#: ../../WINGs/wcolorpanel.c:3239
6982+#: ../../WINGs/wcolorpanel.c:3244
6983 msgid "Rename palette to:"
6984 msgstr "Palette umbenennen in:"
6985
6986-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
6987-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
6988+#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
6989+#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
6990 msgid "Cancel"
6991 msgstr "Abbrechen"
6992
6993 #. Careful, this palette exists already
6994-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
6995+#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
6996 msgid "Warning"
6997 msgstr "Warnung"
6998
6999-#: ../../WINGs/wcolorpanel.c:3257
7000+#: ../../WINGs/wcolorpanel.c:3262
7001 msgid ""
7002 "Palette already exists !\n"
7003 "\n"
7004@@ -393,24 +401,24 @@
7005 "\n"
7006 "Überschreiben?"
7007
7008-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
7009+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
7010 msgid "No"
7011 msgstr "Nein"
7012
7013-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
7014+#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
7015 msgid "Yes"
7016 msgstr "Ja"
7017
7018-#: ../../WINGs/wcolorpanel.c:3289
7019+#: ../../WINGs/wcolorpanel.c:3294
7020 #, c-format
7021 msgid "Couldn't rename palette %s to %s\n"
7022-msgstr "Konnte Palette %s nicht in %s umbenennen\n"
7023+msgstr "Palette %s konnte nicht nach %s umbenannt werden\n"
7024
7025-#: ../../WINGs/wcolorpanel.c:3315
7026+#: ../../WINGs/wcolorpanel.c:3320
7027 msgid "This will permanently remove the palette "
7028-msgstr "Das wird die Palette unwiderruflich löschen "
7029+msgstr "Hiermit wird die Palette unwiderruflich gelöscht "
7030
7031-#: ../../WINGs/wcolorpanel.c:3318
7032+#: ../../WINGs/wcolorpanel.c:3323
7033 msgid ""
7034 ".\n"
7035 "\n"
7036@@ -420,29 +428,29 @@
7037 "\n"
7038 "Sind Sie sicher, dass Sie die Palette löschen wollen?"
7039
7040-#: ../../WINGs/wcolorpanel.c:3343
7041+#: ../../WINGs/wcolorpanel.c:3348
7042 #, c-format
7043 msgid "Couldn't remove palette %s\n"
7044-msgstr "Konnte Palette %s nicht löschen\n"
7045+msgstr "Palette %s konnte nicht gelöscht werden\n"
7046
7047-#: ../../WINGs/wcolorpanel.c:3648
7048+#: ../../WINGs/wcolorpanel.c:3647
7049 #, c-format
7050 msgid "Could not open %s"
7051-msgstr "Konnte %s nicht öffnen"
7052+msgstr "%s konnte nicht geöffnet werden"
7053
7054-#: ../../WINGs/wcolorpanel.c:3655
7055+#: ../../WINGs/wcolorpanel.c:3654
7056 #, c-format
7057 msgid "Could not create %s"
7058-msgstr "Konnte %s nicht erzeugen"
7059+msgstr "%s konnte nicht erzeugt werden"
7060
7061-#: ../../WINGs/wcolorpanel.c:3666
7062+#: ../../WINGs/wcolorpanel.c:3665
7063 #, c-format
7064 msgid "Write error on file %s"
7065 msgstr "Schreibfehler bei Datei %s"
7066
7067-#: ../../WINGs/wcolorpanel.c:3711
7068+#: ../../WINGs/wcolorpanel.c:3710
7069 msgid "Color Panel: Color unspecified"
7070-msgstr "Color Panel: Farbe nicht spezifiziert"
7071+msgstr "Farb-Panel: Farbe nicht spezifiziert"
7072
7073 #: ../../WINGs/wfilepanel.c:235
7074 msgid "Name:"
7075@@ -456,208 +464,164 @@
7076 msgid "Save"
7077 msgstr "Speichern"
7078
7079-#: ../../WINGs/wfilepanel.c:562
7080+#: ../../WINGs/wfilepanel.c:565
7081 #, c-format
7082 msgid "WINGs: could not open directory %s\n"
7083-msgstr "WINGs: Konnte Verzeichnis %s nicht öffen\n"
7084+msgstr "WINGs: Verzeichnis %s konnte nicht geöffnet werden\n"
7085
7086-#: ../../WINGs/wfilepanel.c:580
7087+#: ../../WINGs/wfilepanel.c:583
7088 #, c-format
7089 msgid "WINGs: could not stat %s\n"
7090-msgstr "WINGs: Dateistatus von %s nicht bestimmbar\n"
7091+msgstr "WINGs: Dateistatus von %s unbestimmbar\n"
7092
7093-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
7094-#: ../../WINGs/wfontpanel.c:708
7095+#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
7096+#: ../../WINGs/wfontpanel.c:590
7097 msgid "Error"
7098 msgstr "Fehler"
7099
7100-#: ../../WINGs/wfilepanel.c:658
7101+#: ../../WINGs/wfilepanel.c:661
7102 msgid "Create Directory"
7103 msgstr "Verzeichnis anlegen"
7104
7105-#: ../../WINGs/wfilepanel.c:659
7106+#: ../../WINGs/wfilepanel.c:662
7107 msgid "Enter directory name"
7108 msgstr "Verzeichnisname eingeben"
7109
7110-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
7111-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
7112+#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
7113+#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
7114 msgid "Permission denied."
7115 msgstr "Zugriff verweigert."
7116
7117-#: ../../WINGs/wfilepanel.c:698
7118+#: ../../WINGs/wfilepanel.c:701
7119 #, c-format
7120 msgid "'%s' already exists."
7121 msgstr "'%s' existiert bereits."
7122
7123-#: ../../WINGs/wfilepanel.c:701
7124+#: ../../WINGs/wfilepanel.c:704
7125 msgid "Path does not exist."
7126 msgstr "Pfad existiert nicht."
7127
7128-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
7129+#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
7130 #, c-format
7131 msgid "'%s' does not exist."
7132 msgstr "'%s' existiert nicht."
7133
7134-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
7135+#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
7136 msgid "Insufficient memory available."
7137 msgstr "Nicht genügend Speicher verfügbar."
7138
7139-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
7140+#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
7141 #, c-format
7142 msgid "'%s' is on a read-only filesystem."
7143-msgstr "'%s' liegt auf einem read-only Dateisystem."
7144+msgstr "'%s' liegt auf einem nur lesbaren Dateisystem."
7145
7146-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
7147-#: ../../WINGs/wfilepanel.c:804
7148+#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
7149+#: ../../WINGs/wfilepanel.c:807
7150 #, c-format
7151 msgid "Can not delete '%s'."
7152 msgstr "Kann %s nicht löschen."
7153
7154-#: ../../WINGs/wfilepanel.c:752
7155+#: ../../WINGs/wfilepanel.c:755
7156 #, c-format
7157 msgid "Delete directory %s ?"
7158-msgstr "Verzeichnis % s löschen?"
7159+msgstr "Verzeichnis %s löschen?"
7160
7161-#: ../../WINGs/wfilepanel.c:756
7162+#: ../../WINGs/wfilepanel.c:759
7163 #, c-format
7164 msgid "Delete file %s ?"
7165 msgstr "Datei %s löschen?"
7166
7167-#: ../../WINGs/wfilepanel.c:768
7168+#: ../../WINGs/wfilepanel.c:771
7169 #, c-format
7170 msgid "Directory '%s' does not exist."
7171 msgstr "Verzeichnis '%s' existiert nicht."
7172
7173-#: ../../WINGs/wfilepanel.c:771
7174+#: ../../WINGs/wfilepanel.c:774
7175 #, c-format
7176 msgid "Directory '%s' is not empty."
7177 msgstr "Verzeichnis '%s' ist nicht leer."
7178
7179-#: ../../WINGs/wfilepanel.c:774
7180+#: ../../WINGs/wfilepanel.c:777
7181 #, c-format
7182 msgid "Directory '%s' is busy."
7183-msgstr "Verzeichnis '%s' ist belegt."
7184+msgstr "Verzeichnis '%s' wird benutz."
7185
7186-#: ../../WINGs/wfilepanel.c:787
7187+#: ../../WINGs/wfilepanel.c:790
7188 #, c-format
7189 msgid "'%s' is a directory."
7190 msgstr "'%s' ist ein Verzeichnis."
7191
7192-#: ../../WINGs/wfilepanel.c:829
7193+#: ../../WINGs/wfilepanel.c:832
7194 #, c-format
7195 msgid "An error occured browsing '%s'."
7196 msgstr "Fehler beim Lesen von '%s'."
7197
7198-#: ../../WINGs/wfilepanel.c:833
7199+#: ../../WINGs/wfilepanel.c:836
7200 #, c-format
7201 msgid "'%s' is not a directory."
7202 msgstr "'%s' ist kein Verzeichnis."
7203
7204-#: ../../WINGs/wfilepanel.c:970
7205+#: ../../WINGs/wfilepanel.c:973
7206 msgid "File does not exist."
7207 msgstr "Datei existiert nicht."
7208
7209-#: ../../WINGs/wfont.c:129
7210+#: ../../WINGs/wfont.c:40
7211 #, c-format
7212-msgid "the following character sets are missing in %s:"
7213-msgstr "die folgenden Zeichensätze fehlen in %s:"
7214+msgid "invalid font: %s. Trying '%s'"
7215+msgstr "Ungültige Schriftart: %s. Wird ersetzt durch %s."
7216
7217-#: ../../WINGs/wfont.c:136
7218+#: ../../WINGs/wfont.c:257 ../../WINGs/wfont.c:277
7219 #, c-format
7220-msgid ""
7221-"the string \"%s\" will be used in place of any characters from those sets."
7222-msgstr ""
7223-"die Zeichenkette \"%s\" ersetzt alle anderen Zeichen dieser Zeichensätze."
7224+msgid "could not load font: %s."
7225+msgstr "Schriftart konnte nicht geladen werden: %s"
7226
7227-#: ../../WINGs/wfont.c:287 ../../WINGs/wfont.c:323
7228-#, c-format
7229-msgid "could not load font set %s. Trying fixed."
7230-msgstr "konnte Fonts %s nicht laden. Nehme fixed-Font."
7231+#. WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr));
7232+#: ../../WINGs/wfontpanel.c:203
7233+msgid "Font Panel"
7234+msgstr "Schrift-Panel"
7235
7236-#: ../../WINGs/wfont.c:293 ../../WINGs/wfont.c:329
7237-#, c-format
7238-msgid "could not load font %s. Trying fixed."
7239-msgstr "Konnte Font %s nicht laden. Nehme fixed-Font."
7240-
7241-#: ../../WINGs/wfont.c:297 ../../WINGs/wfont.c:333
7242-msgid "could not load fixed font!"
7243-msgstr "konnte fixed-Font nicht laden!"
7244-
7245-#: ../../WINGs/wfont.c:428
7246-#, c-format
7247-msgid "font description %s is too large."
7248-msgstr "Fontbeschreibung %s ist zu groß."
7249-
7250-#: ../../WINGs/wfontpanel.c:205
7251-msgid "Test!!!"
7252-msgstr "Test!"
7253+#: ../../WINGs/wfontpanel.c:239
7254+msgid "The quick brown fox jumps over the lazy dog"
7255+msgstr ""
7256
7257-#: ../../WINGs/wfontpanel.c:211
7258+#: ../../WINGs/wfontpanel.c:245
7259 msgid "Family"
7260 msgstr "Familie"
7261
7262-#: ../../WINGs/wfontpanel.c:222
7263+#: ../../WINGs/wfontpanel.c:256
7264 msgid "Typeface"
7265 msgstr "Schriftart"
7266
7267-#: ../../WINGs/wfontpanel.c:233
7268+#: ../../WINGs/wfontpanel.c:267
7269 msgid "Size"
7270 msgstr "Größe"
7271
7272-#: ../../WINGs/wfontpanel.c:252
7273+#: ../../WINGs/wfontpanel.c:286
7274 msgid "Set"
7275 msgstr "Setzen"
7276
7277-#: ../../WINGs/wfontpanel.c:257
7278+#: ../../WINGs/wfontpanel.c:292
7279 msgid "Revert"
7280-msgstr "Zurückn."
7281+msgstr "Zurücksetzen"
7282
7283-#: ../../WINGs/wfontpanel.c:709
7284-msgid "Could not retrieve font list"
7285-msgstr "Konnte Fontliste nicht wiederherstellen"
7286+#: ../../WINGs/wfontpanel.c:591
7287+msgid "Could not init font config library\n"
7288+msgstr "\"font-config\"-Bibliothek konnte nicht initialisiert werden\n"
7289
7290-#: ../../WINGs/wfontpanel.c:721
7291-#, c-format
7292-msgid "font name %s is longer than 256, which is invalid."
7293-msgstr "Fontname %s ist ungültig, da länger als 256 Zeichen."
7294-
7295-#: ../../WINGs/wfontpanel.c:868
7296-msgid "Roman"
7297-msgstr "Roman"
7298-
7299-#: ../../WINGs/wfontpanel.c:871
7300-msgid "Italic"
7301-msgstr "Kursiv"
7302-
7303-#: ../../WINGs/wfontpanel.c:873
7304-msgid "Oblique"
7305-msgstr "Schräg"
7306-
7307-#: ../../WINGs/wfontpanel.c:875
7308-msgid "Rev Italic"
7309-msgstr ""
7310-
7311-#: ../../WINGs/wfontpanel.c:877
7312-msgid "Rev Oblique"
7313-msgstr ""
7314-
7315-#: ../../WINGs/wfontpanel.c:883
7316-msgid "Normal"
7317-msgstr "Normal"
7318-
7319-#: ../../WINGs/widgets.c:415
7320+#: ../../WINGs/widgets.c:419
7321 #, c-format
7322 msgid "WINGs: could not load widget images file: %s"
7323-msgstr "WINGs: Konnte Widget-Bildatei %s nicht laden."
7324+msgstr "WINGs: Widget-Bilderdatei konnte nicht geladen werden: %s"
7325
7326-#: ../../WINGs/widgets.c:763
7327+#: ../../WINGs/widgets.c:767
7328 msgid ""
7329-"could not load any fonts. Make sure your font installationand locale "
7330+"could not load any fonts. Make sure your font installation and locale "
7331 "settings are correct."
7332 msgstr ""
7333-"Konnte keine Fonts laden. Überprüfen Sie, ob Ihre Fontinstallation und "
7334-"-einstellungen korrekt sind."
7335+"Keine Schrifen konnten geladen werden. Überprüfen Sie, ob Ihre Schrifteninstallation und -"
7336+"Lokalisierungseinstellungen korrekt sind."
7337
7338-#: ../../WINGs/wruler.c:189
7339+#: ../../WINGs/wruler.c:192
7340 msgid "0 inches"
7341 msgstr "0 Inch"
7342+
7343diff -Nur WindowMaker-0.92.0.orig/WINGs/selection.c WindowMaker-0.92.0/WINGs/selection.c
7344--- WindowMaker-0.92.0.orig/WINGs/selection.c 2004-10-12 20:31:44.000000000 +0200
7345+++ WindowMaker-0.92.0/WINGs/selection.c 2005-08-23 00:12:16.000000000 +0200
7346@@ -279,7 +279,7 @@
7347 WMData *wdata;
7348 unsigned char *data;
7349 Atom rtype;
7350- unsigned bits, bpi;
7351+ int bits, bpi;
7352 unsigned long len, bytes;
7353
7354
7355diff -Nur WindowMaker-0.92.0.orig/WINGs/wapplication.c WindowMaker-0.92.0/WINGs/wapplication.c
7356--- WindowMaker-0.92.0.orig/WINGs/wapplication.c 2004-10-24 05:13:29.000000000 +0200
7357+++ WindowMaker-0.92.0/WINGs/wapplication.c 2005-07-17 20:33:09.000000000 +0200
7358@@ -181,7 +181,6 @@
7359 return path;
7360 }
7361
7362-
7363 if (getenv("GNUSTEP_SYSTEM_ROOT")) {
7364 path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
7365 if (path) {
7366diff -Nur WindowMaker-0.92.0.orig/WINGs/wbrowser.c WindowMaker-0.92.0/WINGs/wbrowser.c
7367--- WindowMaker-0.92.0.orig/WINGs/wbrowser.c 2004-10-12 22:43:22.000000000 +0200
7368+++ WindowMaker-0.92.0/WINGs/wbrowser.c 2006-01-22 16:47:25.000000000 +0100
7369@@ -188,7 +188,7 @@
7370 int curMaxVisibleColumns;
7371 int newFirstVisibleColumn = 0;
7372
7373- assert ((int) bPtr);
7374+ assert (bPtr != NULL);
7375
7376 columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns;
7377 columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns;
7378@@ -324,7 +324,7 @@
7379 WMList **clist;
7380 char **tlist;
7381
7382- assert ((int) bPtr);
7383+ assert (bPtr != NULL);
7384
7385 column = (column < 0) ? 0 : column;
7386 if (column >= bPtr->columnCount) {
7387diff -Nur WindowMaker-0.92.0.orig/WINGs/wcolor.c WindowMaker-0.92.0/WINGs/wcolor.c
7388--- WindowMaker-0.92.0.orig/WINGs/wcolor.c 2004-10-25 03:48:39.000000000 +0200
7389+++ WindowMaker-0.92.0/WINGs/wcolor.c 2005-08-23 00:36:29.000000000 +0200
7390@@ -7,12 +7,12 @@
7391
7392 #define LIGHT_STIPPLE_WIDTH 4
7393 #define LIGHT_STIPPLE_HEIGHT 4
7394-static unsigned char LIGHT_STIPPLE_BITS[] = {
7395+static char LIGHT_STIPPLE_BITS[] = {
7396 0x05, 0x0a, 0x05, 0x0a};
7397
7398 #define DARK_STIPPLE_WIDTH 4
7399 #define DARK_STIPPLE_HEIGHT 4
7400-static unsigned char DARK_STIPPLE_BITS[] = {
7401+static char DARK_STIPPLE_BITS[] = {
7402 0x0a, 0x04, 0x0a, 0x01};
7403
7404
7405diff -Nur WindowMaker-0.92.0.orig/WINGs/wfont.c WindowMaker-0.92.0/WINGs/wfont.c
7406--- WindowMaker-0.92.0.orig/WINGs/wfont.c 2004-10-30 08:29:25.000000000 +0200
7407+++ WindowMaker-0.92.0/WINGs/wfont.c 2005-08-23 01:22:44.000000000 +0200
7408@@ -27,7 +27,7 @@
7409 /* Just skip old font names that contain %d in them.
7410 * We don't support that anymore. */
7411 if (strchr(xlfd, '%')!=NULL)
7412- return FcNameParse(DEFAULT_FONT);
7413+ return FcNameParse((FcChar8*)DEFAULT_FONT);
7414
7415 fname= wstrdup(xlfd);
7416 if ((ptr = strchr(fname, ','))) {
7417@@ -38,7 +38,7 @@
7418
7419 if (!pattern) {
7420 wwarning(_("invalid font: %s. Trying '%s'"), xlfd, DEFAULT_FONT);
7421- pattern = FcNameParse(DEFAULT_FONT);
7422+ pattern = FcNameParse((FcChar8*)DEFAULT_FONT);
7423 }
7424
7425 return pattern;
7426@@ -52,7 +52,7 @@
7427 char *fname;
7428
7429 pattern = xlfdToFcPattern(xlfd);
7430- fname = FcNameUnparse(pattern);
7431+ fname = (char*)FcNameUnparse(pattern);
7432 FcPatternDestroy(pattern);
7433
7434 return fname;
7435@@ -102,7 +102,7 @@
7436 if (font[0]=='-') {
7437 pattern = xlfdToFcPattern(font);
7438 } else {
7439- pattern = FcNameParse(font);
7440+ pattern = FcNameParse((FcChar8*)font);
7441 }
7442
7443 /*FcPatternPrint(pattern);*/
7444@@ -116,12 +116,12 @@
7445 }
7446
7447 if (fallback && !hasPropertyWithStringValue(pattern, FC_FAMILY, fallback)) {
7448- FcPatternAddString(pattern, FC_FAMILY, fallback);
7449+ FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)fallback);
7450 }
7451
7452 /*FcPatternPrint(pattern);*/
7453
7454- result = FcNameUnparse(pattern);
7455+ result = (char*)FcNameUnparse(pattern);
7456 FcPatternDestroy(pattern);
7457
7458 return result;
7459@@ -366,7 +366,7 @@
7460 * return the closest match font to what we requested which is the
7461 * oblique font. Same goes for using bold for weight.
7462 */
7463- pattern = FcNameParse(WMGetFontName(font));
7464+ pattern = FcNameParse((FcChar8*)WMGetFontName(font));
7465 switch (style) {
7466 case WFSNormal:
7467 FcPatternDel(pattern, FC_WEIGHT);
7468@@ -374,21 +374,21 @@
7469 break;
7470 case WFSBold:
7471 FcPatternDel(pattern, FC_WEIGHT);
7472- FcPatternAddString(pattern, FC_WEIGHT, "bold");
7473+ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold");
7474 break;
7475 case WFSItalic:
7476 FcPatternDel(pattern, FC_SLANT);
7477- FcPatternAddString(pattern, FC_SLANT, "italic");
7478+ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic");
7479 break;
7480 case WFSBoldItalic:
7481 FcPatternDel(pattern, FC_WEIGHT);
7482 FcPatternDel(pattern, FC_SLANT);
7483- FcPatternAddString(pattern, FC_WEIGHT, "bold");
7484- FcPatternAddString(pattern, FC_SLANT, "italic");
7485+ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold");
7486+ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic");
7487 break;
7488 }
7489
7490- name = FcNameUnparse(pattern);
7491+ name = (char*)FcNameUnparse(pattern);
7492 copy = WMCreateFont(scrPtr, name);
7493 FcPatternDestroy(pattern);
7494 wfree(name);
7495diff -Nur WindowMaker-0.92.0.orig/WINGs/wfontpanel.c WindowMaker-0.92.0/WINGs/wfontpanel.c
7496--- WindowMaker-0.92.0.orig/WINGs/wfontpanel.c 2004-10-23 04:44:17.000000000 +0200
7497+++ WindowMaker-0.92.0/WINGs/wfontpanel.c 2005-08-23 01:12:49.000000000 +0200
7498@@ -83,7 +83,7 @@
7499
7500
7501
7502-static void setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size);
7503+static void setFontPanelFontName(FontPanel *panel, char *family, char *style, double size);
7504
7505 static int isXLFD(char *font, int *length_ret);
7506
7507@@ -370,7 +370,7 @@
7508
7509 if (!isXLFD(fontName, &fname_len)) {
7510 /* maybe its proper fontconfig and we can parse it */
7511- pattern = FcNameParse(fontName);
7512+ pattern = FcNameParse((FcChar8*)fontName);
7513 } else {
7514 /* maybe its proper xlfd and we can convert it to an FcPattern */
7515 pattern = XftXlfdParse(fontName, False, False);
7516@@ -383,7 +383,7 @@
7517 if (FcPatternGetString(pattern, FC_FAMILY, 0, &family)==FcResultMatch)
7518 if (FcPatternGetString(pattern, FC_STYLE, 0, &style)==FcResultMatch)
7519 if (FcPatternGetDouble(pattern, "pixelsize", 0, &size)==FcResultMatch)
7520- setFontPanelFontName(panel, family, style, size);
7521+ setFontPanelFontName(panel, (char*)family, (char*)style, size);
7522
7523 FcPatternDestroy(pattern);
7524 }
7525@@ -603,7 +603,7 @@
7526
7527 if (FcPatternGetString(fs->fonts[i],FC_FAMILY,0,&family)==FcResultMatch)
7528 if (FcPatternGetString(fs->fonts[i],FC_STYLE,0,&style)==FcResultMatch)
7529- addFontToXftFamily(families, family, style);
7530+ addFontToXftFamily(families, (char*)family, (char*)style);
7531 }
7532 FcFontSetDestroy(fs);
7533 }
7534@@ -815,7 +815,7 @@
7535
7536
7537 static void
7538-setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size)
7539+setFontPanelFontName(FontPanel *panel, char *family, char *style, double size)
7540 {
7541 int famrow;
7542 int stlrow;
7543diff -Nur WindowMaker-0.92.0.orig/WINGs/widgets.c WindowMaker-0.92.0/WINGs/widgets.c
7544--- WindowMaker-0.92.0.orig/WINGs/widgets.c 2004-10-28 04:15:54.000000000 +0200
7545+++ WindowMaker-0.92.0/WINGs/widgets.c 2005-08-23 00:41:43.000000000 +0200
7546@@ -305,7 +305,7 @@
7547
7548 #define STIPPLE_WIDTH 8
7549 #define STIPPLE_HEIGHT 8
7550-static unsigned char STIPPLE_BITS[] = {
7551+static char STIPPLE_BITS[] = {
7552 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55
7553 };
7554
7555diff -Nur WindowMaker-0.92.0.orig/WINGs/WINGs/WINGsP.h WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h
7556--- WindowMaker-0.92.0.orig/WINGs/WINGs/WINGsP.h 2004-10-30 08:32:50.000000000 +0200
7557+++ WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h 2006-01-22 21:18:55.000000000 +0100
7558@@ -29,7 +29,7 @@
7559
7560 #define SCROLLER_WIDTH 20
7561
7562-#define XDND_VERSION 4
7563+#define XDND_VERSION 3
7564
7565
7566 typedef struct W_Application {
7567@@ -78,7 +78,7 @@
7568
7569 typedef struct W_FocusInfo {
7570 struct W_View *toplevel;
7571- struct W_View *focused; /* view that has the focus in this toplevel */
7572+ struct W_View *focused; /* view that has the focus in this toplevel */
7573 struct W_FocusInfo *next;
7574 } W_FocusInfo;
7575
7576@@ -110,8 +110,10 @@
7577
7578 typedef struct W_DragDestinationInfo {
7579 WMView *destView;
7580+ WMView *xdndAwareView;
7581 Window sourceWindow;
7582 W_DndState *state;
7583+ Bool sourceActionChanged;
7584 WMArray *sourceTypes;
7585 WMArray *requiredTypes;
7586 Bool typeListAvailable;
7587@@ -120,7 +122,7 @@
7588
7589
7590 struct W_DraggingInfo {
7591- unsigned char protocolVersion;
7592+ unsigned char protocolVersion; /* version supported on the other side */
7593 Time timestamp;
7594
7595 Atom sourceAction;
7596@@ -162,7 +164,7 @@
7597
7598 struct W_Window *windowList; /* list of windows in the app */
7599
7600- Window groupLeader; /* the leader of the application */
7601+ Window groupLeader; /* the leader of the application */
7602 /* also used for other things */
7603
7604 struct W_SelectionHandlers *selectionHandlerList;
7605@@ -195,11 +197,11 @@
7606 GC copyGC;
7607 GC clipGC;
7608
7609- GC monoGC; /* GC for 1bpp visuals */
7610+ GC monoGC; /* GC for 1bpp visuals */
7611
7612 GC xorGC;
7613
7614- GC ixorGC; /* IncludeInferiors XOR */
7615+ GC ixorGC; /* IncludeInferiors XOR */
7616
7617 GC drawStringGC; /* for WMDrawString() */
7618
7619@@ -276,15 +278,15 @@
7620
7621 Cursor invisibleCursor;
7622
7623- Atom attribsAtom; /* GNUstepWindowAttributes */
7624+ Atom attribsAtom; /* GNUstepWindowAttributes */
7625
7626- Atom deleteWindowAtom; /* WM_DELETE_WINDOW */
7627+ Atom deleteWindowAtom; /* WM_DELETE_WINDOW */
7628
7629- Atom protocolsAtom; /* _XA_WM_PROTOCOLS */
7630+ Atom protocolsAtom; /* _XA_WM_PROTOCOLS */
7631
7632- Atom clipboardAtom; /* CLIPBOARD */
7633+ Atom clipboardAtom; /* CLIPBOARD */
7634
7635- Atom xdndAwareAtom; /* XdndAware */
7636+ Atom xdndAwareAtom; /* XdndAware */
7637 Atom xdndSelectionAtom;
7638 Atom xdndEnterAtom;
7639 Atom xdndLeaveAtom;
7640@@ -304,7 +306,7 @@
7641
7642 Atom wmIconDragOffsetAtom;
7643
7644- Atom wmStateAtom; /* WM_STATE */
7645+ Atom wmStateAtom; /* WM_STATE */
7646
7647 Atom utf8String;
7648
7649@@ -313,8 +315,8 @@
7650 Atom netwmIcon;
7651
7652 /* stuff for detecting double-clicks */
7653- Time lastClickTime; /* time of last mousedown event */
7654- Window lastClickWindow; /* window of the last mousedown */
7655+ Time lastClickTime; /* time of last mousedown event */
7656+ Window lastClickWindow; /* window of the last mousedown */
7657
7658 struct W_View *modalView;
7659 unsigned modalLoop:1;
7660@@ -341,8 +343,7 @@
7661 typedef struct W_View {
7662 struct W_Screen *screen;
7663
7664- WMWidget *self; /* must point to the widget the
7665- * view belongs to */
7666+ WMWidget *self; /* must point to the widget the view belongs to */
7667
7668 W_ViewDelegate *delegate;
7669
7670@@ -362,18 +363,18 @@
7671
7672 struct W_View *nextResponder; /* next to receive keyboard events */
7673
7674- struct W_View *parent; /* parent WMView */
7675+ struct W_View *parent; /* parent WMView */
7676
7677 struct W_View *childrenList; /* first in list of child windows */
7678
7679- struct W_View *nextSister; /* next on parent's children list */
7680+ struct W_View *nextSister; /* next on parent's children list */
7681
7682- WMArray *eventHandlers; /* event handlers for this window */
7683+ WMArray *eventHandlers; /* event handlers for this window */
7684
7685 unsigned long attribFlags;
7686 XSetWindowAttributes attribs;
7687
7688- void *hangedData; /* data holder for user program */
7689+ void *hangedData; /* data holder for user program */
7690
7691 WMColor *backColor;
7692
7693@@ -391,9 +392,9 @@
7694 unsigned int realized:1;
7695 unsigned int mapped:1;
7696 unsigned int parentDying:1;
7697- unsigned int dying:1; /* the view is being destroyed */
7698+ unsigned int dying:1; /* the view is being destroyed */
7699 unsigned int topLevel:1; /* is a top level window */
7700- unsigned int root:1; /* is the root window */
7701+ unsigned int root:1; /* is the root window */
7702 unsigned int mapWhenRealized:1; /* map the view when it's realized */
7703 unsigned int alreadyDead:1; /* view was freed */
7704
7705diff -Nur WindowMaker-0.92.0.orig/WINGs/wtext.c WindowMaker-0.92.0/WINGs/wtext.c
7706--- WindowMaker-0.92.0.orig/WINGs/wtext.c 2004-10-28 05:14:55.000000000 +0200
7707+++ WindowMaker-0.92.0/WINGs/wtext.c 2006-01-22 16:47:25.000000000 +0100
7708@@ -207,7 +207,7 @@
7709
7710 #define STIPPLE_WIDTH 8
7711 #define STIPPLE_HEIGHT 8
7712-static unsigned char STIPPLE_BITS[] = {
7713+static char STIPPLE_BITS[] = {
7714 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa
7715 };
7716
7717@@ -1969,7 +1969,7 @@
7718 } else if(tb->used == 0) {
7719 tb->blank = 1;
7720 } else if(tb->graphic) {
7721- Bool hasNext = (Bool)(tb->next);
7722+ Bool hasNext = (tb->next != NULL);
7723
7724 WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr));
7725 if(hasNext) {
7726diff -Nur WindowMaker-0.92.0.orig/WINGs/wview.c WindowMaker-0.92.0/WINGs/wview.c
7727--- WindowMaker-0.92.0.orig/WINGs/wview.c 2004-10-28 04:41:04.000000000 +0200
7728+++ WindowMaker-0.92.0/WINGs/wview.c 2006-01-22 19:08:39.000000000 +0100
7729@@ -450,6 +450,9 @@
7730
7731 W_FreeViewXdndPart(view);
7732
7733+ if (view->backColor)
7734+ WMReleaseColor(view->backColor);
7735+
7736 wfree(view);
7737 }
7738
7739@@ -715,7 +718,8 @@
7740 {
7741 WMScreen *scr = W_VIEW_SCREEN(view);
7742 Window foo;
7743- int x, y, topX, topY, bar;
7744+ int x, y, topX, topY;
7745+ unsigned int bar;
7746 WMView *topView;
7747
7748 topView = view;
7749diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/FontSimple.c WindowMaker-0.92.0/WPrefs.app/FontSimple.c
7750--- WindowMaker-0.92.0.orig/WPrefs.app/FontSimple.c 2004-10-26 14:03:42.000000000 +0200
7751+++ WindowMaker-0.92.0/WPrefs.app/FontSimple.c 2005-08-23 01:15:17.000000000 +0200
7752@@ -231,11 +231,11 @@
7753
7754 for (i= 0; i < fonts->nfont; i++)
7755 {
7756- FcChar8 *name;
7757+ char *name;
7758 int weight, slant, width;
7759 int j, found;
7760
7761- if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &name) != FcResultMatch)
7762+ if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch)
7763 continue;
7764
7765 if (FcPatternGetInteger(fonts->fonts[i], FC_WEIGHT, 0, &weight) != FcResultMatch)
7766@@ -309,7 +309,7 @@
7767
7768
7769 static char*
7770-getSelectedFont(_Panel *panel, char *curfont)
7771+getSelectedFont(_Panel *panel, FcChar8 *curfont)
7772 {
7773 WMListItem *item;
7774 FcPattern *pat= FcNameParse(curfont);
7775@@ -319,7 +319,7 @@
7776 if (item)
7777 {
7778 FcPatternDel(pat, FC_FAMILY);
7779- FcPatternAddString(pat, FC_FAMILY, item->text);
7780+ FcPatternAddString(pat, FC_FAMILY, (FcChar8*)item->text);
7781 }
7782
7783 item= WMGetListSelectedItem(panel->styleL);
7784@@ -344,9 +344,9 @@
7785 FcPatternAddDouble(pat, FC_PIXEL_SIZE, atoi(item->text));
7786 }
7787
7788- name= FcNameUnparse(pat);
7789+ name = (char*)FcNameUnparse(pat);
7790 FcPatternDestroy(pat);
7791-
7792+
7793 return name;
7794 }
7795
7796@@ -446,12 +446,13 @@
7797 {
7798 int index= WMGetPopUpButtonSelectedItem(panel->optionP);
7799 WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index);
7800- char *ofont, *nfont;
7801+ FcChar8 *ofont;
7802+ char *nfont;
7803
7804- ofont= (char*)WMGetMenuItemRepresentedObject(item);
7805-
7806+ ofont= (FcChar8*)WMGetMenuItemRepresentedObject(item);
7807 nfont= getSelectedFont(panel, ofont);
7808- free(ofont);
7809+ wfree(ofont);
7810+
7811 WMSetMenuItemRepresentedObject(item, nfont);
7812 }
7813 updateSampleFont(panel);
7814@@ -465,12 +466,13 @@
7815 _Panel *panel= (_Panel*)data;
7816 int index= WMGetPopUpButtonSelectedItem(panel->optionP);
7817 WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index);
7818- char *ofont, *nfont;
7819+ FcChar8 *ofont;
7820+ char *nfont;
7821
7822- ofont= (char*)WMGetMenuItemRepresentedObject(item);
7823-
7824+ ofont = (FcChar8*)WMGetMenuItemRepresentedObject(item);
7825 nfont= getSelectedFont(panel, ofont);
7826- free(ofont);
7827+ wfree(ofont);
7828+
7829 WMSetMenuItemRepresentedObject(item, nfont);
7830
7831 updateSampleFont(panel);
7832@@ -490,10 +492,10 @@
7833 {
7834 FcPattern *pat;
7835
7836- pat= FcNameParse(font);
7837+ pat= FcNameParse((FcChar8*)font);
7838 if (pat)
7839 {
7840- FcChar8 *name;
7841+ char *name;
7842 int weight, slant, width;
7843 double size;
7844 int distance, closest, found;
7845@@ -501,7 +503,7 @@
7846
7847 FcDefaultSubstitute(pat);
7848
7849- if (FcPatternGetString(pat, FC_FAMILY, 0, &name) != FcResultMatch)
7850+ if (FcPatternGetString(pat, FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch)
7851 name= "sans serif";
7852
7853 found= 0;
7854diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/main.c WindowMaker-0.92.0/WPrefs.app/main.c
7855--- WindowMaker-0.92.0.orig/WPrefs.app/main.c 2004-10-19 04:41:54.000000000 +0200
7856+++ WindowMaker-0.92.0/WPrefs.app/main.c 2005-07-17 21:15:36.000000000 +0200
7857@@ -100,7 +100,7 @@
7858 {
7859 Display *dpy;
7860 WMScreen *scr;
7861- char *locale;
7862+ char *locale, *path;
7863 int i;
7864 char *display_name="";
7865
7866@@ -110,6 +110,20 @@
7867
7868 WMInitializeApplication("WPrefs", &argc, argv);
7869
7870+ WMSetResourcePath(RESOURCE_PATH);
7871+ path = WMPathForResourceOfType("WPrefs.tiff", NULL);
7872+ if (!path) {
7873+ /* maybe it is run directly from the source directory */
7874+ WMSetResourcePath(".");
7875+ path = WMPathForResourceOfType("WPrefs.tiff", NULL);
7876+ if (!path) {
7877+ WMSetResourcePath("..");
7878+ }
7879+ }
7880+ if (path) {
7881+ wfree(path);
7882+ }
7883+
7884 if (argc>1) {
7885 for (i=1; i<argc; i++) {
7886 if (strcmp(argv[i], "-version")==0
7887diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/Makefile.am WindowMaker-0.92.0/WPrefs.app/Makefile.am
7888--- WindowMaker-0.92.0.orig/WPrefs.app/Makefile.am 2004-11-06 20:41:39.000000000 +0100
7889+++ WindowMaker-0.92.0/WPrefs.app/Makefile.am 2005-07-17 20:21:00.000000000 +0200
7890@@ -42,7 +42,7 @@
7891 imagebrowser.h \
7892 xmodifier.c
7893
7894-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
7895+AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\"
7896
7897 AM_CFLAGS = @NOSTRICTALIASING@
7898
7899diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/po/de.po WindowMaker-0.92.0/WPrefs.app/po/de.po
7900--- WindowMaker-0.92.0.orig/WPrefs.app/po/de.po 2004-10-17 08:28:06.000000000 +0200
7901+++ WindowMaker-0.92.0/WPrefs.app/po/de.po 2005-07-05 21:39:14.000000000 +0200
7902@@ -1,17 +1,26 @@
7903-# SOME DESCRIPTIVE TITLE.
7904-# Copyright (C) YEAR Free Software Foundation, Inc.
7905-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
7906+# translation of wprefsneu.po to
7907+#
7908+# German Message Catalog for WPrefs.app
7909+#
7910+# Initial translation
7911+# Gudio Scholz <guido.scholz@bayernline.de>
7912+# Bernd Eggert <Bernd.Eggert@t-online.de>
7913+#
7914+# Fully retranslated and updated for newer versions
7915+# Torsten Marek <shlomme@gmx.net>
7916+# , 2004.
7917 #
7918 msgid ""
7919 msgstr ""
7920-"Project-Id-Version: WPrefs 0.45\n"
7921-"POT-Creation-Date: 2003-01-06 01:33+0100\n"
7922-"PO-Revision-Date: 2003-01-25 16:00CET\n"
7923-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
7924-"Language-Team: Deutsch <de@li.org>\n"
7925+"Project-Id-Version: wprefsneu\n"
7926+"POT-Creation-Date: 2004-11-05 23:50+0100\n"
7927+"PO-Revision-Date: 2004-11-14 13:15+0100\n"
7928+"Last-Translator: \n"
7929+"Language-Team: <en@li.org>\n"
7930 "MIME-Version: 1.0\n"
7931 "Content-Type: text/plain; charset=UTF-8\n"
7932 "Content-Transfer-Encoding: 8bit\n"
7933+"X-Generator: KBabel 1.9.1\n"
7934
7935 #: ../../WPrefs.app/Appearance.c:1154
7936 msgid "Select File"
7937@@ -27,19 +36,20 @@
7938
7939 #: ../../WPrefs.app/Appearance.c:1565
7940 msgid "Owner of Focused Window"
7941-msgstr "Eigentümer des akt. Fensters"
7942+msgstr "Eigentümer des aktiven Fensters"
7943
7944 #: ../../WPrefs.app/Appearance.c:1570 ../../WPrefs.app/Appearance.c:1893
7945+#: ../../WPrefs.app/FontSimple.c:108
7946 msgid "Menu Title"
7947 msgstr "Menütitel"
7948
7949 #: ../../WPrefs.app/Appearance.c:1575 ../../WPrefs.app/Appearance.c:1578
7950 msgid "Normal Item"
7951-msgstr "Normal"
7952+msgstr "Normaler Eintrag"
7953
7954 #: ../../WPrefs.app/Appearance.c:1583
7955 msgid "Disabled Item"
7956-msgstr "Deaktiviert"
7957+msgstr "Ausgeschalteter Eintrag"
7958
7959 #: ../../WPrefs.app/Appearance.c:1595
7960 msgid "Highlighted"
7961@@ -59,11 +69,11 @@
7962
7963 #: ../../WPrefs.app/Appearance.c:1796
7964 msgid "Titlebar of Focused Window's Owner"
7965-msgstr "Titelleiste d. Eigent. d. akt. Fensters"
7966+msgstr "Titelleiste des Eigentümers des aktiven Fensters"
7967
7968 #: ../../WPrefs.app/Appearance.c:1797
7969 msgid "Window Resizebar"
7970-msgstr "Fenster-Größenänderungsleiste"
7971+msgstr "Größenänderungsleiste"
7972
7973 #: ../../WPrefs.app/Appearance.c:1798
7974 msgid "Titlebar of Menus"
7975@@ -91,19 +101,19 @@
7976
7977 #: ../../WPrefs.app/Appearance.c:1833
7978 msgid "Create a new texture."
7979-msgstr "Neue Textur erzeugen."
7980+msgstr "Neue Textur erstellen."
7981
7982 #: ../../WPrefs.app/Appearance.c:1841
7983 msgid "Extract..."
7984-msgstr "Extrahieren..."
7985+msgstr "Holen"
7986
7987 #: ../../WPrefs.app/Appearance.c:1845
7988 msgid "Extract texture(s) from a theme or a style file."
7989-msgstr "Extrahiere Textur(en) aus einer Themen- oder Stildatei."
7990+msgstr "Textur(en) aus einer Themen- oder Stildatei holen."
7991
7992 #: ../../WPrefs.app/Appearance.c:1855
7993 msgid "Edit"
7994-msgstr "Bearbeiten"
7995+msgstr "Ändern"
7996
7997 #: ../../WPrefs.app/Appearance.c:1858
7998 msgid "Edit the highlighted texture."
7999@@ -131,7 +141,7 @@
8000
8001 #: ../../WPrefs.app/Appearance.c:1892
8002 msgid "Owner of Focused Window Title"
8003-msgstr "Titel d. Eigentümers d. akt. Fensters"
8004+msgstr "Titel des Eigentümers des aktiven Fensters"
8005
8006 #: ../../WPrefs.app/Appearance.c:1894
8007 msgid "Menu Item Text"
8008@@ -139,7 +149,7 @@
8009
8010 #: ../../WPrefs.app/Appearance.c:1895
8011 msgid "Disabled Menu Item Text"
8012-msgstr "Text eines deaktiv. Menüeintrages"
8013+msgstr "Text eines ausgeschalteten Menüeintrages"
8014
8015 #: ../../WPrefs.app/Appearance.c:1896
8016 msgid "Menu Highlight Color"
8017@@ -147,7 +157,7 @@
8018
8019 #: ../../WPrefs.app/Appearance.c:1897
8020 msgid "Highlighted Menu Text Color"
8021-msgstr "Text des ausgew. Menüeintrages"
8022+msgstr "Text des ausgewählten Menüeintrages"
8023
8024 #: ../../WPrefs.app/Appearance.c:1936
8025 msgid "Background"
8026@@ -163,23 +173,23 @@
8027
8028 #: ../../WPrefs.app/Appearance.c:1968
8029 msgid "Menu Style"
8030-msgstr " Menüstil "
8031+msgstr "Menü-Stil"
8032
8033-#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:242
8034-#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288
8035+#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:241
8036+#: ../../WPrefs.app/Configurations.c:253 ../../WPrefs.app/Focus.c:288
8037 #: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134
8038 #: ../../WPrefs.app/MenuPreferences.c:145
8039 #: ../../WPrefs.app/MenuPreferences.c:173
8040 #: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560
8041-#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558
8042-#: ../../WPrefs.app/WPrefs.c:583
8043+#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:546
8044+#: ../../WPrefs.app/WPrefs.c:571
8045 #, c-format
8046 msgid "could not load icon file %s"
8047-msgstr "Symboldatei %s konnte nicht geladen werden"
8048+msgstr "Symboldatei %s konnte nicht geöffnet werden"
8049
8050 #: ../../WPrefs.app/Appearance.c:2010
8051 msgid "Title Alignment"
8052-msgstr " Titelausrichtung "
8053+msgstr "Titel-Ausrichtung"
8054
8055 #: ../../WPrefs.app/Appearance.c:2017
8056 msgid "Left"
8057@@ -214,13 +224,13 @@
8058 msgid "Textures"
8059 msgstr "Texturen"
8060
8061-#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:302
8062+#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:301
8063 msgid "Close"
8064 msgstr "Schließen"
8065
8066 #: ../../WPrefs.app/Appearance.c:2330
8067 msgid "Extract"
8068-msgstr "Extrahieren"
8069+msgstr "Holen"
8070
8071 #: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156
8072 #: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339
8073@@ -228,250 +238,239 @@
8074 #: ../../WPrefs.app/Workspace.c:101
8075 #, c-format
8076 msgid "could not load icon %s"
8077-msgstr "Symbol %s konnte nicht geladen werden"
8078+msgstr "Symboldatei %s konnte nicht geöffnet werden"
8079
8080 #: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
8081 #, c-format
8082 msgid "could not process icon %s:"
8083-msgstr "Symbol %s konnte nicht verarbeitet werden"
8084+msgstr "Symboldatei %s konnte nicht verarbeitet werden"
8085
8086-#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
8087+#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164
8088 #, c-format
8089 msgid "could not load image file %s"
8090 msgstr "Bilddatei %s konnte nicht geladen werden"
8091
8092-#: ../../WPrefs.app/Configurations.c:203
8093+#: ../../WPrefs.app/Configurations.c:202
8094 msgid "Icon Slide Speed"
8095 msgstr "Symbol-Bewegungsgeschwindigkeit"
8096
8097-#: ../../WPrefs.app/Configurations.c:209
8098+#: ../../WPrefs.app/Configurations.c:208
8099 msgid "Shade Animation Speed"
8100 msgstr "Roll-Animationsgeschwindigkeit"
8101
8102-#: ../../WPrefs.app/Configurations.c:271
8103+#: ../../WPrefs.app/Configurations.c:270
8104 msgid "Smooth Scaling"
8105 msgstr "Weiche Skalierung"
8106
8107-#: ../../WPrefs.app/Configurations.c:272
8108+#: ../../WPrefs.app/Configurations.c:271
8109 msgid ""
8110 "Smooth scaled background images, neutralizing\n"
8111 "the `pixelization' effect. This will slow\n"
8112 "down loading of background images considerably."
8113 msgstr ""
8114-"Weich skalierte Hintergrundbilder, neutralisiert\n"
8115-"Verpixelungen. Diese Option verlangsamt\n"
8116-"deutlich das Laden von Hintergrundbildern."
8117+"Weiche Skalierung von Hintergrundbilderverhindert\n"
8118+"Verpixelungen, aber führt zu einem deutlich\n"
8119+"längeren Ladeprozess."
8120
8121-#: ../../WPrefs.app/Configurations.c:313
8122+#: ../../WPrefs.app/Configurations.c:312
8123 msgid "Titlebar Style"
8124 msgstr "Titelleisten-Stil"
8125
8126-#: ../../WPrefs.app/Configurations.c:351
8127+#: ../../WPrefs.app/Configurations.c:350
8128 msgid "Animations and Sound"
8129 msgstr "Animationen und Klänge"
8130
8131-#: ../../WPrefs.app/Configurations.c:357
8132+#: ../../WPrefs.app/Configurations.c:356
8133 msgid "Animations"
8134 msgstr "Animationen"
8135
8136-#: ../../WPrefs.app/Configurations.c:368
8137+#: ../../WPrefs.app/Configurations.c:367
8138 msgid ""
8139 "Disable/enable animations such as those shown\n"
8140 "for window miniaturization, shading etc."
8141 msgstr ""
8142-"Animationen für Fenster-Minimierung,\n"
8143-"-Aufrollen usw. ein/ausschalten."
8144+"Animationen wie Fenster-Minimierung, Rollen usw. \n"
8145+"ein-/ausschalten"
8146
8147-#: ../../WPrefs.app/Configurations.c:376
8148+#: ../../WPrefs.app/Configurations.c:375
8149 msgid "Superfluous"
8150-msgstr "Effekte"
8151+msgstr "Zusätzliche Effekte"
8152
8153-#: ../../WPrefs.app/Configurations.c:387
8154+#: ../../WPrefs.app/Configurations.c:386
8155 msgid ""
8156 "Disable/enable `superfluous' features and\n"
8157 "animations. These include the `ghosting' of the\n"
8158 "dock when it's being moved to another side and\n"
8159 "the explosion animation when undocking icons."
8160 msgstr ""
8161-"Überflüssige Effekte ein/ausschalten. Dazu gehören\n"
8162-"das 'Ghosten' des Docks beim Verschieben und die\n"
8163-"Explosion von aus dem Dock entfernten Symbolen."
8164+"Zusätzliche Effekte ein-/ausschalten. Dazu gehören\n"
8165+"das transparente Bild des Dock, wenn es auf die\n"
8166+"andere Seite verschoben wird und die Explosion\n"
8167+"der aus dem Dock entfernten Symbole."
8168
8169-#: ../../WPrefs.app/Configurations.c:397
8170+#: ../../WPrefs.app/Configurations.c:396
8171 msgid "Sounds"
8172 msgstr "Klänge"
8173
8174-#: ../../WPrefs.app/Configurations.c:408
8175+#: ../../WPrefs.app/Configurations.c:407
8176 msgid ""
8177 "Disable/enable support for sound effects played\n"
8178 "for actions like shading and closing a window.\n"
8179 "You will need a module distributed separately\n"
8180 "for this. You can get it at:\n"
8181-"http://shadowmere.student.utwente.nl/"
8182+"http://largo.windowmaker.org/files.php#WSoundServer"
8183 msgstr ""
8184-"Unterstützung für Klanguntermalung von Ereignissen\n"
8185-"wie dem Auf-/Abrollen oder Schließen eines Fensters.\n"
8186-"Hierzu brauchen sie ein zusätzliches Modul, das separat\n"
8187-"vertrieben wird. Sie erhalten es bei\n"
8188-"http://shadowmere.student.utwente.nl/"
8189+"Klangsignale für Ereignisse wie Auf-/Abrollen und\n"
8190+"Schließen eines Fenster ein-/ausschalten. Hierfür\n"
8191+"wird ein separates Modul benötigt, dass sie von\n"
8192+"http.//largo.windowmaker.org/files.php#WSoundServer\n"
8193+"herunterladen können."
8194
8195-#: ../../WPrefs.app/Configurations.c:419
8196+#: ../../WPrefs.app/Configurations.c:418
8197 msgid ""
8198 "Note: sound requires a module distributed\n"
8199 "separately"
8200-msgstr "Achtung: Klänge benötigen ein separates Modul"
8201+msgstr "Achtung: Klänge benötigen separates Modul"
8202
8203-#: ../../WPrefs.app/Configurations.c:429
8204+#: ../../WPrefs.app/Configurations.c:428
8205 msgid "Dithering colormap for 8bpp"
8206-msgstr "Dithering für 8 bpp-Farbpalette"
8207+msgstr "Dithering für 8bpp-Farbpalette"
8208
8209-#: ../../WPrefs.app/Configurations.c:431
8210+#: ../../WPrefs.app/Configurations.c:430
8211 msgid ""
8212 "Number of colors to reserve for Window Maker\n"
8213 "on displays that support only 8bpp (PseudoColor)."
8214 msgstr ""
8215 "Anzahl der Farben, die für Window Maker auf\n"
8216-"Displays mit 8 bpp reserviert werden sollen (PseudoColor)."
8217+"Display mit nur 8bpp reserviert werden sollen (PseudoColor)."
8218
8219-#: ../../WPrefs.app/Configurations.c:438
8220+#: ../../WPrefs.app/Configurations.c:437
8221 msgid "Disable dithering in any visual/depth"
8222-msgstr "Dithering für alle Visuals und Farbtiefen deaktivieren."
8223+msgstr "Dithering in jedem Visual und jeder Farbtiefe ausschalten."
8224
8225-#: ../../WPrefs.app/Configurations.c:459
8226+#: ../../WPrefs.app/Configurations.c:458
8227 msgid ""
8228 "More colors for\n"
8229 "applications"
8230 msgstr ""
8231-"Mehr Farben f.\n"
8232+"Mehr Farben für\n"
8233 "Anwendungen"
8234
8235-#: ../../WPrefs.app/Configurations.c:466
8236+#: ../../WPrefs.app/Configurations.c:465
8237 msgid ""
8238 "More colors for\n"
8239 "Window Maker"
8240 msgstr ""
8241-"Mehr Farben f.\n"
8242+"Mehr Farben für\n"
8243 "Window Maker"
8244
8245-#: ../../WPrefs.app/Configurations.c:521
8246+#: ../../WPrefs.app/Configurations.c:520
8247 msgid "Other Configurations"
8248 msgstr "Verschiedene Einstellungen"
8249
8250-#: ../../WPrefs.app/Configurations.c:523
8251+#: ../../WPrefs.app/Configurations.c:522
8252 msgid ""
8253 "Animation speeds, titlebar styles, various option\n"
8254 "toggling and number of colors to reserve for\n"
8255 "Window Maker on 8bit displays."
8256 msgstr ""
8257 "Animationsgeschwindigkeiten, Titelleisten-Stil,\n"
8258-"verschiedene Einstellungen und Festlegung der für\n"
8259-"Window Maker reservierten Farben auf 8 bpp-Displays."
8260+"Einstellen der für Window Maker reservierten\n"
8261+"Farben auf 8bpp-Displays."
8262
8263-#: ../../WPrefs.app/Expert.c:77
8264-msgid "Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
8265+#: ../../WPrefs.app/Expert.c:75
8266+msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
8267 msgstr "Keine Minifenster (Symbole für minimierte Fenster). Für KDE/GNOME."
8268
8269-#: ../../WPrefs.app/Expert.c:78
8270+#: ../../WPrefs.app/Expert.c:76
8271 msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
8272 msgstr "Keine Window Maker-spezifischen Parameter setzen (xset nicht benutzen)."
8273
8274-#: ../../WPrefs.app/Expert.c:79
8275+#: ../../WPrefs.app/Expert.c:77
8276 msgid "Automatically save session when exiting Window Maker."
8277-msgstr "Automatisches Abspeichern der Sitzung beim Beenden."
8278+msgstr "Automatischens Abspeichern der Sitzung beim Beenden."
8279
8280-#: ../../WPrefs.app/Expert.c:80
8281+#: ../../WPrefs.app/Expert.c:78
8282 msgid "Use SaveUnder in window frames, icons, menus and other objects."
8283-msgstr "\"SaveUnder\" für Fensterrahmen, Symbole, Menüs u. a. benutzen."
8284+msgstr "SaveUnder für Fensterrahmen, Symbole, Menü u. a. benutzen"
8285
8286-#: ../../WPrefs.app/Expert.c:81
8287-msgid "Use Windoze style cycling."
8288-msgstr "\"Windoze\"-Stil beim Durchlaufen der Fenster."
8289-
8290-#: ../../WPrefs.app/Expert.c:82
8291+#: ../../WPrefs.app/Expert.c:79
8292 msgid "Disable confirmation panel for the Kill command."
8293-msgstr "Kein Bestätigungsdialog für das \"Kill\"-Kommando."
8294+msgstr "Kein Bestätigungsdialog für den Töten-Befehl"
8295
8296-#: ../../WPrefs.app/Expert.c:83
8297+#: ../../WPrefs.app/Expert.c:80
8298 msgid "Disable selection animation for selected icons."
8299-msgstr "Keine Auswahlanimation für ausgewählte Symbole."
8300+msgstr "Keine Auswahlanimation für ausgewählte Symbole"
8301
8302-#: ../../WPrefs.app/Expert.c:84
8303+#: ../../WPrefs.app/Expert.c:81
8304 msgid "Smooth font edges (needs restart)."
8305 msgstr "Geglättete Schriftarten (Neustart erforderlich)."
8306
8307-#: ../../WPrefs.app/Expert.c:123
8308+#: ../../WPrefs.app/Expert.c:117
8309 msgid "Expert User Preferences"
8310-msgstr "Einstellugen für Experten"
8311+msgstr "Einstellungen für Experten"
8312
8313-#: ../../WPrefs.app/Expert.c:125
8314+#: ../../WPrefs.app/Expert.c:119
8315 msgid ""
8316 "Options for people who know what they're doing...\n"
8317 "Also have some other misc. options."
8318 msgstr ""
8319 "Einstellungen für Leute, die wissen, was sie tun...\n"
8320-"und einige andere Einstellungen."
8321+"Und einige andere Einstellungen."
8322
8323 #: ../../WPrefs.app/Focus.c:80
8324 #, c-format
8325 msgid "bad option value %s for option FocusMode. Using default Manual"
8326-msgstr "falscher Eigenschaftswert %s für \"FocusMode\". Benutze Standard 'Manuell'"
8327+msgstr "falscher Eigenschaftswert %s für FocusMode. Standardwert 'Manuell' wird benutzt."
8328
8329 #: ../../WPrefs.app/Focus.c:94
8330 #, c-format
8331 msgid "bad option value %s for option ColormapMode. Using default Auto"
8332-msgstr "falscher Eigenschaftswert %s für \"ColormapMode\". Benutze Standard 'Auto'"
8333+msgstr "falscher Eigenschaftswert %s für ColormapMode. Standardwert 'Auto' wird benutzt."
8334
8335 #: ../../WPrefs.app/Focus.c:214
8336 msgid "Input Focus Mode"
8337 msgstr "Eingabefokus-Modus"
8338
8339 #: ../../WPrefs.app/Focus.c:222
8340-msgid "Manual: Click on the window to set keyboard input focus"
8341-msgstr "Manuell: Setzen des Tastaturfokus durch Klick"
8342+msgid "Manual: Click on the window to set keyboard input focus."
8343+msgstr "Manuell: Tastaturfokus durch Anklicken des Fensters setzen"
8344
8345 #: ../../WPrefs.app/Focus.c:229
8346-msgid "Auto: Set keyboard input focus to the window under the mouse pointer"
8347-msgstr "Automatisch: Tastaturfokus folgt dem Mauszeiger"
8348+msgid "Auto: Set keyboard input focus to the window under the mouse pointer."
8349+msgstr "Auto: Tastaturfokus immer auf das Fenster unter dem Mauszeiger setzen"
8350
8351 #: ../../WPrefs.app/Focus.c:243
8352 msgid "Install colormap in the window..."
8353-msgstr "Farbtabelle im Fenster installieren, ..."
8354+msgstr "Farbtabelle im Fenster setzen, das..."
8355
8356 #: ../../WPrefs.app/Focus.c:248
8357 msgid "...that has the input focus."
8358-msgstr "..das den Eingabefokus hat."
8359+msgstr "...den Eingabefokus hat."
8360
8361 #: ../../WPrefs.app/Focus.c:253
8362-msgid "...that is under the mouse pointer."
8363-msgstr "...das unter dem Mauszeiger ist."
8364+msgid "...that's under the mouse pointer."
8365+msgstr "...unter dem Mauszeiger ist."
8366
8367 #: ../../WPrefs.app/Focus.c:262
8368 msgid "Automatic Window Raise Delay"
8369-msgstr "Verzögerung für \"Fenster nach vorne\""
8370+msgstr "Verzögerung für Auto-Fensterheber"
8371
8372 #: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601
8373 msgid "msec"
8374 msgstr "ms"
8375
8376 #: ../../WPrefs.app/Focus.c:336
8377-msgid ""
8378-"Do not let applications receive\n"
8379-"the click used to focus windows."
8380-msgstr ""
8381-"Aktivierungsklick wird nicht an\n"
8382-"Anwendung gesendet."
8383+msgid "Do not let applications receive the click used to focus windows."
8384+msgstr "Mausklicks, die ein Fenster fokussiert haben, nicht an die Anwendung senden."
8385
8386 #: ../../WPrefs.app/Focus.c:342
8387-msgid ""
8388-"Automatically focus new\n"
8389-"windows."
8390-msgstr ""
8391-"Neue Fenster erhalten den\n"
8392-"Fokus automatisch."
8393+msgid "Automatically focus new windows."
8394+msgstr "Neue Fenster automatisch auswählen"
8395
8396 #: ../../WPrefs.app/Focus.c:363
8397 msgid "Window Focus Preferences"
8398-msgstr "Fensterfokus-Einstellungen"
8399+msgstr "Einstellungen zum Fokusverhalten"
8400
8401 #: ../../WPrefs.app/Focus.c:365
8402 msgid ""
8403@@ -479,78 +478,51 @@
8404 "policy for 8bpp displays and other related options."
8405 msgstr ""
8406 "Tastaturfokuswechsel, Farbtabellenwechsel für\n"
8407-"8 bpp-Displays und weitere verwandte Eigenschaften."
8408-
8409-#: ../../WPrefs.app/Font.c:276
8410-msgid "Could not locate font information file WPrefs.app/font.data"
8411-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gefunden werden."
8412-
8413-#: ../../WPrefs.app/Font.c:282
8414-msgid "Could not read font information file WPrefs.app/font.data"
8415-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gelesen werden."
8416-
8417-#: ../../WPrefs.app/Font.c:293
8418-msgid ""
8419-"Invalid data in font information file WPrefs.app/font.data.\n"
8420-"Encodings data not found."
8421-msgstr ""
8422-"Ungültige Daten in Schrifteninformationsdatei \"WPrefs.app/font.data\".\n"
8423-"Daten für Kodierung nicht gefunden."
8424-
8425-#: ../../WPrefs.app/Font.c:298
8426-msgid "- Custom -"
8427-msgstr "- Angepasst -"
8428-
8429-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594
8430-#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160
8431-#: ../../WPrefs.app/TexturePanel.c:615 ../../WPrefs.app/TexturePanel.c:695
8432-#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:759
8433-#: ../../WPrefs.app/WPrefs.c:764 ../../WPrefs.app/WPrefs.c:781
8434-#: ../../WPrefs.app/WPrefs.c:791 ../../WPrefs.app/WPrefs.c:801
8435-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844
8436-msgid "Error"
8437-msgstr "Fehler"
8438-
8439-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594
8440-#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162
8441-#: ../../WPrefs.app/TexturePanel.c:616 ../../WPrefs.app/TexturePanel.c:697
8442-#: ../../WPrefs.app/TexturePanel.c:1529 ../../WPrefs.app/Themes.c:98
8443-#: ../../WPrefs.app/WPrefs.c:759 ../../WPrefs.app/WPrefs.c:764
8444-#: ../../WPrefs.app/WPrefs.c:783 ../../WPrefs.app/WPrefs.c:795
8445-#: ../../WPrefs.app/WPrefs.c:801 ../../WPrefs.app/WPrefs.c:808
8446-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844
8447-#: ../../WPrefs.app/imagebrowser.c:105
8448-msgid "OK"
8449-msgstr "OK"
8450+"8bpp-Display und weitere verwandte Eigenschaften."
8451
8452-#: ../../WPrefs.app/Font.c:376
8453-msgid "Default Font Sets"
8454-msgstr "Standardschriftarten"
8455-
8456-#: ../../WPrefs.app/Font.c:389
8457-msgid "Font Set"
8458-msgstr "Schriftart"
8459-
8460-#: ../../WPrefs.app/Font.c:418
8461-msgid "Add..."
8462-msgstr "Hinzufügen..."
8463-
8464-#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438
8465-msgid "Change..."
8466-msgstr "Ändern..."
8467+#: ../../WPrefs.app/FontSimple.c:107
8468+msgid "Window Title"
8469+msgstr "Titel des aktiven Fensters"
8470
8471-#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:284
8472-#: ../../WPrefs.app/Paths.c:315
8473-msgid "Remove"
8474-msgstr "Entfernen"
8475+#: ../../WPrefs.app/FontSimple.c:109
8476+msgid "Menu Text"
8477+msgstr "Text eines Menüeintrages"
8478
8479-#: ../../WPrefs.app/Font.c:477
8480-msgid "Font Preferences"
8481-msgstr "Schrift-Einstellungen"
8482-
8483-#: ../../WPrefs.app/Font.c:478
8484-msgid "Font Configurations for Windows, Menus etc"
8485-msgstr "Schriftkonfiguration für Fenster, Menüs usw."
8486+#: ../../WPrefs.app/FontSimple.c:110
8487+msgid "Icon Title"
8488+msgstr "Symboltitel"
8489+
8490+#: ../../WPrefs.app/FontSimple.c:111
8491+msgid "Clip Title"
8492+msgstr "Clip-Titel"
8493+
8494+#: ../../WPrefs.app/FontSimple.c:112
8495+msgid "Desktop Caption"
8496+msgstr "Arbeitsflächentitel"
8497+
8498+#: ../../WPrefs.app/FontSimple.c:690
8499+msgid "Sample Text"
8500+msgstr "Beispieltext"
8501+
8502+#: ../../WPrefs.app/FontSimple.c:708
8503+msgid "Family"
8504+msgstr "Familie"
8505+
8506+#: ../../WPrefs.app/FontSimple.c:737
8507+msgid "Style"
8508+msgstr "Stil"
8509+
8510+#: ../../WPrefs.app/FontSimple.c:740
8511+msgid "Size"
8512+msgstr "Größe"
8513+
8514+#: ../../WPrefs.app/FontSimple.c:778
8515+msgid "Font Configuration"
8516+msgstr "Schrifteinstellungen"
8517+
8518+#: ../../WPrefs.app/FontSimple.c:780
8519+msgid "Configure fonts for Window Maker titlebars, menus etc."
8520+msgstr "Schrifteinstellungen für Fenster, Menüs usw."
8521
8522 #: ../../WPrefs.app/Icons.c:180
8523 msgid "Icon Positioning"
8524@@ -562,7 +534,7 @@
8525
8526 #: ../../WPrefs.app/Icons.c:238
8527 msgid "Shrinking/Zooming"
8528-msgstr "Verkleinern/Vergrößern"
8529+msgstr "Schrumpfen/Vergrößern"
8530
8531 #: ../../WPrefs.app/Icons.c:239
8532 msgid "Spinning/Twisting"
8533@@ -583,11 +555,11 @@
8534
8535 #: ../../WPrefs.app/Icons.c:256
8536 msgid "Keep icons and miniwindows arranged all the time."
8537-msgstr "Symbole und Minifenster immer anordnen."
8538+msgstr "Symbole und Minifenster immer anordnen"
8539
8540 #: ../../WPrefs.app/Icons.c:262
8541 msgid "Omnipresent miniwindows"
8542-msgstr "Omnipräsente Minifenster"
8543+msgstr "Haftende Minifenster"
8544
8545 #: ../../WPrefs.app/Icons.c:264
8546 msgid "Make miniwindows be present in all workspaces."
8547@@ -603,7 +575,7 @@
8548
8549 #: ../../WPrefs.app/Icons.c:345
8550 msgid "Icon Preferences"
8551-msgstr "Symbol-Einstellungen"
8552+msgstr "Symboleinstellungen"
8553
8554 #: ../../WPrefs.app/Icons.c:347
8555 msgid ""
8556@@ -633,237 +605,254 @@
8557 msgid "Not done"
8558 msgstr "Noch nicht erstellt"
8559
8560-#: ../../WPrefs.app/KeyboardShortcuts.c:307 ../../WPrefs.app/Menu.c:360
8561+#: ../../WPrefs.app/KeyboardShortcuts.c:310 ../../WPrefs.app/Menu.c:360
8562 #: ../../WPrefs.app/TexturePanel.c:1535 ../../WPrefs.app/imagebrowser.c:100
8563 msgid "Cancel"
8564 msgstr "Abbrechen"
8565
8566-#: ../../WPrefs.app/KeyboardShortcuts.c:308
8567+#: ../../WPrefs.app/KeyboardShortcuts.c:311
8568 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
8569 msgstr ""
8570-"Drücken Sie die gewünschte Tastenkombination oder auf \"Abbrechen\"."
8571+"Drücken Sie die gewünschte Tastenkombination oder klicken Sie auf Abbrechen "
8572+"zum Stoppen der Aufzeichnung."
8573
8574-#: ../../WPrefs.app/KeyboardShortcuts.c:328
8575-#: ../../WPrefs.app/KeyboardShortcuts.c:575 ../../WPrefs.app/Menu.c:371
8576+#: ../../WPrefs.app/KeyboardShortcuts.c:331
8577+#: ../../WPrefs.app/KeyboardShortcuts.c:584 ../../WPrefs.app/Menu.c:371
8578 #: ../../WPrefs.app/Menu.c:830
8579 msgid "Capture"
8580 msgstr "Aufzeichnen"
8581
8582-#: ../../WPrefs.app/KeyboardShortcuts.c:329
8583-#: ../../WPrefs.app/KeyboardShortcuts.c:583
8584-msgid "Click Capture to interactively define the shortcut key."
8585-msgstr "Zum interaktiven Auswählen einer Tastenkombination \"Aufzeichnen\" klicken."
8586+#: ../../WPrefs.app/KeyboardShortcuts.c:332
8587+#: ../../WPrefs.app/KeyboardShortcuts.c:592
8588+msgid "Click on Capture to interactively define the shortcut key."
8589+msgstr "Zum Erstellen eines Tastenkürzels auf \"Aufzeichnen\" klicken."
8590
8591-#: ../../WPrefs.app/KeyboardShortcuts.c:483
8592+#: ../../WPrefs.app/KeyboardShortcuts.c:486
8593 msgid "Actions"
8594 msgstr "Aktionen"
8595
8596-#: ../../WPrefs.app/KeyboardShortcuts.c:497
8597+#: ../../WPrefs.app/KeyboardShortcuts.c:500
8598 msgid "Open applications menu"
8599-msgstr "Anwendungsmenü öffnen"
8600+msgstr "Anwendungmenü öffnen"
8601
8602-#: ../../WPrefs.app/KeyboardShortcuts.c:498
8603+#: ../../WPrefs.app/KeyboardShortcuts.c:501
8604 msgid "Open window list menu"
8605 msgstr "Fensterliste öffnen"
8606
8607-#: ../../WPrefs.app/KeyboardShortcuts.c:499
8608+#: ../../WPrefs.app/KeyboardShortcuts.c:502
8609 msgid "Open window commands menu"
8610 msgstr "Fenstermenü öffnen"
8611
8612-#: ../../WPrefs.app/KeyboardShortcuts.c:500
8613+#: ../../WPrefs.app/KeyboardShortcuts.c:503
8614 msgid "Hide active application"
8615-msgstr "Aktive Anwendung ausblenden"
8616+msgstr "Aktive Anwendung verstecken"
8617
8618-#: ../../WPrefs.app/KeyboardShortcuts.c:501
8619+#: ../../WPrefs.app/KeyboardShortcuts.c:504
8620 msgid "Hide other applications"
8621-msgstr "Alle anderen Anwendungen ausblenden"
8622+msgstr "Alle anderen Anwendung verstecken"
8623
8624-#: ../../WPrefs.app/KeyboardShortcuts.c:502
8625+#: ../../WPrefs.app/KeyboardShortcuts.c:505
8626 msgid "Miniaturize active window"
8627 msgstr "Aktives Fenster minimieren"
8628
8629-#: ../../WPrefs.app/KeyboardShortcuts.c:503
8630+#: ../../WPrefs.app/KeyboardShortcuts.c:506
8631 msgid "Close active window"
8632 msgstr "Aktives Fenster schließen"
8633
8634-#: ../../WPrefs.app/KeyboardShortcuts.c:504
8635+#: ../../WPrefs.app/KeyboardShortcuts.c:507
8636 msgid "Maximize active window"
8637 msgstr "Aktives Fenster maximieren"
8638
8639-#: ../../WPrefs.app/KeyboardShortcuts.c:505
8640+#: ../../WPrefs.app/KeyboardShortcuts.c:508
8641 msgid "Maximize active window vertically"
8642 msgstr "Aktives Fenster vertikal maximieren"
8643
8644-#: ../../WPrefs.app/KeyboardShortcuts.c:506
8645+#: ../../WPrefs.app/KeyboardShortcuts.c:509
8646 msgid "Maximize active window horizontally"
8647 msgstr "Aktives Fenster horizontal maximieren"
8648
8649-#: ../../WPrefs.app/KeyboardShortcuts.c:507
8650+#: ../../WPrefs.app/KeyboardShortcuts.c:510
8651 msgid "Raise active window"
8652 msgstr "Aktives Fenster in den Vordergrund"
8653
8654-#: ../../WPrefs.app/KeyboardShortcuts.c:508
8655+#: ../../WPrefs.app/KeyboardShortcuts.c:511
8656 msgid "Lower active window"
8657 msgstr "Aktives Fenster in den Hintergrund"
8658
8659-#: ../../WPrefs.app/KeyboardShortcuts.c:509
8660+#: ../../WPrefs.app/KeyboardShortcuts.c:512
8661 msgid "Raise/Lower window under mouse pointer"
8662-msgstr "Fenster unter Mauszeiger in Vor-/Hintergrund"
8663+msgstr "Fenster unter dem Mauszeiger in den Vor-/Hintergrund"
8664
8665-#: ../../WPrefs.app/KeyboardShortcuts.c:510
8666+#: ../../WPrefs.app/KeyboardShortcuts.c:513
8667 msgid "Shade active window"
8668 msgstr "Aktives Fenster aufrollen"
8669
8670-#: ../../WPrefs.app/KeyboardShortcuts.c:511
8671+#: ../../WPrefs.app/KeyboardShortcuts.c:514
8672 msgid "Move/Resize active window"
8673 msgstr "Aktives Fenster bewegen/verändern"
8674
8675-#: ../../WPrefs.app/KeyboardShortcuts.c:512
8676+#: ../../WPrefs.app/KeyboardShortcuts.c:515
8677 msgid "Select active window"
8678 msgstr "Aktives Fenster auswählen"
8679
8680-#: ../../WPrefs.app/KeyboardShortcuts.c:513
8681+#: ../../WPrefs.app/KeyboardShortcuts.c:516
8682 msgid "Focus next window"
8683 msgstr "Nächstes Fenster"
8684
8685-#: ../../WPrefs.app/KeyboardShortcuts.c:514
8686+#: ../../WPrefs.app/KeyboardShortcuts.c:517
8687 msgid "Focus previous window"
8688 msgstr "Vorheriges Fenster"
8689
8690-#: ../../WPrefs.app/KeyboardShortcuts.c:515
8691+#: ../../WPrefs.app/KeyboardShortcuts.c:518
8692 msgid "Switch to next workspace"
8693 msgstr "Zur nächsten Arbeitsfläche"
8694
8695-#: ../../WPrefs.app/KeyboardShortcuts.c:516
8696+#: ../../WPrefs.app/KeyboardShortcuts.c:519
8697 msgid "Switch to previous workspace"
8698 msgstr "Zur vorherigen Arbeitsfläche"
8699
8700-#: ../../WPrefs.app/KeyboardShortcuts.c:517
8701+#: ../../WPrefs.app/KeyboardShortcuts.c:520
8702 msgid "Switch to next ten workspaces"
8703 msgstr "Springe 10 Arbeitsflächen vorwärts"
8704
8705-#: ../../WPrefs.app/KeyboardShortcuts.c:518
8706+#: ../../WPrefs.app/KeyboardShortcuts.c:521
8707 msgid "Switch to previous ten workspaces"
8708 msgstr "Springe 10 Arbeitsflächen rückwärts"
8709
8710-#: ../../WPrefs.app/KeyboardShortcuts.c:519
8711+#: ../../WPrefs.app/KeyboardShortcuts.c:522
8712 msgid "Switch to workspace 1"
8713 msgstr "Springe zu Arbeitsfläche 1"
8714
8715-#: ../../WPrefs.app/KeyboardShortcuts.c:520
8716+#: ../../WPrefs.app/KeyboardShortcuts.c:523
8717 msgid "Switch to workspace 2"
8718 msgstr "Springe zu Arbeitsfläche 2"
8719
8720-#: ../../WPrefs.app/KeyboardShortcuts.c:521
8721+#: ../../WPrefs.app/KeyboardShortcuts.c:524
8722 msgid "Switch to workspace 3"
8723 msgstr "Springe zu Arbeitsfläche 3"
8724
8725-#: ../../WPrefs.app/KeyboardShortcuts.c:522
8726+#: ../../WPrefs.app/KeyboardShortcuts.c:525
8727 msgid "Switch to workspace 4"
8728 msgstr "Springe zu Arbeitsfläche 4"
8729
8730-#: ../../WPrefs.app/KeyboardShortcuts.c:523
8731+#: ../../WPrefs.app/KeyboardShortcuts.c:526
8732 msgid "Switch to workspace 5"
8733 msgstr "Springe zu Arbeitsfläche 5"
8734
8735-#: ../../WPrefs.app/KeyboardShortcuts.c:524
8736+#: ../../WPrefs.app/KeyboardShortcuts.c:527
8737 msgid "Switch to workspace 6"
8738 msgstr "Springe zu Arbeitsfläche 6"
8739
8740-#: ../../WPrefs.app/KeyboardShortcuts.c:525
8741+#: ../../WPrefs.app/KeyboardShortcuts.c:528
8742 msgid "Switch to workspace 7"
8743 msgstr "Springe zu Arbeitsfläche 7"
8744
8745-#: ../../WPrefs.app/KeyboardShortcuts.c:526
8746+#: ../../WPrefs.app/KeyboardShortcuts.c:529
8747 msgid "Switch to workspace 8"
8748 msgstr "Springe zu Arbeitsfläche 8"
8749
8750-#: ../../WPrefs.app/KeyboardShortcuts.c:527
8751+#: ../../WPrefs.app/KeyboardShortcuts.c:530
8752 msgid "Switch to workspace 9"
8753 msgstr "Springe zu Arbeitsfläche 9"
8754
8755-#: ../../WPrefs.app/KeyboardShortcuts.c:528
8756+#: ../../WPrefs.app/KeyboardShortcuts.c:531
8757 msgid "Switch to workspace 10"
8758 msgstr "Springe zu Arbeitsfläche 10"
8759
8760-#: ../../WPrefs.app/KeyboardShortcuts.c:529
8761+#: ../../WPrefs.app/KeyboardShortcuts.c:532
8762 msgid "Shortcut for window 1"
8763 msgstr "Tastenkürzel für Fenster 1"
8764
8765-#: ../../WPrefs.app/KeyboardShortcuts.c:530
8766+#: ../../WPrefs.app/KeyboardShortcuts.c:533
8767 msgid "Shortcut for window 2"
8768 msgstr "Tastenkürzel für Fenster 2"
8769
8770-#: ../../WPrefs.app/KeyboardShortcuts.c:531
8771+#: ../../WPrefs.app/KeyboardShortcuts.c:534
8772 msgid "Shortcut for window 3"
8773 msgstr "Tastenkürzel für Fenster 3"
8774
8775-#: ../../WPrefs.app/KeyboardShortcuts.c:532
8776+#: ../../WPrefs.app/KeyboardShortcuts.c:535
8777 msgid "Shortcut for window 4"
8778 msgstr "Tastenkürzel für Fenster 4"
8779
8780-#: ../../WPrefs.app/KeyboardShortcuts.c:533
8781+#: ../../WPrefs.app/KeyboardShortcuts.c:536
8782 msgid "Shortcut for window 5"
8783 msgstr "Tastenkürzel für Fenster 5"
8784
8785-#: ../../WPrefs.app/KeyboardShortcuts.c:534
8786+#: ../../WPrefs.app/KeyboardShortcuts.c:537
8787 msgid "Shortcut for window 6"
8788 msgstr "Tastenkürzel für Fenster 6"
8789
8790-#: ../../WPrefs.app/KeyboardShortcuts.c:535
8791+#: ../../WPrefs.app/KeyboardShortcuts.c:538
8792 msgid "Shortcut for window 7"
8793 msgstr "Tastenkürzel für Fenster 7"
8794
8795-#: ../../WPrefs.app/KeyboardShortcuts.c:536
8796+#: ../../WPrefs.app/KeyboardShortcuts.c:539
8797 msgid "Shortcut for window 8"
8798 msgstr "Tastenkürzel für Fenster 8"
8799
8800-#: ../../WPrefs.app/KeyboardShortcuts.c:537
8801+#: ../../WPrefs.app/KeyboardShortcuts.c:540
8802 msgid "Shortcut for window 9"
8803 msgstr "Tastenkürzel für Fenster 9"
8804
8805-#: ../../WPrefs.app/KeyboardShortcuts.c:538
8806+#: ../../WPrefs.app/KeyboardShortcuts.c:541
8807 msgid "Shortcut for window 10"
8808 msgstr "Tastenkürzel für Fenster 10"
8809
8810-#: ../../WPrefs.app/KeyboardShortcuts.c:539
8811+#: ../../WPrefs.app/KeyboardShortcuts.c:542
8812 msgid "Switch to Next Screen/Monitor"
8813-msgstr "Springe zum nächsten Bildschirm"
8814+msgstr "Springe zu nächstem Bildschirm"
8815
8816-#: ../../WPrefs.app/KeyboardShortcuts.c:540
8817+#: ../../WPrefs.app/KeyboardShortcuts.c:544
8818+msgid "Move VirtualDesktop to next left edge"
8819+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante links bewegen"
8820+
8821+#: ../../WPrefs.app/KeyboardShortcuts.c:545
8822+msgid "Move VirtualDesktop to next right edge"
8823+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante rechts bewegen"
8824+
8825+#: ../../WPrefs.app/KeyboardShortcuts.c:546
8826+msgid "Move VirtualDesktop to next top edge"
8827+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante oben bewegen"
8828+
8829+#: ../../WPrefs.app/KeyboardShortcuts.c:547
8830+msgid "Move VirtualDesktop to next bottom edge"
8831+msgstr "Virtuelle Arbeitsfläche zur nächsten Kante unten bewegen"
8832+
8833+#: ../../WPrefs.app/KeyboardShortcuts.c:549
8834 msgid "Raise Clip"
8835 msgstr "Clip in den Vordergrund"
8836
8837-#: ../../WPrefs.app/KeyboardShortcuts.c:541
8838+#: ../../WPrefs.app/KeyboardShortcuts.c:550
8839 msgid "Lower Clip"
8840 msgstr "Clip in den Hintergrund"
8841
8842-#: ../../WPrefs.app/KeyboardShortcuts.c:542
8843+#: ../../WPrefs.app/KeyboardShortcuts.c:551
8844 msgid "Raise/Lower Clip"
8845 msgstr "Clip in den Vor-/Hintergrund"
8846
8847-#: ../../WPrefs.app/KeyboardShortcuts.c:544
8848+#: ../../WPrefs.app/KeyboardShortcuts.c:553
8849 msgid "Toggle keyboard language"
8850-msgstr "Tastatursprache ändern"
8851+msgstr "Tastatursbelegung ändern"
8852
8853-#: ../../WPrefs.app/KeyboardShortcuts.c:558
8854+#: ../../WPrefs.app/KeyboardShortcuts.c:567
8855 msgid "Shortcut"
8856-msgstr " Tastatur-Kurzbefehle "
8857+msgstr "Kürzel"
8858
8859-#: ../../WPrefs.app/KeyboardShortcuts.c:569 ../../WPrefs.app/Menu.c:836
8860+#: ../../WPrefs.app/KeyboardShortcuts.c:578 ../../WPrefs.app/Menu.c:836
8861 msgid "Clear"
8862 msgstr "Löschen"
8863
8864-#: ../../WPrefs.app/KeyboardShortcuts.c:631
8865+#: ../../WPrefs.app/KeyboardShortcuts.c:640
8866 msgid "Keyboard Shortcut Preferences"
8867-msgstr "Tastaturkürzel-Einstellungen"
8868+msgstr "Tastenkürzel-Einstellungen"
8869
8870-#: ../../WPrefs.app/KeyboardShortcuts.c:633
8871+#: ../../WPrefs.app/KeyboardShortcuts.c:642
8872 msgid ""
8873 "Change the keyboard shortcuts for actions such\n"
8874 "as changing workspaces and opening menus."
8875 msgstr ""
8876-"Ändern der Tastenkombinationen für Aktionen wie das\n"
8877+"Ändern der Tastenkürzel für Aktionen wie das\n"
8878 "Wechseln der Arbeitsflächen und das Öffnen von Menüs."
8879
8880 #: ../../WPrefs.app/Menu.c:278
8881@@ -872,11 +861,11 @@
8882
8883 #: ../../WPrefs.app/Menu.c:510
8884 msgid "New Items"
8885-msgstr "Neue Menüeinträge"
8886+msgstr "Neue Einträge"
8887
8888 #: ../../WPrefs.app/Menu.c:511
8889 msgid "Sample Commands"
8890-msgstr "Beispielkommandos"
8891+msgstr "Beispielbefehle"
8892
8893 #: ../../WPrefs.app/Menu.c:512
8894 msgid "Sample Submenus"
8895@@ -888,7 +877,7 @@
8896
8897 #: ../../WPrefs.app/Menu.c:527
8898 msgid "Internal Command"
8899-msgstr "Internes Kommando"
8900+msgstr "interner Befehl"
8901
8902 #: ../../WPrefs.app/Menu.c:528
8903 msgid "Submenu"
8904@@ -896,11 +885,11 @@
8905
8906 #: ../../WPrefs.app/Menu.c:529
8907 msgid "External Submenu"
8908-msgstr "Externes Untermenü"
8909+msgstr "externes Untermenü"
8910
8911 #: ../../WPrefs.app/Menu.c:530
8912 msgid "Generated Submenu"
8913-msgstr "Erzeugtes Untermenü"
8914+msgstr "erstelltes Untermenü"
8915
8916 #: ../../WPrefs.app/Menu.c:531
8917 msgid "Directory Contents"
8918@@ -912,19 +901,19 @@
8919
8920 #: ../../WPrefs.app/Menu.c:533 ../../WPrefs.app/MouseSettings.c:840
8921 msgid "Window List Menu"
8922-msgstr "Fensterlistenmenü"
8923+msgstr "Fensterliste"
8924
8925 #: ../../WPrefs.app/Menu.c:552
8926 msgid "XTerm"
8927-msgstr "XTerm"
8928+msgstr ""
8929
8930 #: ../../WPrefs.app/Menu.c:555
8931 msgid "rxvt"
8932-msgstr "rxvt"
8933+msgstr ""
8934
8935 #: ../../WPrefs.app/Menu.c:558
8936 msgid "ETerm"
8937-msgstr "ETerm"
8938+msgstr ""
8939
8940 #: ../../WPrefs.app/Menu.c:561
8941 msgid "Run..."
8942@@ -933,35 +922,35 @@
8943 #: ../../WPrefs.app/Menu.c:562
8944 #, c-format
8945 msgid "%a(Run,Type command to run)"
8946-msgstr "%a(Ausführen,Auszuführendes Kommando eingeben)"
8947+msgstr "%a(Befehl zum Ausführen eingeben)"
8948
8949 #: ../../WPrefs.app/Menu.c:564
8950 msgid "Netscape"
8951-msgstr "Netscape"
8952+msgstr ""
8953
8954 #: ../../WPrefs.app/Menu.c:567
8955 msgid "gimp"
8956-msgstr "gimp"
8957+msgstr ""
8958
8959 #: ../../WPrefs.app/Menu.c:570
8960 msgid "epic"
8961-msgstr "epic"
8962+msgstr ""
8963
8964 #: ../../WPrefs.app/Menu.c:573
8965 msgid "ee"
8966-msgstr "ee"
8967+msgstr ""
8968
8969 #: ../../WPrefs.app/Menu.c:576
8970 msgid "xv"
8971-msgstr "xv"
8972+msgstr ""
8973
8974 #: ../../WPrefs.app/Menu.c:579
8975 msgid "Acrobat Reader"
8976-msgstr "Acrobat Reader"
8977+msgstr ""
8978
8979 #: ../../WPrefs.app/Menu.c:582
8980 msgid "ghostview"
8981-msgstr "ghostview"
8982+msgstr ""
8983
8984 #: ../../WPrefs.app/Menu.c:585 ../../WPrefs.app/Menu.c:857
8985 msgid "Exit Window Maker"
8986@@ -985,15 +974,15 @@
8987
8988 #: ../../WPrefs.app/Menu.c:622
8989 msgid "Bg Images (scale)"
8990-msgstr "Hg Bilder (voll)"
8991+msgstr "Hintergrundbilder (skaliert)"
8992
8993 #: ../../WPrefs.app/Menu.c:627
8994 msgid "Bg Images (tile)"
8995-msgstr "Hg Bilder (Kachel)"
8996+msgstr "Hintergrundbilder (Kacheln)"
8997
8998 #: ../../WPrefs.app/Menu.c:632
8999 msgid "Assorted XTerms"
9000-msgstr "Versch. XTerms"
9001+msgstr "sortierte XTerms"
9002
9003 #: ../../WPrefs.app/Menu.c:634
9004 msgid "XTerm Yellow on Blue"
9005@@ -1029,7 +1018,7 @@
9006
9007 #: ../../WPrefs.app/Menu.c:677
9008 msgid "Program to Run"
9009-msgstr "Auszuführendes Programm"
9010+msgstr "auszuführendes Programm"
9011
9012 #: ../../WPrefs.app/Menu.c:687
9013 msgid "Browse"
9014@@ -1061,47 +1050,47 @@
9015
9016 #: ../../WPrefs.app/Menu.c:736
9017 msgid "Command"
9018-msgstr "Kommando"
9019+msgstr "Befehl"
9020
9021 #: ../../WPrefs.app/Menu.c:750
9022 msgid ""
9023 "Enter a command that outputs a menu\n"
9024 "definition to stdout when invoked."
9025 msgstr ""
9026-"Geben Sie ein Kommando ein, das beim Aufruf\n"
9027-"ein Menü nach STDOUT ausgibt."
9028+"Geben Sie einen Befehl ein, der bei Aufruf\n"
9029+"ein Menü auf der Standardausgabe zurückgibt."
9030
9031 #: ../../WPrefs.app/Menu.c:758
9032 msgid ""
9033 "Cache menu contents after opening for\n"
9034 "the first time"
9035 msgstr ""
9036-"Menüinhalt nach dem ersten Laden\n"
9037+"Menüinhalt nach erstem Laden\n"
9038 "zwischenspeichern"
9039
9040 #: ../../WPrefs.app/Menu.c:769
9041 msgid "Command to Open Files"
9042-msgstr "Befehl zum Öffnen von Dateien"
9043+msgstr "Befehl zum Öffnen der Dateien"
9044
9045 #: ../../WPrefs.app/Menu.c:783
9046 msgid ""
9047 "Enter the command you want to use to open the\n"
9048 "files in the directories listed below."
9049 msgstr ""
9050-"Geben Sie das Kommando zum Öffnen der Dateien\n"
9051-"in den unten aufgelisteten Verzeichnissen ein."
9052+"Geben Sie den Befehl zum Öffnen der Dateien\n"
9053+"in den augelisteten Verzeichnissen ein."
9054
9055 #: ../../WPrefs.app/Menu.c:792
9056 msgid "Directories with Files"
9057-msgstr "Verzeichnisse mit Dateien"
9058+msgstr "Verzeichnis mit Dateien"
9059
9060 #: ../../WPrefs.app/Menu.c:805
9061 msgid "Strip extensions from file names"
9062-msgstr "Dateierweiterungen entfernen"
9063+msgstr "Erweiterungen von den Dateinamen entfernen"
9064
9065 #: ../../WPrefs.app/Menu.c:817
9066 msgid "Keyboard Shortcut"
9067-msgstr "Tastaturkürzel"
9068+msgstr "Tastenkürzel"
9069
9070 #: ../../WPrefs.app/Menu.c:853
9071 msgid "Arrange Icons"
9072@@ -1109,7 +1098,7 @@
9073
9074 #: ../../WPrefs.app/Menu.c:854
9075 msgid "Hide All Windows Except For The Focused One"
9076-msgstr "Alle Fenster bis auf das aktive ausblenden"
9077+msgstr "Alle Fenster bis auf das aktive verstecken"
9078
9079 #: ../../WPrefs.app/Menu.c:855
9080 msgid "Show All Windows"
9081@@ -1121,19 +1110,19 @@
9082
9083 #: ../../WPrefs.app/Menu.c:859
9084 msgid "Restart Window Maker"
9085-msgstr "Window Maker neu starten"
9086+msgstr "Window Maker neustarten"
9087
9088 #: ../../WPrefs.app/Menu.c:860
9089 msgid "Start Another Window Manager : ("
9090-msgstr "Anderen Windowmanager starten : ("
9091+msgstr "anderen Windowmanager starten : ("
9092
9093 #: ../../WPrefs.app/Menu.c:862
9094 msgid "Save Current Session"
9095-msgstr "Aktuelle Sitzung speichern"
9096+msgstr "aktuelle Sitzung speichern"
9097
9098 #: ../../WPrefs.app/Menu.c:863
9099 msgid "Clear Saved Session"
9100-msgstr "Gespeicherte Sitzung löschen"
9101+msgstr "gespeicherte Sitzung löschen"
9102
9103 #: ../../WPrefs.app/Menu.c:864
9104 msgid "Refresh Screen"
9105@@ -1141,21 +1130,21 @@
9106
9107 #: ../../WPrefs.app/Menu.c:865
9108 msgid "Open Info Panel"
9109-msgstr "Kurzinformation anzeigen"
9110+msgstr "Infodialog anzeigen"
9111
9112 #: ../../WPrefs.app/Menu.c:866
9113 msgid "Open Copyright Panel"
9114-msgstr "Copyright anzeigen"
9115+msgstr "Copyrightinformationen anzeigen"
9116
9117 #: ../../WPrefs.app/Menu.c:872
9118 msgid "Window Manager to Start"
9119-msgstr "Zu startender Windowmanager"
9120+msgstr "zu startender Windowmanager"
9121
9122 #: ../../WPrefs.app/Menu.c:888
9123 msgid "Do not confirm action."
9124-msgstr "Aktion nicht bestätigen."
9125+msgstr "Aktion nicht bestätigen"
9126
9127-#: ../../WPrefs.app/Menu.c:898
9128+#: ../../WPrefs.app/Menu.c:896
9129 msgid ""
9130 "Instructions:\n"
9131 "\n"
9132@@ -1166,110 +1155,125 @@
9133 " - double click in a menu item to change the label\n"
9134 " - click on a menu item to change related information"
9135 msgstr ""
9136-"Anweisungen:\n"
9137+"Hilfe:\n"
9138 "\n"
9139-" - Neue Menüeinträge von links in das Menü ziehen.\n"
9140-" - Zum Löschen Menüeinträge aus dem Menü herausz.\n"
9141-" - Einträge im Menü durch Ziehen neu platzieren.\n"
9142-" - Einträge durch Ziehen mit gedr. 'Strg' kopieren.\n"
9143-" - Beschriftung durch Doppelklick ändern.\n"
9144-" - Nach Anklicken sind weitere Einstellungen sichtbar."
9145+" - ziehen Sie Einträge von links in das Menü, um neue Einträge zu erstellen\n"
9146+" - ziehen Sie Einträge aus dem Menu, um sie zu entfernen\n"
9147+" - ziehen Sie Einträge innerhalb des Menüs, um sie zu verschieben\n"
9148+" - ziehen Sie Einträge bei gedrückter Strg-Taste, um sie zu kopieren\n"
9149+" - doppelklicken Sie auf Einträge, um den Text zu verändern\n"
9150+" - klicken Sie auf die Einträge, um diese zu konfigurieren "
9151
9152-#: ../../WPrefs.app/Menu.c:1122
9153+#: ../../WPrefs.app/Menu.c:1120
9154 #, c-format
9155 msgid "unknown command '%s' in menu"
9156 msgstr "unbekannter Menübefehl '%s'"
9157
9158-#: ../../WPrefs.app/Menu.c:1154
9159+#: ../../WPrefs.app/Menu.c:1152
9160 msgid ": Execute Program"
9161 msgstr ": Programm ausführen"
9162
9163-#: ../../WPrefs.app/Menu.c:1158
9164+#: ../../WPrefs.app/Menu.c:1156
9165 msgid ": Perform Internal Command"
9166-msgstr ": Internen Befehl ausführen"
9167+msgstr ": internen Befehl ausführen"
9168
9169-#: ../../WPrefs.app/Menu.c:1162
9170+#: ../../WPrefs.app/Menu.c:1160
9171 msgid ": Open a Submenu"
9172 msgstr ": Untermenü öffnen"
9173
9174-#: ../../WPrefs.app/Menu.c:1166
9175+#: ../../WPrefs.app/Menu.c:1164
9176 msgid ": Program Generated Submenu"
9177-msgstr ": Programmgeneriertes Untermenü"
9178+msgstr ": programmgeneriertes Unternmenü"
9179
9180-#: ../../WPrefs.app/Menu.c:1170
9181+#: ../../WPrefs.app/Menu.c:1168
9182 msgid ": Directory Contents Menu"
9183 msgstr ": Menü mit Verzeichnisinhalt"
9184
9185-#: ../../WPrefs.app/Menu.c:1174
9186+#: ../../WPrefs.app/Menu.c:1172
9187 msgid ": Open Workspaces Submenu"
9188 msgstr ": Arbeitsflächen-Untermenü"
9189
9190-#: ../../WPrefs.app/Menu.c:1178
9191+#: ../../WPrefs.app/Menu.c:1176
9192 msgid ": Open Window List Submenu"
9193 msgstr ": Fensterlisten-Untermenü"
9194
9195-#: ../../WPrefs.app/Menu.c:1403
9196+#: ../../WPrefs.app/Menu.c:1401
9197 msgid "Remove Submenu"
9198 msgstr "Untermenü entfernen"
9199
9200-#: ../../WPrefs.app/Menu.c:1404
9201+#: ../../WPrefs.app/Menu.c:1402
9202 msgid ""
9203 "Removing this item will destroy all items inside\n"
9204 "the submenu. Do you really want to do that?"
9205 msgstr ""
9206 "Das Entfernen dieses Eintrages löscht alle Einträge\n"
9207-"innerhalb des Untermenüs. Wollen Sie das wirklich?"
9208+"im Untermenü. Wollen Sie das wirklich tun?"
9209
9210-#: ../../WPrefs.app/Menu.c:1406
9211+#: ../../WPrefs.app/Menu.c:1404
9212 msgid "Yes"
9213 msgstr "Ja"
9214
9215-#: ../../WPrefs.app/Menu.c:1406
9216+#: ../../WPrefs.app/Menu.c:1404
9217 msgid "No"
9218 msgstr "Nein"
9219
9220-#: ../../WPrefs.app/Menu.c:1407
9221+#: ../../WPrefs.app/Menu.c:1405
9222 msgid "Yes, don't ask again."
9223-msgstr "Ja, nicht mehr nachfragen"
9224-
9225-#. if there is a localized plmenu for the tongue put it's filename here
9226-#: ../../WPrefs.app/Menu.c:1575 ../../WPrefs.app/Menu.c:1582
9227-#, c-format
9228-msgid "%s/Library/WindowMaker/plmenu"
9229-msgstr "%s/Library/WindowMaker/plmenu.de"
9230+msgstr "Ja, alle"
9231
9232-#: ../../WPrefs.app/Menu.c:1591
9233+#: ../../WPrefs.app/Menu.c:1579
9234 #, c-format
9235 msgid "Could not open default menu from '%s'"
9236-msgstr "Standardmenü '%s' konnte nicht geöffnet werden"
9237+msgstr "Standardmenü aus '%s' konnte nicht geöffnet werden"
9238+
9239+#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:140
9240+#: ../../WPrefs.app/MouseSettings.c:160 ../../WPrefs.app/TexturePanel.c:615
9241+#: ../../WPrefs.app/TexturePanel.c:695 ../../WPrefs.app/Themes.c:96
9242+#: ../../WPrefs.app/WPrefs.c:740 ../../WPrefs.app/WPrefs.c:745
9243+#: ../../WPrefs.app/WPrefs.c:762 ../../WPrefs.app/WPrefs.c:772
9244+#: ../../WPrefs.app/WPrefs.c:782 ../../WPrefs.app/WPrefs.c:820
9245+#: ../../WPrefs.app/WPrefs.c:825
9246+msgid "Error"
9247+msgstr "Fehler"
9248
9249-#: ../../WPrefs.app/Menu.c:1629 ../../WPrefs.app/WPrefs.c:808
9250+#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:142
9251+#: ../../WPrefs.app/MouseSettings.c:162 ../../WPrefs.app/TexturePanel.c:616
9252+#: ../../WPrefs.app/TexturePanel.c:697 ../../WPrefs.app/TexturePanel.c:1529
9253+#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:740
9254+#: ../../WPrefs.app/WPrefs.c:745 ../../WPrefs.app/WPrefs.c:764
9255+#: ../../WPrefs.app/WPrefs.c:776 ../../WPrefs.app/WPrefs.c:782
9256+#: ../../WPrefs.app/WPrefs.c:789 ../../WPrefs.app/WPrefs.c:820
9257+#: ../../WPrefs.app/WPrefs.c:825 ../../WPrefs.app/imagebrowser.c:105
9258+msgid "OK"
9259+msgstr "OK"
9260+
9261+#: ../../WPrefs.app/Menu.c:1612 ../../WPrefs.app/WPrefs.c:789
9262 msgid "Warning"
9263 msgstr "Warnung"
9264
9265-#: ../../WPrefs.app/Menu.c:1630
9266+#: ../../WPrefs.app/Menu.c:1613
9267 msgid ""
9268 "The menu file format currently in use is not supported\n"
9269 "by this tool. Do you want to discard the current menu\n"
9270 "to use this tool?"
9271 msgstr ""
9272-"Das momentan verwendete Menüdateiformat wird vom\n"
9273-"Programm nicht unterstützt. Wollen Sie das aktuelle Menü\n"
9274-"verwerfen, um dieses Programm verwenden zu können?"
9275+"Das momentan verwendete Menüdateiformat wird von\n"
9276+"diesem Programm nicht unterstützt. Wollen Sie das aktuelle\n"
9277+"Menü verwerfen, um dieses Programm verwenden zu können?"
9278
9279-#: ../../WPrefs.app/Menu.c:1633
9280+#: ../../WPrefs.app/Menu.c:1616
9281 msgid "Yes, Discard and Update"
9282 msgstr "Ja, Verwerfen und Erneuern"
9283
9284-#: ../../WPrefs.app/Menu.c:1634
9285+#: ../../WPrefs.app/Menu.c:1617
9286 msgid "No, Keep Current Menu"
9287 msgstr "Nein, aktuelles Menü behalten"
9288
9289-#: ../../WPrefs.app/Menu.c:1897
9290+#: ../../WPrefs.app/Menu.c:1880
9291 msgid "Applications Menu Definition"
9292 msgstr "Anwendungsmenü-Definition"
9293
9294-#: ../../WPrefs.app/Menu.c:1899
9295+#: ../../WPrefs.app/Menu.c:1882
9296 msgid "Edit the menu for launching applications."
9297 msgstr "Editieren des Menüs zum Starten von Anwendungen"
9298
9299@@ -1286,16 +1290,16 @@
9300 "Always open submenus inside the screen, instead of scrolling.\n"
9301 "Note: this is annoying."
9302 msgstr ""
9303-"Untermenüs immer innerhalb des Bildschirms anzeigen, statt zu scrollen.\n"
9304-"Anmerkung: Nicht empfehlenswert."
9305+"Untermenüs immer im Bildschirm öffnen anstatt zu Scrollen.\n"
9306+"Anmerkung: kann störend sein."
9307
9308 #: ../../WPrefs.app/MenuPreferences.c:209
9309 msgid "Scroll off-screen menus when pointer is moved over them."
9310-msgstr "Außenliegende Menüs hereinbewegen, wenn der Mauszeiger darüber ist."
9311+msgstr "Menüs außerhalb des Bildschirms scrollen, wenn der Mauszeiger über ihnen ist."
9312
9313 #: ../../WPrefs.app/MenuPreferences.c:229
9314 msgid "Menu Preferences"
9315-msgstr "Menü-Einstellungen"
9316+msgstr "Menüeinstellungen"
9317
9318 #: ../../WPrefs.app/MenuPreferences.c:231
9319 msgid ""
9320@@ -1307,15 +1311,15 @@
9321
9322 #: ../../WPrefs.app/MouseSettings.c:141
9323 msgid "Invalid mouse acceleration value. Must be a positive real value."
9324-msgstr "Ungültiger Wert für Mausbeschleunigung: Positiver Wert erwartet."
9325+msgstr "Ungültiger Wert für Mausy^: positive Kommazahl erwartet."
9326
9327 #: ../../WPrefs.app/MouseSettings.c:161
9328 msgid ""
9329 "Invalid mouse acceleration threshold value. Must be the number of pixels to "
9330 "travel before accelerating."
9331 msgstr ""
9332-"Ungültiger Schwellwert für Mausbeschleunigung: Anzahl der zurückgelegten "
9333-"Pixel erwartet"
9334+"Ungültiger Schwellenwert für Mausbeuschleunigung: Anzahl der zurückgelegten "
9335+"Pixel erwartet."
9336
9337 #: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274
9338 #: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298
9339@@ -1329,36 +1333,36 @@
9340 "modifier key %s for option ModifierKey was not recognized. Using %s as "
9341 "default"
9342 msgstr ""
9343-"Umschalttaste %s für die Option \"ModifierKey\" wurde nicht erkannt. Standard %s "
9344+"Tastenmodifikator %s für die Option ModifierKey wurde nicht erkannt. Standardwert %s "
9345 "wird benutzt"
9346
9347 #: ../../WPrefs.app/MouseSettings.c:382
9348 msgid "could not retrieve keyboard modifier mapping"
9349-msgstr "Tastaturmodifikator-Belegung konnte nicht zurückverfolgt werden"
9350+msgstr "Tastenmodifikator-Zuordnung konnte nicht zurückverfolgt werden"
9351
9352 #: ../../WPrefs.app/MouseSettings.c:477
9353 msgid "Mouse Speed"
9354-msgstr " Mausgeschwindigkeit "
9355+msgstr "Mausgeschwindigkeit"
9356
9357 #: ../../WPrefs.app/MouseSettings.c:507
9358 msgid "Acceler.:"
9359-msgstr "Beschl."
9360+msgstr "Beschl.:"
9361
9362 #: ../../WPrefs.app/MouseSettings.c:520
9363 msgid "Threshold:"
9364-msgstr "Schwellwert"
9365+msgstr "Schwelle:"
9366
9367 #: ../../WPrefs.app/MouseSettings.c:535
9368 msgid "Double-Click Delay"
9369-msgstr " Doppelklickverzögerung "
9370+msgstr "Doppelklickverzögerung"
9371
9372 #: ../../WPrefs.app/MouseSettings.c:579
9373 msgid "Test"
9374-msgstr "Test"
9375+msgstr ""
9376
9377 #: ../../WPrefs.app/MouseSettings.c:609
9378 msgid "Workspace Mouse Actions"
9379-msgstr " Arbeitsflächen-Mausklicks "
9380+msgstr "Arbeitsflächen-Mausaktionen"
9381
9382 #: ../../WPrefs.app/MouseSettings.c:614
9383 msgid "Disable mouse actions"
9384@@ -1366,15 +1370,15 @@
9385
9386 #: ../../WPrefs.app/MouseSettings.c:620
9387 msgid "Left Button"
9388-msgstr "Linke Taste"
9389+msgstr "Links"
9390
9391 #: ../../WPrefs.app/MouseSettings.c:630
9392 msgid "Middle Button"
9393-msgstr "Mittlere Taste"
9394+msgstr "Mitte"
9395
9396 #: ../../WPrefs.app/MouseSettings.c:640
9397 msgid "Right Button"
9398-msgstr "Rechte Taste"
9399+msgstr "Rechts"
9400
9401 #: ../../WPrefs.app/MouseSettings.c:650
9402 msgid "Mouse Wheel"
9403@@ -1382,7 +1386,7 @@
9404
9405 #: ../../WPrefs.app/MouseSettings.c:672
9406 msgid "Mouse Grab Modifier"
9407-msgstr " Taste zum Aufnehmen "
9408+msgstr "Taste zum Aufnehmen"
9409
9410 #: ../../WPrefs.app/MouseSettings.c:674
9411 msgid ""
9412@@ -1390,19 +1394,19 @@
9413 "involve dragging windows with the mouse,\n"
9414 "clicking inside the window."
9415 msgstr ""
9416-"Taste zum Verschieben eines Fensters,\n"
9417-"wenn in dessen Client-Bereich geklickt\n"
9418-"wurde."
9419+"Die Modifikatortaste, die den Verschiebe- oder\n"
9420+"Größenänderungsmodus aktiviert, wenn auf\n"
9421+"das Fenster geklickt wurde."
9422
9423 #: ../../WPrefs.app/MouseSettings.c:708
9424 #, c-format
9425 msgid "could not create %s"
9426-msgstr "%s konnte nicht erzeugt werden"
9427+msgstr "%s konnte nicht erstellt werden"
9428
9429 #: ../../WPrefs.app/MouseSettings.c:724
9430 #, c-format
9431 msgid "could not create temporary file %s"
9432-msgstr "temporäre Datei %s konnte nicht erzeugt werden"
9433+msgstr "temporäre Datei %s konnte nicht erstellt werden"
9434
9435 #: ../../WPrefs.app/MouseSettings.c:756
9436 #, c-format
9437@@ -1411,35 +1415,35 @@
9438
9439 #: ../../WPrefs.app/MouseSettings.c:829
9440 msgid "Shift"
9441-msgstr "Shift"
9442+msgstr ""
9443
9444 #: ../../WPrefs.app/MouseSettings.c:830
9445 msgid "Lock"
9446-msgstr "Untbr"
9447+msgstr ""
9448
9449 #: ../../WPrefs.app/MouseSettings.c:831
9450 msgid "Control"
9451-msgstr "Strg"
9452+msgstr ""
9453
9454 #: ../../WPrefs.app/MouseSettings.c:832
9455 msgid "Mod1"
9456-msgstr "Mod1"
9457+msgstr ""
9458
9459 #: ../../WPrefs.app/MouseSettings.c:833
9460 msgid "Mod2"
9461-msgstr "Mod2"
9462+msgstr ""
9463
9464 #: ../../WPrefs.app/MouseSettings.c:834
9465 msgid "Mod3"
9466-msgstr "Mod3"
9467+msgstr ""
9468
9469 #: ../../WPrefs.app/MouseSettings.c:835
9470 msgid "Mod4"
9471-msgstr "Mod4"
9472+msgstr ""
9473
9474 #: ../../WPrefs.app/MouseSettings.c:836
9475 msgid "Mod5"
9476-msgstr "Mod5"
9477+msgstr ""
9478
9479 #: ../../WPrefs.app/MouseSettings.c:839
9480 msgid "Applications Menu"
9481@@ -1455,7 +1459,7 @@
9482
9483 #: ../../WPrefs.app/MouseSettings.c:849
9484 msgid "Mouse Preferences"
9485-msgstr "Maus-Einstellungen"
9486+msgstr "Mauseinstellungen"
9487
9488 #: ../../WPrefs.app/MouseSettings.c:851
9489 msgid ""
9490@@ -1463,36 +1467,40 @@
9491 "mouse button bindings etc."
9492 msgstr ""
9493 "Mausgeschwindigkeit/-beschleunigung, Doppelklickverzögerung,\n"
9494-"Maustastenbelegung usw."
9495+"Maustastenaktionen"
9496
9497 #: ../../WPrefs.app/Paths.c:85
9498 msgid "bad value in option IconPath. Using default path list"
9499-msgstr "ungültiger Wert in Eigenschaft \"IconPath\". Standard Pfadliste wird verwendet."
9500+msgstr "ungültiger Wert in Eigenschaft IconPath. Standardliste wird verwendet."
9501
9502 #: ../../WPrefs.app/Paths.c:102
9503 msgid "bad value in option PixmapPath. Using default path list"
9504-msgstr "ungültiger Wert in Eigenschaft \"PixmapPath\". Standard Pfadliste wird verwendet."
9505+msgstr "ungültiger Wert in Eigenschaft PixmapPath. Standardliste wird verwendet."
9506
9507 #: ../../WPrefs.app/Paths.c:150
9508 msgid "Select directory"
9509-msgstr "Verzeichnis wählen"
9510+msgstr "Verzeichnis auswählen"
9511
9512 #: ../../WPrefs.app/Paths.c:266
9513 msgid "Icon Search Paths"
9514-msgstr "Symbol-Verzeichnisse"
9515+msgstr "Symbol-Suchpfade"
9516
9517 #: ../../WPrefs.app/Paths.c:277 ../../WPrefs.app/Paths.c:308
9518 #: ../../WPrefs.app/TexturePanel.c:1312
9519 msgid "Add"
9520 msgstr "Hinzufügen"
9521
9522+#: ../../WPrefs.app/Paths.c:284 ../../WPrefs.app/Paths.c:315
9523+msgid "Remove"
9524+msgstr "Entfernen"
9525+
9526 #: ../../WPrefs.app/Paths.c:297
9527 msgid "Pixmap Search Paths"
9528-msgstr "Pixmap-Verzeichnisse"
9529+msgstr "Pixmap-Suchpfade"
9530
9531 #: ../../WPrefs.app/Paths.c:337
9532 msgid "Search Path Configuration"
9533-msgstr "Suchpfad-Einstellungen"
9534+msgstr "Suchpfadeinstellungen"
9535
9536 #: ../../WPrefs.app/Paths.c:339
9537 msgid ""
9538@@ -1501,10 +1509,12 @@
9539 msgstr "Suchpfade für Pixmaps und Symbole"
9540
9541 #: ../../WPrefs.app/Preferences.c:75
9542+#, c-format
9543 msgid "OFF"
9544-msgstr "Aus"
9545+msgstr "AUS"
9546
9547 #: ../../WPrefs.app/Preferences.c:77
9548+#, c-format
9549 msgid "1 pixel"
9550 msgstr "1 Pixel"
9551
9552@@ -1529,8 +1539,8 @@
9553 "The position or style of the window size\n"
9554 "display that's shown when a window is resized."
9555 msgstr ""
9556-"Die Position oder Stil der Größenanzeige,\n"
9557-"die beim Verändern eines Fensters erscheint."
9558+"Die Position und Art der Anzeige die bei der\n"
9559+"Größenänderung der Fensters benutzt wird."
9560
9561 #: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259
9562 msgid "Corner of screen"
9563@@ -1546,11 +1556,11 @@
9564
9565 #: ../../WPrefs.app/Preferences.c:241
9566 msgid "Technical drawing-like"
9567-msgstr "Wie technische Zeichnung"
9568+msgstr "wie technische Zeichnung"
9569
9570 #: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262
9571 msgid "Disabled"
9572-msgstr "Deaktiviert"
9573+msgstr "Keine"
9574
9575 #: ../../WPrefs.app/Preferences.c:250
9576 msgid "Position Display"
9577@@ -1561,8 +1571,8 @@
9578 "The position or style of the window position\n"
9579 "display that's shown when a window is moved."
9580 msgstr ""
9581-"Ausrichtung oder Stil der Positionsanzeige, die\n"
9582-"beim Verschieben eines Fensters sichtbar ist."
9583+"Die Position und Art der Anzeige\n"
9584+"beim Verschieben eines Fensters"
9585
9586 #: ../../WPrefs.app/Preferences.c:270
9587 msgid "Show balloon text for..."
9588@@ -1578,7 +1588,7 @@
9589
9590 #: ../../WPrefs.app/Preferences.c:279
9591 msgid "application/dock icons"
9592-msgstr "Anwendungs-/ Docksymbole"
9593+msgstr "Anwendungs-/Docksymbole"
9594
9595 #: ../../WPrefs.app/Preferences.c:280
9596 msgid "internal help"
9597@@ -1589,8 +1599,8 @@
9598 "Raise window when switching\n"
9599 "focus with keyboard."
9600 msgstr ""
9601-"Fenster nach vorne bei Fokus-\n"
9602-"wechsel mit Tastatur."
9603+"Aktives Fenster nach Tastatur-\n"
9604+"Fokuswechsel oben."
9605
9606 #: ../../WPrefs.app/Preferences.c:298
9607 msgid ""
9608@@ -1614,7 +1624,7 @@
9609
9610 #: ../../WPrefs.app/Preferences.c:349
9611 msgid "Miscellaneous Ergonomic Preferences"
9612-msgstr "Diverse Ergonomie-Einstellungen"
9613+msgstr "Verschiedene Einstellungen zur Ergonomie"
9614
9615 #: ../../WPrefs.app/Preferences.c:350
9616 msgid ""
9617@@ -1656,15 +1666,15 @@
9618 #: ../../WPrefs.app/TexturePanel.c:1066
9619 #, c-format
9620 msgid "error creating texture %s"
9621-msgstr "Fehler beim Erzeugen der Textur %s"
9622+msgstr "Fehler beim Erstellen der Textur %s"
9623
9624 #: ../../WPrefs.app/TexturePanel.c:1256
9625 msgid "Texture Panel"
9626-msgstr "Textur bearbeiten"
9627+msgstr "Texturanzeige"
9628
9629 #: ../../WPrefs.app/TexturePanel.c:1264
9630 msgid "Texture Name"
9631-msgstr "Textur-Name"
9632+msgstr "Texturname"
9633
9634 #: ../../WPrefs.app/TexturePanel.c:1276
9635 msgid "Solid Color"
9636@@ -1684,27 +1694,27 @@
9637
9638 #: ../../WPrefs.app/TexturePanel.c:1280
9639 msgid "Image Texture"
9640-msgstr "Grafik-Textur"
9641+msgstr "Bildtextur"
9642
9643 #: ../../WPrefs.app/TexturePanel.c:1288
9644 msgid "Default Color"
9645-msgstr " Standardfarbe "
9646+msgstr "Standardfarbe"
9647
9648 #: ../../WPrefs.app/TexturePanel.c:1300
9649 msgid "Gradient Colors"
9650-msgstr " Verlaufsfarben "
9651+msgstr "Verlaufsfarben"
9652
9653 #: ../../WPrefs.app/TexturePanel.c:1396
9654 msgid "Direction"
9655-msgstr " Richtung "
9656+msgstr "Richtung"
9657
9658 #: ../../WPrefs.app/TexturePanel.c:1424
9659 msgid "Gradient"
9660-msgstr " Verlauf "
9661+msgstr "Farbverlauf"
9662
9663 #: ../../WPrefs.app/TexturePanel.c:1442
9664 msgid "Gradient Opacity"
9665-msgstr "Transparenz"
9666+msgstr "Farbverlaufsdeckung"
9667
9668 #: ../../WPrefs.app/TexturePanel.c:1484
9669 msgid "Image"
9670@@ -1720,7 +1730,7 @@
9671
9672 #: ../../WPrefs.app/TexturePanel.c:1519
9673 msgid "Maximize"
9674-msgstr "Maximiert"
9675+msgstr "Maximieren"
9676
9677 #: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82
9678 msgid "Set"
9679@@ -1728,12 +1738,12 @@
9680
9681 #: ../../WPrefs.app/Themes.c:132
9682 msgid "Stop"
9683-msgstr "Stop"
9684+msgstr ""
9685
9686 #: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203
9687 #: ../../WPrefs.app/Themes.c:223
9688 msgid "Download"
9689-msgstr "Herunterladen"
9690+msgstr ""
9691
9692 #: ../../WPrefs.app/Themes.c:171
9693 msgid "Save Current Theme"
9694@@ -1749,119 +1759,96 @@
9695
9696 #: ../../WPrefs.app/Themes.c:193
9697 msgid "Tile of The Day"
9698-msgstr "Tageskachel"
9699+msgstr "Kachel des Tages"
9700
9701 #: ../../WPrefs.app/Themes.c:213
9702 msgid "Bar of The Day"
9703-msgstr "Tagesleiste"
9704+msgstr "Leiste des Tages"
9705
9706-#: ../../WPrefs.app/WPrefs.c:260
9707+#: ../../WPrefs.app/WPrefs.c:260 ../../WPrefs.app/WPrefs.c:331
9708 msgid "Window Maker Preferences"
9709-msgstr "Window Maker-Einstellungen"
9710+msgstr "Window Maker Einstellungen"
9711
9712-#: ../../WPrefs.app/WPrefs.c:284
9713+#: ../../WPrefs.app/WPrefs.c:283
9714 msgid "Revert Page"
9715 msgstr "Seite zurücknehmen"
9716
9717-#: ../../WPrefs.app/WPrefs.c:290
9718+#: ../../WPrefs.app/WPrefs.c:289
9719 msgid "Revert All"
9720-msgstr "Alle zurücknehmen"
9721+msgstr "Alles zurücknehmen"
9722
9723-#: ../../WPrefs.app/WPrefs.c:296
9724+#: ../../WPrefs.app/WPrefs.c:295
9725 msgid "Save"
9726 msgstr "Speichern"
9727
9728-#: ../../WPrefs.app/WPrefs.c:309
9729+#: ../../WPrefs.app/WPrefs.c:308
9730 msgid "Balloon Help"
9731 msgstr "Ballon-Hilfe"
9732
9733-#: ../../WPrefs.app/WPrefs.c:334
9734-msgid "Window Maker Preferences Utility"
9735-msgstr "Window Maker Einstellungen"
9736-
9737-#: ../../WPrefs.app/WPrefs.c:341
9738+#: ../../WPrefs.app/WPrefs.c:338
9739 #, c-format
9740-msgid "Version %s for Window Maker %s or newer"
9741-msgstr "Version %s für Window Maker %s oder neuer"
9742+msgid "Version %s"
9743+msgstr ""
9744
9745-#: ../../WPrefs.app/WPrefs.c:349
9746+#: ../../WPrefs.app/WPrefs.c:345
9747 msgid "Starting..."
9748 msgstr "Starte..."
9749
9750-#: ../../WPrefs.app/WPrefs.c:355
9751-msgid ""
9752-"Programming/Design: Alfredo K. Kojima\n"
9753-"Artwork: Marco van Hylckama Vlieg, Largo et al\n"
9754-"More Programming: James Thompson et al"
9755-msgstr ""
9756-"Programmierung/Design: Alfredo K. Kojima\n"
9757-"Künstlerische Gestaltung: Marco van Hylckama Vlieg, Largo et al\n"
9758-"Weitere Programmierung: James Thompson et al"
9759-
9760-#: ../../WPrefs.app/WPrefs.c:455
9761+#: ../../WPrefs.app/WPrefs.c:443
9762 #, c-format
9763 msgid "could not locate image file %s\n"
9764 msgstr "Bilddatei %s konnte nicht gefunden werden\n"
9765
9766-#: ../../WPrefs.app/WPrefs.c:670
9767+#: ../../WPrefs.app/WPrefs.c:656
9768 #, c-format
9769 msgid "could not load image file %s:%s"
9770 msgstr "Bilddatei %s konnte nicht geladen werden: %s"
9771
9772-#: ../../WPrefs.app/WPrefs.c:689
9773+#: ../../WPrefs.app/WPrefs.c:674
9774 msgid "Loading Window Maker configuration files..."
9775 msgstr "Window Maker-Konfigurationsdateien werden geladen..."
9776
9777-#: ../../WPrefs.app/WPrefs.c:693
9778+#: ../../WPrefs.app/WPrefs.c:678
9779 msgid "Initializing configuration panels..."
9780-msgstr "Einstellungsdialoge werden vorbereitet..."
9781-
9782-#: ../../WPrefs.app/WPrefs.c:728
9783-msgid ""
9784-"WPrefs is free software and is distributed WITHOUT ANY\n"
9785-"WARRANTY under the terms of the GNU General Public License."
9786-msgstr ""
9787-"WPrefs ist freie Software und wird OHNE JEDE GEWÄHRLEISTUNG\n"
9788-"unter den Bedingungen der GNU General Public License vertrieben."
9789+msgstr "Einstellungsseiten werden vorbereitet..."
9790
9791-#: ../../WPrefs.app/WPrefs.c:758 ../../WPrefs.app/WPrefs.c:838
9792+#: ../../WPrefs.app/WPrefs.c:739 ../../WPrefs.app/WPrefs.c:819
9793 #, c-format
9794 msgid "Window Maker domain (%s) is corrupted!"
9795 msgstr "Window Maker-Domäne (%s) ist fehlerhaft!"
9796
9797-#: ../../WPrefs.app/WPrefs.c:762
9798+#: ../../WPrefs.app/WPrefs.c:743
9799 #, c-format
9800 msgid "Could not load Window Maker domain (%s) from defaults database."
9801 msgstr "Window Maker-Domäne (%s) konnte nicht aus Standarddatenbank geladen werden."
9802
9803-#: ../../WPrefs.app/WPrefs.c:778
9804+#: ../../WPrefs.app/WPrefs.c:759
9805 msgid "could not extract version information from Window Maker"
9806 msgstr "Window Maker-Versionsinformationen konnten nicht festgestellt werden"
9807
9808-#: ../../WPrefs.app/WPrefs.c:779
9809+#: ../../WPrefs.app/WPrefs.c:760
9810 msgid "Make sure wmaker is in your search path."
9811-msgstr "Stellen Sie sicher, das \"wmaker\" im Suchfpad enthalten ist."
9812+msgstr "Stellen Sie sicher, das \"wmaker\" in Ihrem Suchpfad enhalten ist."
9813
9814-#: ../../WPrefs.app/WPrefs.c:782
9815+#: ../../WPrefs.app/WPrefs.c:763
9816 msgid ""
9817 "Could not extract version from Window Maker. Make sure it is correctly "
9818 "installed and is in your PATH environment variable."
9819 msgstr ""
9820 "Window Maker-Versionsinformationen konnten nicht festgestellt werden. "
9821-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-"
9822-"Variable enthalten ist."
9823+"Stellen Sie sicher, dass Window Maker korrekt installiert und in der PATH-"
9824+"Umgebungsvariable enthalten ist."
9825
9826-#: ../../WPrefs.app/WPrefs.c:792
9827+#: ../../WPrefs.app/WPrefs.c:773
9828 msgid ""
9829 "Could not extract version from Window Maker. Make sure it is correctly "
9830 "installed and the path where it installed is in the PATH environment "
9831 "variable."
9832 msgstr ""
9833 "Window Maker-Versionsinformationen konnten nicht festgestellt werden. "
9834-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-"
9835-"Variable enthalten ist."
9836+"Stellen Sie sicher, dass Window Maker korrekt installiert und der Installationspfad in der PATH-Umgebungsvariable enthalten ist."
9837
9838-#: ../../WPrefs.app/WPrefs.c:799
9839+#: ../../WPrefs.app/WPrefs.c:780
9840 #, c-format
9841 msgid ""
9842 "WPrefs only supports Window Maker 0.18.0 or newer.\n"
9843@@ -1870,44 +1857,42 @@
9844 "WPrefs unterstützt nur Window Maker 0.18.0 oder neuer.\n"
9845 "Die installierte Version ist %i.%i.%i\n"
9846
9847-#: ../../WPrefs.app/WPrefs.c:806
9848+#: ../../WPrefs.app/WPrefs.c:787
9849 #, c-format
9850 msgid ""
9851 "Window Maker %i.%i.%i, which is installed in your system, is not fully "
9852 "supported by this version of WPrefs."
9853 msgstr ""
9854 "Der auf Ihrem System installierte Window Maker %i.%i.%i wird von dieser "
9855-"WPrefs-Version nicht voll unterstützt."
9856+"WPrefs-Version nicht komplett unterstützt."
9857
9858-#: ../../WPrefs.app/WPrefs.c:819
9859+#: ../../WPrefs.app/WPrefs.c:800
9860 #, c-format
9861 msgid "could not run \"%s --global_defaults_path\"."
9862 msgstr "\"%s --global_defaults_path\" konnte nicht ausgeführt werden."
9863
9864-#: ../../WPrefs.app/WPrefs.c:842
9865+#: ../../WPrefs.app/WPrefs.c:823
9866 #, c-format
9867 msgid "Could not load global Window Maker domain (%s)."
9868 msgstr "Globale Window Maker-Domäne (%s) konnte nicht geladen werden."
9869
9870-#: ../../WPrefs.app/WPrefs.c:1091
9871+#: ../../WPrefs.app/WPrefs.c:1072
9872 #, c-format
9873 msgid ""
9874 "bad speed value for option %s\n"
9875 ". Using default Medium"
9876 msgstr ""
9877 "Falscher Geschwindigkeitswert für Eigenschaft %s.\n"
9878-"Standard \"Mittel\" wird benutzt."
9879+"Standardwert 'Mittel' wird benutzt."
9880
9881 #: ../../WPrefs.app/WindowHandling.c:141
9882 #, c-format
9883 msgid "bad option value %s in WindowPlacement. Using default value"
9884-msgstr "Ungültiger Wert %s für \"WindowPlacement\". Standardwert wird benutzt."
9885+msgstr "Ungültiger Wert %s in Fensterplatzierung. Standardwert wird benutzt."
9886
9887 #: ../../WPrefs.app/WindowHandling.c:163
9888 msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)"
9889-msgstr ""
9890-"Ungültige Daten in Option \"WindowPlaceOrigin\". Benutze Standardeinstellung "
9891-"(0,0)"
9892+msgstr "Ungültige Daten in Option WindowPlaceOrigin. Standardwert (0,0) wird benutzt."
9893
9894 #: ../../WPrefs.app/WindowHandling.c:243
9895 msgid "Window Placement"
9896@@ -1917,7 +1902,7 @@
9897 msgid ""
9898 "How to place windows when they are first put\n"
9899 "on screen."
9900-msgstr "Wie Fenster beim ersten Anzeigen platziert werden sollen."
9901+msgstr "Wahl der Fensterplatzierung beim ersten Anzeigen."
9902
9903 #: ../../WPrefs.app/WindowHandling.c:250
9904 msgid "Automatic"
9905@@ -1937,15 +1922,15 @@
9906
9907 #: ../../WPrefs.app/WindowHandling.c:254
9908 msgid "Smart"
9909-msgstr "Passend"
9910+msgstr "Schlau"
9911
9912 #: ../../WPrefs.app/WindowHandling.c:260
9913 msgid "Placement Origin"
9914-msgstr "Platzierungsursprung"
9915+msgstr "Startplatzierung"
9916
9917 #: ../../WPrefs.app/WindowHandling.c:321
9918 msgid "Opaque Move"
9919-msgstr "Mit Inhalt versch."
9920+msgstr "Verschiebeart"
9921
9922 #: ../../WPrefs.app/WindowHandling.c:322
9923 msgid ""
9924@@ -1953,13 +1938,13 @@
9925 "when dragging windows aroung or if only a\n"
9926 "frame should be displayed.\n"
9927 msgstr ""
9928-"Legt fest, ob beim Verschieben die Fensterinhalte\n"
9929+"Legt fest, ob beim Verschieben der Fensterinhalt\n"
9930 "oder nur ein Rechteck in Fenstergröße angezeigt \n"
9931 "werden soll.\n"
9932
9933 #: ../../WPrefs.app/WindowHandling.c:361
9934 msgid "When maximizing..."
9935-msgstr " Beim Maximieren... "
9936+msgstr "Beim Maximieren..."
9937
9938 #: ../../WPrefs.app/WindowHandling.c:366
9939 msgid "...do not cover icons"
9940@@ -1971,7 +1956,7 @@
9941
9942 #: ../../WPrefs.app/WindowHandling.c:381
9943 msgid "Edge Resistance"
9944-msgstr " Kantenwiderstand "
9945+msgstr "Kantenwiderstand"
9946
9947 #: ../../WPrefs.app/WindowHandling.c:383
9948 msgid ""
9949@@ -1980,10 +1965,10 @@
9950 "when moved against other windows or the edges\n"
9951 "of the screen."
9952 msgstr ""
9953-"Kantenwiderstand bewirkt, dass Fenster bis\n"
9954-"zur eingestellten Schwelle weiterer Bewegung\n"
9955-"widerstehen, wenn sie auf anderen Fenster oder\n"
9956-"die Bildschirmkante treffen."
9957+"Der Kantenwiderstand bewirkt, dass Fenster\n"
9958+"bis zur eingestellten Schwelle weiterer Bewegung\n"
9959+"widerstehen, wenn sie auf andere Fenster oder die\n"
9960+"Bildschirmkante treffen."
9961
9962 #: ../../WPrefs.app/WindowHandling.c:402
9963 msgid "Resist"
9964@@ -1993,57 +1978,55 @@
9965 msgid "Attract"
9966 msgstr "Zug"
9967
9968-#: ../../WPrefs.app/WindowHandling.c:423
9969+#: ../../WPrefs.app/WindowHandling.c:421
9970 msgid ""
9971-"Open dialogs in same workspace\n"
9972+"Open dialogs in the same workspace\n"
9973 "as their owners"
9974 msgstr ""
9975-"Dialogfenster auf Arbeitsfläche des\n"
9976+"Dialoge auf Arbeitsfläche des\n"
9977 "Eigentümers öffnen"
9978
9979-#: ../../WPrefs.app/WindowHandling.c:450
9980+#: ../../WPrefs.app/WindowHandling.c:448
9981 msgid "Window Handling Preferences"
9982-msgstr "Fensterhandhabungs-Einstellungen"
9983+msgstr "Einstellungen zum Fensterverhalten"
9984
9985-#: ../../WPrefs.app/WindowHandling.c:452
9986+#: ../../WPrefs.app/WindowHandling.c:450
9987 msgid ""
9988 "Window handling options. Initial placement style\n"
9989 "edge resistance, opaque move etc."
9990 msgstr ""
9991-"Einstellungen zur Fensterhandhabung: Anfangsplatzierung,\n"
9992-"Kantenwiderstand, mit Inhalt verschieben usw."
9993+"Einstellungen zum Fensterverhalten: Anfangsplatzierung,\n"
9994+"Kantenwiderstand, Verschiebeart usw."
9995
9996 #: ../../WPrefs.app/Workspace.c:176
9997 msgid "Workspace Navigation"
9998-msgstr " Arbeitsflächennavigation "
9999+msgstr "Arbeitsflächennavigation"
10000
10001 #: ../../WPrefs.app/Workspace.c:183
10002-msgid ""
10003-"wrap to the first workspace after the\n"
10004-"last workspace."
10005+msgid "Wrap to the first workspace from the last workspace."
10006 msgstr ""
10007-"Auf letzte Arbeitsfläche folgt wieder\n"
10008-"die erste"
10009+"Auf die letzte Arbeitsfläche folgt wieder\n"
10010+"die erste."
10011
10012 #: ../../WPrefs.app/Workspace.c:205
10013-msgid "switch workspaces while dragging windows."
10014-msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln"
10015+msgid "Switch workspaces while dragging windows."
10016+msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln."
10017
10018 #: ../../WPrefs.app/Workspace.c:227
10019-msgid "automatically create new workspaces."
10020-msgstr "Automatisch neue Arbeitsflächen erzeugen"
10021+msgid "Automatically create new workspaces."
10022+msgstr "Automatisch neue Arbeitsflächen erstellen."
10023
10024 #: ../../WPrefs.app/Workspace.c:250
10025 msgid ""
10026 "Position of workspace\n"
10027 "name display"
10028 msgstr ""
10029-"Position des\n"
10030-"Arbeitsflächennamens"
10031+"Position des Namens\n"
10032+"der Arbeitsfläche"
10033
10034 #: ../../WPrefs.app/Workspace.c:269
10035 msgid "Disable"
10036-msgstr "Deaktiviert"
10037+msgstr "Keiner"
10038
10039 #: ../../WPrefs.app/Workspace.c:271
10040 msgid "Top"
10041@@ -2071,35 +2054,35 @@
10042
10043 #: ../../WPrefs.app/Workspace.c:284
10044 msgid "Dock/Clip"
10045-msgstr " Dock/Clip "
10046+msgstr "Dock/Clip"
10047
10048 #: ../../WPrefs.app/Workspace.c:303
10049 msgid ""
10050 "Disable/enable the application Dock (the\n"
10051 "vertical icon bar in the side of the screen)."
10052 msgstr ""
10053-"Anwendungsdock ein-/ausschalten (die vertikale\n"
10054-"Symbolleiste am Rande des Bildschirmes)."
10055+"Anwendungsdock ein-/ausschalten (die\n"
10056+"vertikale Symbolleiste am Rande des Bildschirmes)."
10057
10058 #: ../../WPrefs.app/Workspace.c:324
10059 msgid ""
10060 "Disable/enable the Clip (that thing with\n"
10061 "a paper clip icon)."
10062 msgstr ""
10063-"Clip ein-/ausschalten (das Ding mit\n"
10064-"dem Büroklammersymbol)."
10065+"Clip ein-/ausschalten (das Ding mit der\n"
10066+"Büroklammer)."
10067
10068 #: ../../WPrefs.app/Workspace.c:364
10069 msgid "Workspace Preferences"
10070-msgstr "Arbeitsflächen-Einstellungen"
10071+msgstr "Arbeitsflächeneinstellungen"
10072
10073 #: ../../WPrefs.app/Workspace.c:366
10074 msgid ""
10075 "Workspace navigation features.\n"
10076 "You can also enable/disable the Dock and Clip here."
10077 msgstr ""
10078-"Einstellungen zur Arbeitsflächennavigation. Auch Dock\n"
10079-"und Clip können hier ein-/ausgeschaltet werden."
10080+"Einstellungen zur Arbeitsflächennavigation.\n"
10081+"Auch Dock und Clip können hier ein-/ausgeschaltet werden."
10082
10083 #: ../../WPrefs.app/imagebrowser.c:95
10084 msgid "View"
10085@@ -2131,20 +2114,20 @@
10086 msgid "too few arguments for %s"
10087 msgstr "zu wenig Argumente für %s"
10088
10089-#: ../../WPrefs.app/main.c:144
10090+#: ../../WPrefs.app/main.c:145
10091 msgid "X server does not support locale"
10092-msgstr "X-Server unterstützt keine Lokalisierung"
10093+msgstr "X-Server unterstützt keine Lokalisierungen"
10094
10095-#: ../../WPrefs.app/main.c:147
10096+#: ../../WPrefs.app/main.c:148
10097 msgid "cannot set locale modifiers"
10098 msgstr "Lokalisierung kann nicht gesetzt werden"
10099
10100-#: ../../WPrefs.app/main.c:153
10101+#: ../../WPrefs.app/main.c:154
10102 #, c-format
10103 msgid "could not open display %s"
10104-msgstr "Display %s konnte nicht geöffnet werden"
10105+msgstr "Display %s kann nicht geöffnet werden"
10106
10107-#: ../../WPrefs.app/main.c:161
10108+#: ../../WPrefs.app/main.c:162
10109 msgid "could not initialize application"
10110 msgstr "Anwendung konnte nicht initialisiert werden"
10111
10112diff -Nur WindowMaker-0.92.0.orig/wrlib/convert.c WindowMaker-0.92.0/wrlib/convert.c
10113--- WindowMaker-0.92.0.orig/wrlib/convert.c 2004-10-12 20:20:30.000000000 +0200
10114+++ WindowMaker-0.92.0/wrlib/convert.c 2005-08-23 00:30:35.000000000 +0200
10115@@ -68,8 +68,9 @@
10116 extern void x86_mmx_TrueColor_32_to_16(unsigned char *image,
10117 unsigned short *ximage,
10118 short *err, short *nerr,
10119- short *rtable, short *gtable,
10120- short *btable,
10121+ const unsigned short *rtable,
10122+ const unsigned short *gtable,
10123+ const unsigned short *btable,
10124 int dr, int dg, int db,
10125 unsigned int roffs,
10126 unsigned int goffs,
10127@@ -175,9 +176,9 @@
10128 static void
10129 convertTrueColor_generic(RXImage *ximg, RImage *image,
10130 signed char *err, signed char *nerr,
10131- const short *rtable,
10132- const short *gtable,
10133- const short *btable,
10134+ const unsigned short *rtable,
10135+ const unsigned short *gtable,
10136+ const unsigned short *btable,
10137 const int dr, const int dg, const int db,
10138 const unsigned short roffs,
10139 const unsigned short goffs,
10140@@ -408,8 +409,8 @@
10141 } else
10142 #endif /* ASM_X86_MMX */
10143 {
10144- char *err;
10145- char *nerr;
10146+ signed char *err;
10147+ signed char *nerr;
10148 int ch = (HAS_ALPHA(image) ? 4 : 3);
10149
10150 err = malloc(ch*(image->width+2));
10151@@ -447,9 +448,9 @@
10152 static void
10153 convertPseudoColor_to_8(RXImage *ximg, RImage *image,
10154 signed char *err, signed char *nerr,
10155- const short *rtable,
10156- const short *gtable,
10157- const short *btable,
10158+ const unsigned short *rtable,
10159+ const unsigned short *gtable,
10160+ const unsigned short *btable,
10161 const int dr, const int dg, const int db,
10162 unsigned long *pixels,
10163 int cpc)
10164@@ -459,7 +460,7 @@
10165 int pixel;
10166 int rer, ger, ber;
10167 unsigned char *ptr = image->data;
10168- unsigned char *optr = ximg->image->data;
10169+ unsigned char *optr = (unsigned char*)ximg->image->data;
10170 int channels = (HAS_ALPHA(image) ? 4 : 3);
10171 int cpcpc = cpc*cpc;
10172
10173@@ -573,8 +574,8 @@
10174 }
10175 } else {
10176 /* dither */
10177- char *err;
10178- char *nerr;
10179+ signed char *err;
10180+ signed char *nerr;
10181 const int dr=0xff/rmask;
10182 const int dg=0xff/gmask;
10183 const int db=0xff/bmask;
10184diff -Nur WindowMaker-0.92.0.orig/wrlib/gradient.c WindowMaker-0.92.0/wrlib/gradient.c
10185--- WindowMaker-0.92.0.orig/wrlib/gradient.c 2004-10-12 20:21:11.000000000 +0200
10186+++ WindowMaker-0.92.0/wrlib/gradient.c 2005-08-23 00:04:37.000000000 +0200
10187@@ -242,7 +242,7 @@
10188 RImage *image, *tmp;
10189 int j;
10190 float a, offset;
10191- char *ptr;
10192+ unsigned char *ptr;
10193
10194 if (width == 1)
10195 return renderVGradient(width, height, r0, g0, b0, rf, gf, bf);
10196diff -Nur WindowMaker-0.92.0.orig/wrlib/ppm.c WindowMaker-0.92.0/wrlib/ppm.c
10197--- WindowMaker-0.92.0.orig/wrlib/ppm.c 2004-10-12 20:22:13.000000000 +0200
10198+++ WindowMaker-0.92.0/wrlib/ppm.c 2005-08-23 00:09:41.000000000 +0200
10199@@ -43,8 +43,9 @@
10200
10201 } else {
10202 if (max<256) {
10203+ unsigned char *ptr;
10204+ char *buf;
10205 int x, y;
10206- char *buf, *ptr;
10207
10208 buf = malloc(w+1);
10209 if (!buf) {
10210@@ -83,7 +84,7 @@
10211 RImage *image;
10212 int i;
10213 char buf[3];
10214- char *ptr;
10215+ unsigned char *ptr;
10216
10217 image = RCreateImage(w, h, 0);
10218 if (!image) {
10219diff -Nur WindowMaker-0.92.0.orig/wrlib/raster.c WindowMaker-0.92.0/wrlib/raster.c
10220--- WindowMaker-0.92.0.orig/wrlib/raster.c 2004-10-25 03:48:39.000000000 +0200
10221+++ WindowMaker-0.92.0/wrlib/raster.c 2005-08-23 00:35:27.000000000 +0200
10222@@ -283,31 +283,37 @@
10223
10224 int
10225 calculateCombineArea(RImage *des, RImage *src, int *sx, int *sy,
10226- int *swidth, int *sheight, int *dx, int *dy)
10227+ unsigned int *swidth, unsigned int *sheight, int *dx, int *dy)
10228 {
10229+ int width = (int)*swidth, height = (int)*sheight;
10230+
10231 if (*dx < 0) {
10232 *sx = -*dx;
10233- *swidth = *swidth + *dx;
10234+ width = width + *dx;
10235 *dx = 0;
10236 }
10237
10238- if (*dx + *swidth > des->width) {
10239- *swidth = des->width - *dx;
10240+ if (*dx + width > des->width) {
10241+ width = des->width - *dx;
10242 }
10243
10244 if (*dy < 0) {
10245 *sy = -*dy;
10246- *sheight = *sheight + *dy;
10247+ height = height + *dy;
10248 *dy = 0;
10249 }
10250
10251- if (*dy + *sheight > des->height) {
10252- *sheight = des->height - *dy;
10253+ if (*dy + height > des->height) {
10254+ height = des->height - *dy;
10255 }
10256
10257- if (*sheight > 0 && *swidth > 0) {
10258+ if (height>0 && width>0) {
10259+ *swidth = width;
10260+ *sheight = height;
10261 return True;
10262- } else return False;
10263+ }
10264+
10265+ return False;
10266 }
10267
10268 void
10269diff -Nur WindowMaker-0.92.0.orig/wrlib/tests/Makefile.am WindowMaker-0.92.0/wrlib/tests/Makefile.am
10270--- WindowMaker-0.92.0.orig/wrlib/tests/Makefile.am 2005-03-02 11:09:45.000000000 +0100
10271+++ WindowMaker-0.92.0/wrlib/tests/Makefile.am 2006-01-22 16:47:25.000000000 +0100
10272@@ -6,7 +6,7 @@
10273
10274 EXTRA_DIST = test.png tile.xpm ballot_box.xpm
10275
10276-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@
10277+INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
10278
10279 LIBLIST = $(top_builddir)/wrlib/libwraster.la
10280
10281diff -Nur WindowMaker-0.92.0.orig/wrlib/x86_specific.c WindowMaker-0.92.0/wrlib/x86_specific.c
10282--- WindowMaker-0.92.0.orig/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100
10283+++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-23 00:05:43.000000000 +0200
10284@@ -85,9 +85,9 @@
10285 unsigned short *ximage,
10286 short *err,
10287 short *nerr,
10288- short *rtable,
10289- short *gtable,
10290- short *btable,
10291+ unsigned short *rtable,
10292+ unsigned short *gtable,
10293+ unsigned short *btable,
10294 int dr,
10295 int dg,
10296 int db,
10297@@ -98,15 +98,27 @@
10298 int height,
10299 int line_offset)
10300 {
10301- long long rrggbbaa;
10302- long long pixel;
10303+ union {
10304+ long long rrggbbaa;
10305+ struct {
10306+ short int rr, gg, bb, aa;
10307+ } words;
10308+ } rrggbbaa;
10309+
10310+ union {
10311+ long long pixel;
10312+ struct {
10313+ short int rr, gg, bb, aa;
10314+ } words;
10315+ } pixel;
10316+
10317 short *tmp_err;
10318 short *tmp_nerr;
10319 int x;
10320
10321 asm volatile
10322 (
10323- "pushal \n\t"
10324+ "pushl %%ebx \n\t"
10325
10326 // pack dr, dg and db into mm6
10327 "movl %7, %%eax \n\t"
10328@@ -219,7 +231,7 @@
10329 "movq %%mm0, %%mm1 \n\t"
10330 "pmullw %%mm5, %%mm1 \n\t" // mm1 = mm1*7
10331 "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16
10332- "paddw 8(%%ebx), %%mm1 \n\t"
10333+ "paddw 8(%%ebx), %%mm1 \n\t"
10334 "movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16
10335
10336
10337@@ -228,7 +240,7 @@
10338 "movq %%mm0, %%mm1 \n\t"
10339 "pmullw %%mm4, %%mm1 \n\t" // mm1 = mm1*5
10340 "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16
10341- "paddw -8(%%ebx), %%mm1 \n\t"
10342+ "paddw -8(%%ebx), %%mm1 \n\t"
10343 "movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16
10344
10345 "movq %%mm0, %%mm1 \n\t"
10346@@ -274,7 +286,7 @@
10347 // because, punpcklbw is used (which reads 8 bytes) and the last
10348 // pixel is only 4 bytes. This is no problem because the image data
10349 // was allocated with extra 4 bytes when created.
10350- "addl $4, %%esi \n\t" // image->data += 4
10351+ "addl $4, %%esi \n\t" // image->data += 4
10352
10353
10354 "decl %26 \n\t" // x--
10355@@ -290,7 +302,7 @@
10356
10357 ".Enda: \n\t" // THE END
10358 "emms \n\t"
10359- "popal \n\t"
10360+ "popl %%ebx \n\t"
10361 :
10362 :
10363 "m" (image), // %0
10364@@ -309,17 +321,18 @@
10365 "m" (width), // %13
10366 "m" (height), // %14
10367 "m" (line_offset), // %15
10368- "m" (rrggbbaa), // %16 (access to rr)
10369- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
10370- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
10371- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
10372- "m" (pixel), // %20 (access to pixel.r)
10373- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
10374- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
10375- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
10376+ "m" (rrggbbaa.words.rr), // %16 (access to rr)
10377+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
10378+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
10379+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
10380+ "m" (pixel.words.rr), // %20 (access to pixel.r)
10381+ "m" (pixel.words.gg), // %21 (access to pixel.g)
10382+ "m" (pixel.words.bb), // %22 (access to pixel.b)
10383+ "m" (pixel.words.aa), // %23 (access to pixel.a)
10384 "m" (tmp_err), // %24
10385 "m" (tmp_nerr), // %25
10386 "m" (x) // %26
10387+ : "eax", "ecx", "edx", "esi", "edi"
10388 );
10389 }
10390
10391@@ -342,8 +355,19 @@
10392 int height,
10393 int line_offset)
10394 {
10395- long long rrggbbaa;
10396- long long pixel;
10397+ union {
10398+ long long rrggbbaa;
10399+ struct {
10400+ short int rr, gg, bb, aa;
10401+ } words;
10402+ } rrggbbaa;
10403+
10404+ union {
10405+ long long pixel;
10406+ struct {
10407+ short int rr, gg, bb, aa;
10408+ } words;
10409+ } pixel;
10410
10411 short *tmp_err;
10412 short *tmp_nerr;
10413@@ -354,7 +378,7 @@
10414
10415 asm volatile
10416 (
10417- "pushal \n\t"
10418+ "pushl %%ebx \n\t"
10419
10420 "movl %13, %%eax \n\t" // eax = width
10421 "movl %%eax, %%ebx \n\t"
10422@@ -424,7 +448,7 @@
10423
10424 ".Endc: \n\t" // THE END
10425 "emms \n\t"
10426- "popal \n\t"
10427+ "popl %%ebx \n\t"
10428 :
10429 :
10430 "m" (image), // %0
10431@@ -443,19 +467,20 @@
10432 "m" (width), // %13
10433 "m" (height), // %14
10434 "m" (line_offset), // %15
10435- "m" (rrggbbaa), // %16 (access to rr)
10436- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
10437- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
10438- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
10439- "m" (pixel), // %20 (access to pixel.r)
10440- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
10441- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
10442- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
10443+ "m" (rrggbbaa.words.rr), // %16 (access to rr)
10444+ "m" (rrggbbaa.words.gg), // %17 (access to gg)
10445+ "m" (rrggbbaa.words.bb), // %18 (access to bb)
10446+ "m" (rrggbbaa.words.aa), // %19 (access to aa)
10447+ "m" (pixel.words.rr), // %20 (access to pixel.r)
10448+ "m" (pixel.words.gg), // %21 (access to pixel.g)
10449+ "m" (pixel.words.bb), // %22 (access to pixel.b)
10450+ "m" (pixel.words.aa), // %23 (access to pixel.a)
10451 "m" (tmp_err), // %24
10452 "m" (tmp_nerr), // %25
10453 "m" (x), // %26
10454 "m" (w1), // %27
10455 "m" (w2) // %28
10456+ : "eax", "ecx", "edx", "esi", "edi"
10457 );
10458 }
10459
10460@@ -653,7 +678,7 @@
10461 "movw $0xff, %%dx \n\t" // pixel.blu > 255
10462 "jmp .OKBb \n"
10463 ".NEGBb: \n\t"
10464- "xorw %%dx, %%dx \n"
10465+ "xorw %%dx, %%dx \n"
10466 ".OKBb: \n\t"
10467 //partial reg
10468 "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu]
NeXT-alike window manager
This page took 1.530149 seconds and 4 git commands to generate.