Merge lp:~noskcaj/ubuntu/trusty/xfdesktop4/4.11.3 into lp:ubuntu/trusty/xfdesktop4
- Trusty (14.04)
- 4.11.3
- Merge into trusty
Proposed by
Jackson Doak
Status: | Needs review |
---|---|
Proposed branch: | lp:~noskcaj/ubuntu/trusty/xfdesktop4/4.11.3 |
Merge into: | lp:ubuntu/trusty/xfdesktop4 |
Diff against target: |
12232 lines (+2877/-2351) 52 files modified
.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c (+31/-28) .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c (+31/-28) ChangeLog (+402/-0) INSTALL (+2/-2) Makefile.in (+11/-4) NEWS (+34/-0) README (+2/-2) aclocal.m4 (+198/-103) backgrounds/Makefile.in (+1/-1) common/Makefile.in (+3/-3) common/xfdesktop-common.h (+1/-1) common/xfdesktop-thumbnailer.c (+22/-8) config.guess (+35/-162) config.h.in (+0/-3) config.sub (+26/-6) configure (+208/-208) configure.ac (+2/-2) debian/changelog (+17/-0) debian/patches/xubuntu_improve-nautilus-interactions.patch (+3/-3) debian/patches/xubuntu_set-accountsservice-user-bg.patch (+2/-2) doc/Makefile.in (+1/-1) ltmain.sh (+13/-19) missing (+2/-2) pixmaps/Makefile.in (+1/-1) po/Makefile.in.in (+4/-5) po/cs.po (+122/-117) po/de.po (+150/-144) po/en_AU.po (+96/-92) po/es.po (+95/-91) po/id.po (+148/-144) po/is.po (+98/-93) po/kk.po (+117/-113) po/ms.po (+117/-112) po/pl.po (+114/-108) po/pt.po (+96/-92) po/ru.po (+100/-96) po/sl.po (+101/-96) po/sv.po (+97/-92) po/tr.po (+97/-93) po/zh_CN.po (+108/-104) settings/Makefile.in (+3/-3) settings/main.c (+8/-8) settings/xfdesktop-settings-ui.glade (+1/-1) settings/xfdesktop-settings-ui.h (+1/-1) src/Makefile.in (+3/-3) src/xfce-desktop.c (+31/-28) src/xfce-workspace.c (+1/-1) src/xfdesktop-application.c (+2/-6) src/xfdesktop-file-icon-manager.c (+46/-75) src/xfdesktop-file-utils.c (+10/-3) src/xfdesktop-icon-view.c (+63/-40) src/xfdesktop-volume-icon.c (+0/-1) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/xfdesktop4/4.11.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+207353@code.launchpad.net |
Commit message
Description of the change
Merge new bugfix release from debian
To post a comment you must log in.
Unmerged revisions
- 95. By Jackson Doak
-
* Merge from debian. Remaining changes:
- debian/patches/ xubuntu_ improve- nautilus- interactions. patch: added,
should prevent nautilus from taking over the desktop if xfdesktop is
running (and vice-versa).
- debian/patches/ xubuntu_ set-accountsser vice-user- bg.patch: update the
user background property of Accountsservice on backdrop change.
* New upstream development release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file '.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c' |
2 | --- .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c 2014-01-22 11:02:26 +0000 |
3 | +++ .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c 2014-02-20 05:04:01 +0000 |
4 | @@ -115,6 +115,7 @@ |
5 | gboolean icons_font_size_set; |
6 | guint icons_font_size; |
7 | guint icons_size; |
8 | + gint style_refresh_timer; |
9 | GtkWidget *icon_view; |
10 | gdouble system_font_size; |
11 | #endif |
12 | @@ -618,6 +619,12 @@ |
13 | if(current_workspace < 0) |
14 | return; |
15 | |
16 | + /* release the bg_pixmap since the dimensions may have changed */ |
17 | + if(desktop->priv->bg_pixmap) { |
18 | + g_object_unref(desktop->priv->bg_pixmap); |
19 | + desktop->priv->bg_pixmap = NULL; |
20 | + } |
21 | + |
22 | /* special case for 1 backdrop to handle xinerama stretching */ |
23 | if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { |
24 | backdrop_changed_cb(xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], 0), desktop); |
25 | @@ -682,7 +689,7 @@ |
26 | { |
27 | XfceDesktop *desktop = XFCE_DESKTOP(user_data); |
28 | gint current_workspace, new_workspace, i; |
29 | - XfceBackdrop *current_backdrop, *new_backdrop; |
30 | + XfceBackdrop *new_backdrop; |
31 | |
32 | TRACE("entering"); |
33 | |
34 | @@ -703,16 +710,11 @@ |
35 | current_workspace, new_workspace); |
36 | |
37 | for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { |
38 | - /* We want to compare the current workspace backdrop with the new one |
39 | - * and see if we can avoid changing them if they are the same image/style */ |
40 | + /* Sanity check */ |
41 | if(current_workspace < desktop->priv->nworkspaces && current_workspace >= 0) { |
42 | - current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); |
43 | + /* update! */ |
44 | new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i); |
45 | - |
46 | - if(!xfce_backdrop_compare_backdrops(current_backdrop, new_backdrop) || !desktop->priv->bg_pixmap) { |
47 | - /* only update monitors that require it */ |
48 | - backdrop_changed_cb(new_backdrop, user_data); |
49 | - } |
50 | + backdrop_changed_cb(new_backdrop, user_data); |
51 | } else { |
52 | /* If current_workspace was removed or never existed, get the new |
53 | * backdrop and apply it */ |
54 | @@ -974,6 +976,9 @@ |
55 | g_object_unref(G_OBJECT(desktop->priv->channel)); |
56 | g_free(desktop->priv->property_prefix); |
57 | |
58 | + if(desktop->priv->style_refresh_timer != 0) |
59 | + g_source_remove(desktop->priv->style_refresh_timer); |
60 | + |
61 | G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); |
62 | } |
63 | |
64 | @@ -1333,28 +1338,26 @@ |
65 | return TRUE; |
66 | } |
67 | |
68 | +static gboolean |
69 | +style_refresh_cb(gpointer *w) |
70 | +{ |
71 | + XfceDesktop *desktop = XFCE_DESKTOP(w); |
72 | + |
73 | + xfce_desktop_refresh(desktop); |
74 | + desktop->priv->style_refresh_timer = 0; |
75 | + |
76 | + return FALSE; |
77 | +} |
78 | + |
79 | static void |
80 | -xfce_desktop_style_set(GtkWidget *w, |
81 | - GtkStyle *old_style) |
82 | +xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) |
83 | { |
84 | XfceDesktop *desktop = XFCE_DESKTOP(w); |
85 | -#ifdef ENABLE_DESKTOP_ICONS |
86 | - gdouble old_font_size; |
87 | -#endif |
88 | - |
89 | - if(GDK_IS_WINDOW(desktop->priv->bg_pixmap)) |
90 | - gdk_window_set_back_pixmap(gtk_widget_get_window(w), desktop->priv->bg_pixmap, FALSE); |
91 | - gtk_widget_queue_draw(w); |
92 | - |
93 | -#ifdef ENABLE_DESKTOP_ICONS |
94 | - old_font_size = desktop->priv->system_font_size; |
95 | - if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size |
96 | - && desktop->priv->icon_view && !desktop->priv->icons_font_size_set) |
97 | - { |
98 | - xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), |
99 | - desktop->priv->system_font_size); |
100 | - } |
101 | -#endif |
102 | + |
103 | + if(desktop->priv->style_refresh_timer != 0) |
104 | + g_source_remove(desktop->priv->style_refresh_timer); |
105 | + |
106 | + desktop->priv->style_refresh_timer = g_timeout_add_seconds(1, (GSourceFunc)style_refresh_cb, w); |
107 | } |
108 | |
109 | static void |
110 | |
111 | === modified file '.pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c' |
112 | --- .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c 2014-01-22 11:02:26 +0000 |
113 | +++ .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c 2014-02-20 05:04:01 +0000 |
114 | @@ -114,6 +114,7 @@ |
115 | gboolean icons_font_size_set; |
116 | guint icons_font_size; |
117 | guint icons_size; |
118 | + gint style_refresh_timer; |
119 | GtkWidget *icon_view; |
120 | gdouble system_font_size; |
121 | #endif |
122 | @@ -533,6 +534,12 @@ |
123 | if(current_workspace < 0) |
124 | return; |
125 | |
126 | + /* release the bg_pixmap since the dimensions may have changed */ |
127 | + if(desktop->priv->bg_pixmap) { |
128 | + g_object_unref(desktop->priv->bg_pixmap); |
129 | + desktop->priv->bg_pixmap = NULL; |
130 | + } |
131 | + |
132 | /* special case for 1 backdrop to handle xinerama stretching */ |
133 | if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { |
134 | backdrop_changed_cb(xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], 0), desktop); |
135 | @@ -597,7 +604,7 @@ |
136 | { |
137 | XfceDesktop *desktop = XFCE_DESKTOP(user_data); |
138 | gint current_workspace, new_workspace, i; |
139 | - XfceBackdrop *current_backdrop, *new_backdrop; |
140 | + XfceBackdrop *new_backdrop; |
141 | |
142 | TRACE("entering"); |
143 | |
144 | @@ -618,16 +625,11 @@ |
145 | current_workspace, new_workspace); |
146 | |
147 | for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { |
148 | - /* We want to compare the current workspace backdrop with the new one |
149 | - * and see if we can avoid changing them if they are the same image/style */ |
150 | + /* Sanity check */ |
151 | if(current_workspace < desktop->priv->nworkspaces && current_workspace >= 0) { |
152 | - current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); |
153 | + /* update! */ |
154 | new_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i); |
155 | - |
156 | - if(!xfce_backdrop_compare_backdrops(current_backdrop, new_backdrop) || !desktop->priv->bg_pixmap) { |
157 | - /* only update monitors that require it */ |
158 | - backdrop_changed_cb(new_backdrop, user_data); |
159 | - } |
160 | + backdrop_changed_cb(new_backdrop, user_data); |
161 | } else { |
162 | /* If current_workspace was removed or never existed, get the new |
163 | * backdrop and apply it */ |
164 | @@ -889,6 +891,9 @@ |
165 | g_object_unref(G_OBJECT(desktop->priv->channel)); |
166 | g_free(desktop->priv->property_prefix); |
167 | |
168 | + if(desktop->priv->style_refresh_timer != 0) |
169 | + g_source_remove(desktop->priv->style_refresh_timer); |
170 | + |
171 | G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); |
172 | } |
173 | |
174 | @@ -1248,28 +1253,26 @@ |
175 | return TRUE; |
176 | } |
177 | |
178 | +static gboolean |
179 | +style_refresh_cb(gpointer *w) |
180 | +{ |
181 | + XfceDesktop *desktop = XFCE_DESKTOP(w); |
182 | + |
183 | + xfce_desktop_refresh(desktop); |
184 | + desktop->priv->style_refresh_timer = 0; |
185 | + |
186 | + return FALSE; |
187 | +} |
188 | + |
189 | static void |
190 | -xfce_desktop_style_set(GtkWidget *w, |
191 | - GtkStyle *old_style) |
192 | +xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) |
193 | { |
194 | XfceDesktop *desktop = XFCE_DESKTOP(w); |
195 | -#ifdef ENABLE_DESKTOP_ICONS |
196 | - gdouble old_font_size; |
197 | -#endif |
198 | - |
199 | - if(GDK_IS_WINDOW(desktop->priv->bg_pixmap)) |
200 | - gdk_window_set_back_pixmap(gtk_widget_get_window(w), desktop->priv->bg_pixmap, FALSE); |
201 | - gtk_widget_queue_draw(w); |
202 | - |
203 | -#ifdef ENABLE_DESKTOP_ICONS |
204 | - old_font_size = desktop->priv->system_font_size; |
205 | - if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size |
206 | - && desktop->priv->icon_view && !desktop->priv->icons_font_size_set) |
207 | - { |
208 | - xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), |
209 | - desktop->priv->system_font_size); |
210 | - } |
211 | -#endif |
212 | + |
213 | + if(desktop->priv->style_refresh_timer != 0) |
214 | + g_source_remove(desktop->priv->style_refresh_timer); |
215 | + |
216 | + desktop->priv->style_refresh_timer = g_timeout_add_seconds(1, (GSourceFunc)style_refresh_cb, w); |
217 | } |
218 | |
219 | static void |
220 | |
221 | === modified file 'ChangeLog' |
222 | --- ChangeLog 2014-01-14 11:47:53 +0000 |
223 | +++ ChangeLog 2014-02-20 05:04:01 +0000 |
224 | @@ -1,3 +1,405 @@ |
225 | +commit 9b9bacb445ded5050ea073b9b1c784883a43456b |
226 | +Author: Eric Koegel <eric.koegel@gmail.com> |
227 | +Date: Mon Feb 17 15:26:42 2014 +0300 |
228 | + |
229 | + Release pixmap on screen changes |
230 | + |
231 | + Since the screen may have changed dimensions (i.e. change from |
232 | + lvds to hdmi display) we need to release the previous pixmap to |
233 | + reflect those changes. |
234 | + |
235 | +commit 11990471655a1ea7277497c8c93b716b1a3a2749 |
236 | +Author: Eric Koegel <eric.koegel@gmail.com> |
237 | +Date: Mon Feb 17 14:14:39 2014 +0300 |
238 | + |
239 | + Always redraw backdrop on display change |
240 | + |
241 | + When changing from a laptop display to an external monitor there |
242 | + are times where the wallpaper doesn't correcly update. This patch |
243 | + removes a couple checks that are preventing that update. |
244 | + |
245 | +commit e0f355e0f031b9ab2cc19cb7a32fbc6a4722e8cd |
246 | +Author: Eric Koegel <eric.koegel@gmail.com> |
247 | +Date: Sun Feb 16 17:22:15 2014 +0300 |
248 | + |
249 | + Scale up small image previews in xfdesktop-settings (Bug 10690) |
250 | + |
251 | + While it looks worse with small images, scaling up the previews |
252 | + makes icon selections more accessible when using the mouse. |
253 | + |
254 | +commit 9a7ea5a209faa3fd43ae9bc85a86491207897af3 |
255 | +Author: Eric Koegel <eric.koegel@gmail.com> |
256 | +Date: Tue Feb 11 11:33:12 2014 +0300 |
257 | + |
258 | + Revert "Simplify adding icons to the desktop" |
259 | + |
260 | + This reverts commit e339463f95c70578aae33f339ac54433f51cc5ae. |
261 | + |
262 | + This patch had the added feature of crashing xfdesktop when the |
263 | + icon size shrinks. Reverting to clean up the patch. |
264 | + |
265 | +commit 8ae12c53e5fde26fc7e635fff10e02ec22be5cd3 |
266 | +Author: Eric Koegel <eric.koegel@gmail.com> |
267 | +Date: Mon Feb 10 22:15:25 2014 +0300 |
268 | + |
269 | + update README with new defaults |
270 | + |
271 | +commit 09f4a5e334a6858369ea69cc62ddd381250c9d62 |
272 | +Author: Eric Koegel <eric.koegel@gmail.com> |
273 | +Date: Mon Feb 10 22:05:27 2014 +0300 |
274 | + |
275 | + Update default icon size, spacing, and text proportion |
276 | + |
277 | +commit 03900b4256dcd4e597882fa7116da3b2d7b56001 |
278 | +Author: abuyop <abuyop@gmail.com> |
279 | +Date: Mon Feb 10 18:31:59 2014 +0100 |
280 | + |
281 | + I18n: Update translation ms (100%). |
282 | + |
283 | + 216 translated messages. |
284 | + |
285 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
286 | + |
287 | +commit 369fe226968f678faf255805f5285665f20e03af |
288 | +Author: Eric Koegel <eric.koegel@gmail.com> |
289 | +Date: Mon Feb 10 16:06:21 2014 +0300 |
290 | + |
291 | + Fix strict aliasing issue |
292 | + |
293 | +commit e339463f95c70578aae33f339ac54433f51cc5ae |
294 | +Author: Eric Koegel <eric.koegel@gmail.com> |
295 | +Date: Mon Feb 10 15:07:29 2014 +0300 |
296 | + |
297 | + Simplify adding icons to the desktop |
298 | + |
299 | + Use xfdesktop_grid_get_next_free_position when placing icons on |
300 | + the desktop rather than having it spead over multiple functions. |
301 | + |
302 | +commit 9cec4dbbd0dcd9f1d6a0e247a64c133324c6a9c2 |
303 | +Author: PavelNicklasson <pavelnicklasson@bahnhof.se> |
304 | +Date: Mon Feb 10 00:31:53 2014 +0100 |
305 | + |
306 | + I18n: Update translation sv (100%). |
307 | + |
308 | + 216 translated messages. |
309 | + |
310 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
311 | + |
312 | +commit 21e242639b81e0d7ae0a6c7e922b78149ff2deab |
313 | +Author: Eric Koegel <eric.koegel@gmail.com> |
314 | +Date: Sun Feb 9 20:01:33 2014 +0300 |
315 | + |
316 | + Check for thumbnails in the new location |
317 | + |
318 | + The thumbnail managing standard was updated to change the location |
319 | + where thumbnails are sometimes stored. This has been changed to |
320 | + $XDG_CACHE_HOME/thumbnails/ unless $XDG_CACHE_HOME isn't defined, |
321 | + at which point it's back to $HOME/.cache/thumbnails . This patch |
322 | + has xfdesktop look in both places when the thumbnail is created |
323 | + and reports the first one that's found. |
324 | + |
325 | +commit 3706a99fcf96557107b9f422463dc721f64ba616 |
326 | +Author: asvl <alyoshin.s@gmail.com> |
327 | +Date: Sat Feb 8 00:31:56 2014 +0100 |
328 | + |
329 | + I18n: Update translation ru (100%). |
330 | + |
331 | + 216 translated messages. |
332 | + |
333 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
334 | + |
335 | +commit 9160a163e60bda06f5a1f550b5c04f846ff3817a |
336 | +Author: Eric Koegel <eric.koegel@gmail.com> |
337 | +Date: Mon Feb 3 15:38:20 2014 +0300 |
338 | + |
339 | + Scale down special icons (Bug 10653) |
340 | + |
341 | + gtk_icon_theme_lookup_by_gicon only returns icons that are |
342 | + close to what we requested. So scale those icons down if it |
343 | + is requred. |
344 | + Same fix as commit 596ac7b07939b3b93c6253b2db704a91e68e75d0 |
345 | + |
346 | +commit c585aff2aaf90e0c9350355b0096371f3cdc679a |
347 | +Author: Sveinn í Felli <sv1@fellsnet.is> |
348 | +Date: Thu Jan 30 12:31:57 2014 +0100 |
349 | + |
350 | + I18n: Update translation is (100%). |
351 | + |
352 | + 216 translated messages. |
353 | + |
354 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
355 | + |
356 | +commit b730aad939db6b8ab5b99e5e4873c7540f7e2be0 |
357 | +Author: Eric Koegel <eric.koegel@gmail.com> |
358 | +Date: Mon Jan 27 12:17:38 2014 +0300 |
359 | + |
360 | + Fix issues with icon resizing |
361 | + |
362 | +commit 983a5d601273ab2ef61bc437d655f999c45b8e01 |
363 | +Author: k3lt01 <keltoiboy@gmail.com> |
364 | +Date: Mon Jan 27 12:32:21 2014 +0100 |
365 | + |
366 | + I18n: Update translation en_AU (100%). |
367 | + |
368 | + 216 translated messages. |
369 | + |
370 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
371 | + |
372 | +commit 4917e11cd63a9dac885057a65808a675df1e1827 |
373 | +Author: padmawan <andhika.padmawan@gmail.com> |
374 | +Date: Sun Jan 26 06:32:19 2014 +0100 |
375 | + |
376 | + I18n: Update translation id (100%). |
377 | + |
378 | + 216 translated messages. |
379 | + |
380 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
381 | + |
382 | +commit 1516cb96c6ec9b20b63f05e7bcc4af8594d43129 |
383 | +Author: Eric Koegel <eric.koegel@gmail.com> |
384 | +Date: Sat Jan 25 18:33:19 2014 +0300 |
385 | + |
386 | + Refresh desktop on style changes |
387 | + |
388 | + Xfdestkop's icon view doesn't update the icon labels when xfsettingsd |
389 | + starts up. To work around that, refresh the desktop on a style change |
390 | + event. Additionally gtk likes to send up to 10 style change events at |
391 | + once, so this also adds a 1 second delay to ensure it's the last change |
392 | + event that we respond to. |
393 | + |
394 | +commit 9628995ae4ae767591de3a31fb98ef233852617e |
395 | +Author: Ardjuna <Asyura.x@gmail.com> |
396 | +Date: Sun Jan 26 00:32:13 2014 +0100 |
397 | + |
398 | + I18n: Update translation id (99%). |
399 | + |
400 | + 215 translated messages, 1 untranslated message. |
401 | + |
402 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
403 | + |
404 | +commit 3aeedbb076b1315b56e43e798694425657569abe |
405 | +Author: Eric Koegel <eric.koegel@gmail.com> |
406 | +Date: Sat Jan 25 21:32:26 2014 +0300 |
407 | + |
408 | + Fix some more potential bugs |
409 | + |
410 | + An unchecked return value, unintended sign extensions, and a copy |
411 | + paste error. |
412 | + |
413 | +commit cad4ddfa7d735b62099c9716e99821536a02b006 |
414 | +Author: Ardjuna <Asyura.x@gmail.com> |
415 | +Date: Sat Jan 25 18:32:08 2014 +0100 |
416 | + |
417 | + I18n: Update translation id (80%). |
418 | + |
419 | + 173 translated messages, 43 untranslated messages. |
420 | + |
421 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
422 | + |
423 | +commit 78393c501d071ec05986d62b210b26e0170942ad |
424 | +Author: Eric Koegel <eric.koegel@gmail.com> |
425 | +Date: Sat Jan 25 08:32:29 2014 +0300 |
426 | + |
427 | + Fix some potential bugs |
428 | + |
429 | + Correct some of the issues found with coverity scan. Things like |
430 | + an unused pointer, variables that could potentially be used in an |
431 | + uninitialized state, a copy-paste error, and a couple spots where |
432 | + the return value wasn't checked. |
433 | + |
434 | +commit da61495218044db15bf95c4f2184ec969dc50c7a |
435 | +Author: Piotr Sokół <psokol@jabster.pl> |
436 | +Date: Tue Jan 21 18:32:03 2014 +0100 |
437 | + |
438 | + I18n: Update translation pl (100%). |
439 | + |
440 | + 216 translated messages. |
441 | + |
442 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
443 | + |
444 | +commit f85177a94e678b173e4ea5769f80feb7f9c28bd5 |
445 | +Author: 玉堂白鹤 <yjwork@qq.com> |
446 | +Date: Mon Jan 20 18:32:04 2014 +0100 |
447 | + |
448 | + I18n: Update translation zh_CN (99%). |
449 | + |
450 | + 214 translated messages, 2 untranslated messages. |
451 | + |
452 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
453 | + |
454 | +commit d8cb52be571084c26672c8e4ace7a8c6d506794a |
455 | +Author: Michal Várady <miko.vaji@gmail.com> |
456 | +Date: Sun Jan 19 00:31:57 2014 +0100 |
457 | + |
458 | + I18n: Update translation cs (100%). |
459 | + |
460 | + 216 translated messages. |
461 | + |
462 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
463 | + |
464 | +commit 5ecc3adc3e1d2ea012da1f2073af287f8dbca6be |
465 | +Author: holden87 <latinovic87@gmail.com> |
466 | +Date: Tue Jan 14 18:32:02 2014 +0100 |
467 | + |
468 | + I18n: Update translation sl (95%). |
469 | + |
470 | + 206 translated messages, 10 untranslated messages. |
471 | + |
472 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
473 | + |
474 | +commit fbdf5210b24919204bcfa0bdc62481441f7bc10d |
475 | +Author: holden87 <latinovic87@gmail.com> |
476 | +Date: Tue Jan 14 12:31:59 2014 +0100 |
477 | + |
478 | + I18n: Update translation sl (94%). |
479 | + |
480 | + 205 translated messages, 11 untranslated messages. |
481 | + |
482 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
483 | + |
484 | +commit 0ab5c4185fa9d9a97c330267ad668107147c1fff |
485 | +Author: Eric Koegel <eric.koegel@gmail.com> |
486 | +Date: Mon Jan 13 10:43:50 2014 +0300 |
487 | + |
488 | + Fix keyboard cursor movement in the icon view |
489 | + |
490 | +commit ae085d7a1b961870b70e0b22916d7cae67b992eb |
491 | +Author: Eric Koegel <eric.koegel@gmail.com> |
492 | +Date: Sun Jan 12 15:04:02 2014 +0300 |
493 | + |
494 | + Fix some runtime warnings |
495 | + |
496 | + This patch fixes it so that the file icon manager won't attempt to |
497 | + remove pending icons from the icon view as they won't be there yet. |
498 | + It also removes an icon migration function that shouldn't be needed |
499 | + anymore. |
500 | + |
501 | +commit 8e84a7f57a3d3c8dfe788d537e4b14ae16d22608 |
502 | +Author: Sérgio Marques <smarquespt@gmail.com> |
503 | +Date: Mon Jan 13 00:31:57 2014 +0100 |
504 | + |
505 | + I18n: Update translation pt (100%). |
506 | + |
507 | + 216 translated messages. |
508 | + |
509 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
510 | + |
511 | +commit 4c02f4b33de3b7e5c1b40f8778284fd1e29a7c0c |
512 | +Author: volkangezer <volkangezer@gmail.com> |
513 | +Date: Sat Jan 11 18:32:00 2014 +0100 |
514 | + |
515 | + I18n: Update translation tr (100%). |
516 | + |
517 | + 216 translated messages. |
518 | + |
519 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
520 | + |
521 | +commit cfe5a0ad88b84a23a4cd6d18a25635ec84cbaf68 |
522 | +Author: Eric Koegel <eric.koegel@gmail.com> |
523 | +Date: Wed Jan 8 20:36:16 2014 +0300 |
524 | + |
525 | + Ensure a quit signal causes xfdesktop to shutdown |
526 | + |
527 | +commit 3cbad61da8ed5ef919d3e1ce38a483134eca8044 |
528 | +Author: Eric Koegel <eric.koegel@gmail.com> |
529 | +Date: Mon Jan 6 16:01:50 2014 +0300 |
530 | + |
531 | + Fix icon labels in RTL languages (Bug 10604) |
532 | + |
533 | +commit be66a78f2a43de278411bd02bdde1cc0764bb03e |
534 | +Author: Anonymous <noreply@xfce.org> |
535 | +Date: Wed Jan 8 00:31:57 2014 +0100 |
536 | + |
537 | + I18n: Update translation de (86%). |
538 | + |
539 | + 186 translated messages, 30 untranslated messages. |
540 | + |
541 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
542 | + |
543 | +commit 873d6a15935ebfda980621e43954b62f24ec0d57 |
544 | +Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com> |
545 | +Date: Mon Jan 6 18:32:32 2014 +0100 |
546 | + |
547 | + I18n: Update translation kk (100%). |
548 | + |
549 | + 216 translated messages. |
550 | + |
551 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
552 | + |
553 | +commit c4782e358f100f33c665e67d47425f77c9655ec4 |
554 | +Author: Eric Koegel <eric.koegel@gmail.com> |
555 | +Date: Sun Jan 5 21:47:39 2014 +0300 |
556 | + |
557 | + Use get_folder_actions for clicks on the desktop itself |
558 | + |
559 | + Call thunarx_menu_provider_get_folder_actions when the menu is |
560 | + popped up and no icons are selected. This prevents showing some |
561 | + thunar actions that make little sense in that context. |
562 | + |
563 | +commit 1028f607551254cca5db4951e9e52d4bb4d09c6d |
564 | +Author: Anonymous <noreply@xfce.org> |
565 | +Date: Fri Jan 3 00:32:02 2014 +0100 |
566 | + |
567 | + I18n: Update translation de (85%). |
568 | + |
569 | + 184 translated messages, 32 untranslated messages. |
570 | + |
571 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
572 | + |
573 | +commit b13d47e52d3755f9e9c424339063370a8ca7234b |
574 | +Author: Eric Koegel <eric.koegel@gmail.com> |
575 | +Date: Sun Dec 29 22:39:07 2013 +0300 |
576 | + |
577 | + Only use thunarx_menu_provider_get_file_actions (Bug 10492) |
578 | + |
579 | + Using thunarx_menu_provider_get_file_actions on both folders and |
580 | + files allows all the options to display. Using both files_actions |
581 | + and folder_actions would cause some duplicate entires. This allows |
582 | + the thunar-archive-plugin to provide the 'create archive' menu |
583 | + option for folders on the desktop. |
584 | + |
585 | +commit ff207e4a68c3308083c3fc8dab48700672d9f061 |
586 | +Author: gem <eckert.georg@gmx.de> |
587 | +Date: Mon Dec 30 00:31:56 2013 +0100 |
588 | + |
589 | + I18n: Update translation de (80%). |
590 | + |
591 | + 173 translated messages, 43 untranslated messages. |
592 | + |
593 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
594 | + |
595 | +commit 5597db735478046d071eee5dfcf77aef7902363c |
596 | +Author: 玉堂白鹤 <yjwork@qq.com> |
597 | +Date: Sat Dec 28 06:31:49 2013 +0100 |
598 | + |
599 | + I18n: Update translation zh_CN (95%). |
600 | + |
601 | + 207 translated messages, 9 untranslated messages. |
602 | + |
603 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
604 | + |
605 | +commit 2c96348127cace82709055eefb074d0b106c38ec |
606 | +Author: Pablo Lezaeta <prflr88@gmail.com> |
607 | +Date: Fri Dec 27 18:32:05 2013 +0100 |
608 | + |
609 | + I18n: Update translation es (100%). |
610 | + |
611 | + 216 translated messages. |
612 | + |
613 | + Transifex (https://www.transifex.com/projects/p/xfce/). |
614 | + |
615 | +commit b275ed97f978c8fda037c185efbdd01d56738b48 |
616 | +Author: Eric Koegel <eric.koegel@gmail.com> |
617 | +Date: Sun Dec 22 15:28:31 2013 +0300 |
618 | + |
619 | + Post release tag bump. |
620 | + |
621 | +commit 9e7c92a9701efa4c262c26bb48b427651e47c9c1 |
622 | +Author: Eric Koegel <eric.koegel@gmail.com> |
623 | +Date: Sun Dec 22 15:22:27 2013 +0300 |
624 | + |
625 | + Updates for release. |
626 | + |
627 | commit a893ba38b656d6a76ff2c93050d19526419641a2 |
628 | Author: Yarema aka Knedlyk <yupadmin@gmail.com> |
629 | Date: Sun Dec 22 00:31:57 2013 +0100 |
630 | |
631 | === modified file 'INSTALL' |
632 | --- INSTALL 2014-01-14 11:47:53 +0000 |
633 | +++ INSTALL 2014-02-20 05:04:01 +0000 |
634 | @@ -12,8 +12,8 @@ |
635 | Basic Installation |
636 | ================== |
637 | |
638 | - Briefly, the shell commands `./configure; make; make install' should |
639 | -configure, build, and install this package. The following |
640 | + Briefly, the shell command `./configure && make && make install' |
641 | +should configure, build, and install this package. The following |
642 | more-detailed instructions are generic; see the `README' file for |
643 | instructions specific to this package. Some packages provide this |
644 | `INSTALL' file but do not implement all of the features documented |
645 | |
646 | === modified file 'Makefile.in' |
647 | --- Makefile.in 2014-01-14 11:47:53 +0000 |
648 | +++ Makefile.in 2014-02-20 05:04:01 +0000 |
649 | @@ -1,4 +1,4 @@ |
650 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
651 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
652 | # @configure_input@ |
653 | |
654 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
655 | @@ -508,8 +508,8 @@ |
656 | $(am__aclocal_m4_deps): |
657 | |
658 | config.h: stamp-h1 |
659 | - @if test ! -f $@; then rm -f stamp-h1; else :; fi |
660 | - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
661 | + @test -f $@ || rm -f stamp-h1 |
662 | + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
663 | |
664 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
665 | @rm -f stamp-h1 |
666 | @@ -741,10 +741,16 @@ |
667 | $(am__post_remove_distdir) |
668 | |
669 | dist-tarZ: distdir |
670 | + @echo WARNING: "Support for shar distribution archives is" \ |
671 | + "deprecated." >&2 |
672 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
673 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
674 | $(am__post_remove_distdir) |
675 | |
676 | dist-shar: distdir |
677 | + @echo WARNING: "Support for distribution archives compressed with" \ |
678 | + "legacy program 'compress' is deprecated." >&2 |
679 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
680 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
681 | $(am__post_remove_distdir) |
682 | |
683 | @@ -786,9 +792,10 @@ |
684 | && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ |
685 | && am__cwd=`pwd` \ |
686 | && $(am__cd) $(distdir)/_build \ |
687 | - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ |
688 | + && ../configure \ |
689 | $(AM_DISTCHECK_CONFIGURE_FLAGS) \ |
690 | $(DISTCHECK_CONFIGURE_FLAGS) \ |
691 | + --srcdir=.. --prefix="$$dc_install_base" \ |
692 | && $(MAKE) $(AM_MAKEFLAGS) \ |
693 | && $(MAKE) $(AM_MAKEFLAGS) dvi \ |
694 | && $(MAKE) $(AM_MAKEFLAGS) check \ |
695 | |
696 | === modified file 'NEWS' |
697 | --- NEWS 2014-01-14 11:47:53 +0000 |
698 | +++ NEWS 2014-02-20 05:04:01 +0000 |
699 | @@ -1,3 +1,37 @@ |
700 | +4.11.3 |
701 | +====== |
702 | +[Please note that this is a development release.] |
703 | + |
704 | +Fourth development release of xfdesktop targeting for Xfce 4.12. |
705 | +Please report all problems at bugzilla.xfce.org. |
706 | + |
707 | +* Multi-monitor fixes: |
708 | + - Release pixmap on screen changes |
709 | + - Always redraw backdrop on display change. |
710 | + Both patches were added so that transitions from one monitor |
711 | + to another cause the backdrop to properly display. |
712 | + |
713 | +* Miscellaneous fixes: |
714 | +- Update default icon size, spacing, and text proportion. |
715 | +- Scale up small image previews in xfdesktop-settings (Bug 10690) |
716 | +- Fix strict aliasing issue |
717 | +- Check for thumbnails in the new location |
718 | +- Fix issues with icon resizing |
719 | +- Refresh desktop on style changes |
720 | +- Fix potential bugs found with static code analysis tools |
721 | +- Fix keyboard cursor movement in the icon view |
722 | +- Fix some runtime warnings |
723 | +- Ensure a quit signal causes xfdesktop to shutdown |
724 | +- Fix icon labels in RTL languages (Bug 10604) |
725 | +- Use get_folder_actions for clicks on the desktop itself |
726 | +- Only use thunarx_menu_provider_get_file_actions (Bug 10492) |
727 | + |
728 | +* Translation updates: |
729 | + Czech (cs), English (Australia) (en_AU), German (de), |
730 | + Icelandic (is), Indonesian (id), Kazakh (kk), Malay (ms), |
731 | + Polish (pl), Portuguese (pt), Russian (ru), Slovenian (sl), |
732 | + Spanish (Castilian) (es), Swedish (sv), Turkish (tr), |
733 | + |
734 | 4.11.2 |
735 | ====== |
736 | [Please note that this is a development release.] |
737 | |
738 | === modified file 'README' |
739 | --- README 2014-01-14 11:47:53 +0000 |
740 | +++ README 2014-02-20 05:04:01 +0000 |
741 | @@ -52,9 +52,9 @@ |
742 | XfdesktopIconView::selected-shadow-y-offset = 2 |
743 | XfdesktopIconView::selected-shadow-color = "#00ff00" |
744 | |
745 | - XfdesktopIconView::cell-spacing = 6 |
746 | + XfdesktopIconView::cell-spacing = 2 |
747 | XfdesktopIconView::cell-padding = 6 |
748 | - XfdesktopIconView::cell-text-width-proportion = 2.5 |
749 | + XfdesktopIconView::cell-text-width-proportion = 1.9 |
750 | |
751 | base[NORMAL] = "#00ff00" |
752 | base[SELECTED] = "#5050ff" |
753 | |
754 | === modified file 'aclocal.m4' |
755 | --- aclocal.m4 2014-01-14 11:47:53 +0000 |
756 | +++ aclocal.m4 2014-02-20 05:04:01 +0000 |
757 | @@ -1,4 +1,4 @@ |
758 | -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- |
759 | +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- |
760 | |
761 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
762 | |
763 | @@ -590,31 +590,6 @@ |
764 | # Substitute ALL_LINGUAS so we can use it in po/Makefile |
765 | AC_SUBST(ALL_LINGUAS) |
766 | |
767 | -# Set DATADIRNAME correctly if it is not set yet |
768 | -# (copied from glib-gettext.m4) |
769 | -if test -z "$DATADIRNAME"; then |
770 | - AC_LINK_IFELSE( |
771 | - [AC_LANG_PROGRAM([[]], |
772 | - [[extern int _nl_msg_cat_cntr; |
773 | - return _nl_msg_cat_cntr]])], |
774 | - [DATADIRNAME=share], |
775 | - [case $host in |
776 | - *-*-solaris*) |
777 | - dnl On Solaris, if bind_textdomain_codeset is in libc, |
778 | - dnl GNU format message catalog is always supported, |
779 | - dnl since both are added to the libc all together. |
780 | - dnl Hence, we'd like to go with DATADIRNAME=share |
781 | - dnl in this case. |
782 | - AC_CHECK_FUNC(bind_textdomain_codeset, |
783 | - [DATADIRNAME=share], [DATADIRNAME=lib]) |
784 | - ;; |
785 | - *) |
786 | - [DATADIRNAME=lib] |
787 | - ;; |
788 | - esac]) |
789 | -fi |
790 | -AC_SUBST(DATADIRNAME) |
791 | - |
792 | IT_PO_SUBDIR([po]) |
793 | |
794 | ]) |
795 | @@ -1989,14 +1964,7 @@ |
796 | LD="${LD-ld} -m elf_i386_fbsd" |
797 | ;; |
798 | x86_64-*linux*) |
799 | - case `/usr/bin/file conftest.o` in |
800 | - *x86-64*) |
801 | - LD="${LD-ld} -m elf32_x86_64" |
802 | - ;; |
803 | - *) |
804 | - LD="${LD-ld} -m elf_i386" |
805 | - ;; |
806 | - esac |
807 | + LD="${LD-ld} -m elf_i386" |
808 | ;; |
809 | ppc64-*linux*|powerpc64-*linux*) |
810 | LD="${LD-ld} -m elf32ppclinux" |
811 | @@ -2360,8 +2328,7 @@ |
812 | ;; |
813 | *) |
814 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
815 | - if test -n "$lt_cv_sys_max_cmd_len" && \ |
816 | - test undefined != "$lt_cv_sys_max_cmd_len"; then |
817 | + if test -n "$lt_cv_sys_max_cmd_len"; then |
818 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
819 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
820 | else |
821 | @@ -3152,7 +3119,14 @@ |
822 | *) objformat=elf ;; |
823 | esac |
824 | fi |
825 | - version_type=freebsd-$objformat |
826 | + # Handle Gentoo/FreeBSD as it was Linux |
827 | + case $host_vendor in |
828 | + gentoo) |
829 | + version_type=linux ;; |
830 | + *) |
831 | + version_type=freebsd-$objformat ;; |
832 | + esac |
833 | + |
834 | case $version_type in |
835 | freebsd-elf*) |
836 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
837 | @@ -3163,6 +3137,12 @@ |
838 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
839 | need_version=yes |
840 | ;; |
841 | + linux) |
842 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
843 | + soname_spec='${libname}${release}${shared_ext}$major' |
844 | + need_lib_prefix=no |
845 | + need_version=no |
846 | + ;; |
847 | esac |
848 | shlibpath_var=LD_LIBRARY_PATH |
849 | case $host_os in |
850 | @@ -3185,6 +3165,17 @@ |
851 | esac |
852 | ;; |
853 | |
854 | +gnu*) |
855 | + version_type=linux # correct to gnu/linux during the next big refactor |
856 | + need_lib_prefix=no |
857 | + need_version=no |
858 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
859 | + soname_spec='${libname}${release}${shared_ext}$major' |
860 | + shlibpath_var=LD_LIBRARY_PATH |
861 | + shlibpath_overrides_runpath=no |
862 | + hardcode_into_libs=yes |
863 | + ;; |
864 | + |
865 | haiku*) |
866 | version_type=linux # correct to gnu/linux during the next big refactor |
867 | need_lib_prefix=no |
868 | @@ -3301,7 +3292,7 @@ |
869 | ;; |
870 | |
871 | # This must be glibc/ELF. |
872 | -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
873 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
874 | version_type=linux # correct to gnu/linux during the next big refactor |
875 | need_lib_prefix=no |
876 | need_version=no |
877 | @@ -3346,18 +3337,6 @@ |
878 | dynamic_linker='GNU/Linux ld.so' |
879 | ;; |
880 | |
881 | -netbsdelf*-gnu) |
882 | - version_type=linux |
883 | - need_lib_prefix=no |
884 | - need_version=no |
885 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
886 | - soname_spec='${libname}${release}${shared_ext}$major' |
887 | - shlibpath_var=LD_LIBRARY_PATH |
888 | - shlibpath_overrides_runpath=no |
889 | - hardcode_into_libs=yes |
890 | - dynamic_linker='NetBSD ld.elf_so' |
891 | - ;; |
892 | - |
893 | netbsd*) |
894 | version_type=sunos |
895 | need_lib_prefix=no |
896 | @@ -3917,6 +3896,10 @@ |
897 | fi |
898 | ;; |
899 | |
900 | +gnu*) |
901 | + lt_cv_deplibs_check_method=pass_all |
902 | + ;; |
903 | + |
904 | haiku*) |
905 | lt_cv_deplibs_check_method=pass_all |
906 | ;; |
907 | @@ -3955,11 +3938,11 @@ |
908 | ;; |
909 | |
910 | # This must be glibc/ELF. |
911 | -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
912 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
913 | lt_cv_deplibs_check_method=pass_all |
914 | ;; |
915 | |
916 | -netbsd* | netbsdelf*-gnu) |
917 | +netbsd*) |
918 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
919 | lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' |
920 | else |
921 | @@ -4707,7 +4690,7 @@ |
922 | ;; |
923 | esac |
924 | ;; |
925 | - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
926 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
927 | case $cc_basename in |
928 | KCC*) |
929 | # KAI C++ Compiler |
930 | @@ -4771,7 +4754,7 @@ |
931 | ;; |
932 | esac |
933 | ;; |
934 | - netbsd* | netbsdelf*-gnu) |
935 | + netbsd*) |
936 | ;; |
937 | *qnx* | *nto*) |
938 | # QNX uses GNU C++, but need to define -shared option too, otherwise |
939 | @@ -5006,7 +4989,7 @@ |
940 | _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' |
941 | ;; |
942 | |
943 | - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
944 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
945 | case $cc_basename in |
946 | # old Intel for x86_64 which still supported -KPIC. |
947 | ecc*) |
948 | @@ -5248,9 +5231,6 @@ |
949 | ;; |
950 | esac |
951 | ;; |
952 | - linux* | k*bsd*-gnu | gnu*) |
953 | - _LT_TAGVAR(link_all_deplibs, $1)=no |
954 | - ;; |
955 | *) |
956 | _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' |
957 | ;; |
958 | @@ -5313,9 +5293,6 @@ |
959 | openbsd*) |
960 | with_gnu_ld=no |
961 | ;; |
962 | - linux* | k*bsd*-gnu | gnu*) |
963 | - _LT_TAGVAR(link_all_deplibs, $1)=no |
964 | - ;; |
965 | esac |
966 | |
967 | _LT_TAGVAR(ld_shlibs, $1)=yes |
968 | @@ -5537,7 +5514,7 @@ |
969 | fi |
970 | ;; |
971 | |
972 | - netbsd* | netbsdelf*-gnu) |
973 | + netbsd*) |
974 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
975 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
976 | wlarc= |
977 | @@ -5714,7 +5691,6 @@ |
978 | if test "$aix_use_runtimelinking" = yes; then |
979 | shared_flag="$shared_flag "'${wl}-G' |
980 | fi |
981 | - _LT_TAGVAR(link_all_deplibs, $1)=no |
982 | else |
983 | # not using gcc |
984 | if test "$host_cpu" = ia64; then |
985 | @@ -6019,7 +5995,7 @@ |
986 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
987 | ;; |
988 | |
989 | - netbsd* | netbsdelf*-gnu) |
990 | + netbsd*) |
991 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
992 | _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
993 | else |
994 | @@ -6895,6 +6871,9 @@ |
995 | _LT_TAGVAR(ld_shlibs, $1)=yes |
996 | ;; |
997 | |
998 | + gnu*) |
999 | + ;; |
1000 | + |
1001 | haiku*) |
1002 | _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' |
1003 | _LT_TAGVAR(link_all_deplibs, $1)=yes |
1004 | @@ -7056,7 +7035,7 @@ |
1005 | _LT_TAGVAR(inherit_rpath, $1)=yes |
1006 | ;; |
1007 | |
1008 | - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
1009 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
1010 | case $cc_basename in |
1011 | KCC*) |
1012 | # Kuck and Associates, Inc. (KAI) C++ Compiler |
1013 | @@ -9268,7 +9247,7 @@ |
1014 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
1015 | |
1016 | # nls.m4 serial 5 (gettext-0.18) |
1017 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, |
1018 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
1019 | dnl Inc. |
1020 | dnl This file is free software; the Free Software Foundation |
1021 | dnl gives unlimited permission to copy and/or distribute it, |
1022 | @@ -9460,6 +9439,61 @@ |
1023 | fi[]dnl |
1024 | ])# PKG_CHECK_MODULES |
1025 | |
1026 | + |
1027 | +# PKG_INSTALLDIR(DIRECTORY) |
1028 | +# ------------------------- |
1029 | +# Substitutes the variable pkgconfigdir as the location where a module |
1030 | +# should install pkg-config .pc files. By default the directory is |
1031 | +# $libdir/pkgconfig, but the default can be changed by passing |
1032 | +# DIRECTORY. The user can override through the --with-pkgconfigdir |
1033 | +# parameter. |
1034 | +AC_DEFUN([PKG_INSTALLDIR], |
1035 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) |
1036 | +m4_pushdef([pkg_description], |
1037 | + [pkg-config installation directory @<:@]pkg_default[@:>@]) |
1038 | +AC_ARG_WITH([pkgconfigdir], |
1039 | + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, |
1040 | + [with_pkgconfigdir=]pkg_default) |
1041 | +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) |
1042 | +m4_popdef([pkg_default]) |
1043 | +m4_popdef([pkg_description]) |
1044 | +]) dnl PKG_INSTALLDIR |
1045 | + |
1046 | + |
1047 | +# PKG_NOARCH_INSTALLDIR(DIRECTORY) |
1048 | +# ------------------------- |
1049 | +# Substitutes the variable noarch_pkgconfigdir as the location where a |
1050 | +# module should install arch-independent pkg-config .pc files. By |
1051 | +# default the directory is $datadir/pkgconfig, but the default can be |
1052 | +# changed by passing DIRECTORY. The user can override through the |
1053 | +# --with-noarch-pkgconfigdir parameter. |
1054 | +AC_DEFUN([PKG_NOARCH_INSTALLDIR], |
1055 | +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) |
1056 | +m4_pushdef([pkg_description], |
1057 | + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) |
1058 | +AC_ARG_WITH([noarch-pkgconfigdir], |
1059 | + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, |
1060 | + [with_noarch_pkgconfigdir=]pkg_default) |
1061 | +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) |
1062 | +m4_popdef([pkg_default]) |
1063 | +m4_popdef([pkg_description]) |
1064 | +]) dnl PKG_NOARCH_INSTALLDIR |
1065 | + |
1066 | + |
1067 | +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, |
1068 | +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) |
1069 | +# ------------------------------------------- |
1070 | +# Retrieves the value of the pkg-config variable for the given module. |
1071 | +AC_DEFUN([PKG_CHECK_VAR], |
1072 | +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl |
1073 | +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl |
1074 | + |
1075 | +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) |
1076 | +AS_VAR_COPY([$1], [pkg_cv_][$1]) |
1077 | + |
1078 | +AS_VAR_IF([$1], [""], [$5], [$4])dnl |
1079 | +])# PKG_CHECK_VAR |
1080 | + |
1081 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. |
1082 | # |
1083 | # This file is free software; the Free Software Foundation |
1084 | @@ -9472,10 +9506,10 @@ |
1085 | # generated from the m4 files accompanying Automake X.Y. |
1086 | # (This private macro should not be called outside this file.) |
1087 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
1088 | -[am__api_version='1.13' |
1089 | +[am__api_version='1.14' |
1090 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
1091 | dnl require some minimum version. Point them to the right macro. |
1092 | -m4_if([$1], [1.13.3], [], |
1093 | +m4_if([$1], [1.14.1], [], |
1094 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
1095 | ]) |
1096 | |
1097 | @@ -9491,7 +9525,7 @@ |
1098 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
1099 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
1100 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
1101 | -[AM_AUTOMAKE_VERSION([1.13.3])dnl |
1102 | +[AM_AUTOMAKE_VERSION([1.14.1])dnl |
1103 | m4_ifndef([AC_AUTOCONF_VERSION], |
1104 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
1105 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1106 | @@ -9858,6 +9892,12 @@ |
1107 | # This macro actually does too much. Some checks are only needed if |
1108 | # your package does certain things. But this isn't really a big deal. |
1109 | |
1110 | +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
1111 | +m4_define([AC_PROG_CC], |
1112 | +m4_defn([AC_PROG_CC]) |
1113 | +[_AM_PROG_CC_C_O |
1114 | +]) |
1115 | + |
1116 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
1117 | # AM_INIT_AUTOMAKE([OPTIONS]) |
1118 | # ----------------------------------------------- |
1119 | @@ -9966,7 +10006,48 @@ |
1120 | AC_CONFIG_COMMANDS_PRE(dnl |
1121 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
1122 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
1123 | -]) |
1124 | + |
1125 | +# POSIX will say in a future version that running "rm -f" with no argument |
1126 | +# is OK; and we want to be able to make that assumption in our Makefile |
1127 | +# recipes. So use an aggressive probe to check that the usage we want is |
1128 | +# actually supported "in the wild" to an acceptable degree. |
1129 | +# See automake bug#10828. |
1130 | +# To make any issue more visible, cause the running configure to be aborted |
1131 | +# by default if the 'rm' program in use doesn't match our expectations; the |
1132 | +# user can still override this though. |
1133 | +if rm -f && rm -fr && rm -rf; then : OK; else |
1134 | + cat >&2 <<'END' |
1135 | +Oops! |
1136 | + |
1137 | +Your 'rm' program seems unable to run without file operands specified |
1138 | +on the command line, even when the '-f' option is present. This is contrary |
1139 | +to the behaviour of most rm programs out there, and not conforming with |
1140 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
1141 | + |
1142 | +Please tell bug-automake@gnu.org about your system, including the value |
1143 | +of your $PATH and any error possibly output before this message. This |
1144 | +can help us improve future automake versions. |
1145 | + |
1146 | +END |
1147 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
1148 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
1149 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
1150 | + echo >&2 |
1151 | + else |
1152 | + cat >&2 <<'END' |
1153 | +Aborting the configuration process, to ensure you take notice of the issue. |
1154 | + |
1155 | +You can download and install GNU coreutils to get an 'rm' implementation |
1156 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
1157 | + |
1158 | +If you want to complete the configuration process using your problematic |
1159 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
1160 | +to "yes", and re-run configure. |
1161 | + |
1162 | +END |
1163 | + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
1164 | + fi |
1165 | +fi]) |
1166 | |
1167 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
1168 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
1169 | @@ -9974,7 +10055,6 @@ |
1170 | m4_define([_AC_COMPILER_EXEEXT], |
1171 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
1172 | |
1173 | - |
1174 | # When config.status generates a header, we must update the stamp-h file. |
1175 | # This file resides in the same directory as the config header |
1176 | # that is generated. The stamp files are numbered to have different names. |
1177 | @@ -10122,38 +10202,6 @@ |
1178 | rm -f confinc confmf |
1179 | ]) |
1180 | |
1181 | -# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1182 | -# |
1183 | -# This file is free software; the Free Software Foundation |
1184 | -# gives unlimited permission to copy and/or distribute it, |
1185 | -# with or without modifications, as long as this notice is preserved. |
1186 | - |
1187 | -# AM_PROG_CC_C_O |
1188 | -# -------------- |
1189 | -# Like AC_PROG_CC_C_O, but changed for automake. |
1190 | -AC_DEFUN([AM_PROG_CC_C_O], |
1191 | -[AC_REQUIRE([AC_PROG_CC_C_O])dnl |
1192 | -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1193 | -AC_REQUIRE_AUX_FILE([compile])dnl |
1194 | -# FIXME: we rely on the cache variable name because |
1195 | -# there is no other way. |
1196 | -set dummy $CC |
1197 | -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` |
1198 | -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
1199 | -if test "$am_t" != yes; then |
1200 | - # Losing compiler, so override with the script. |
1201 | - # FIXME: It is wrong to rewrite CC. |
1202 | - # But if we don't then we get into trouble of one sort or another. |
1203 | - # A longer-term fix would be to have automake use am__CC in this case, |
1204 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1205 | - CC="$am_aux_dir/compile $CC" |
1206 | -fi |
1207 | -dnl Make sure AC_PROG_CC is never called again, or it will override our |
1208 | -dnl setting of CC. |
1209 | -m4_define([AC_PROG_CC], |
1210 | - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) |
1211 | -]) |
1212 | - |
1213 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
1214 | |
1215 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. |
1216 | @@ -10224,6 +10272,53 @@ |
1217 | AC_DEFUN([_AM_IF_OPTION], |
1218 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
1219 | |
1220 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1221 | +# |
1222 | +# This file is free software; the Free Software Foundation |
1223 | +# gives unlimited permission to copy and/or distribute it, |
1224 | +# with or without modifications, as long as this notice is preserved. |
1225 | + |
1226 | +# _AM_PROG_CC_C_O |
1227 | +# --------------- |
1228 | +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
1229 | +# to automatically call this. |
1230 | +AC_DEFUN([_AM_PROG_CC_C_O], |
1231 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1232 | +AC_REQUIRE_AUX_FILE([compile])dnl |
1233 | +AC_LANG_PUSH([C])dnl |
1234 | +AC_CACHE_CHECK( |
1235 | + [whether $CC understands -c and -o together], |
1236 | + [am_cv_prog_cc_c_o], |
1237 | + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
1238 | + # Make sure it works both with $CC and with simple cc. |
1239 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
1240 | + # compilers refuse to overwrite an existing .o file with -o, |
1241 | + # though they will create one. |
1242 | + am_cv_prog_cc_c_o=yes |
1243 | + for am_i in 1 2; do |
1244 | + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
1245 | + && test -f conftest2.$ac_objext; then |
1246 | + : OK |
1247 | + else |
1248 | + am_cv_prog_cc_c_o=no |
1249 | + break |
1250 | + fi |
1251 | + done |
1252 | + rm -f core conftest* |
1253 | + unset am_i]) |
1254 | +if test "$am_cv_prog_cc_c_o" != yes; then |
1255 | + # Losing compiler, so override with the script. |
1256 | + # FIXME: It is wrong to rewrite CC. |
1257 | + # But if we don't then we get into trouble of one sort or another. |
1258 | + # A longer-term fix would be to have automake use am__CC in this case, |
1259 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1260 | + CC="$am_aux_dir/compile $CC" |
1261 | +fi |
1262 | +AC_LANG_POP([C])]) |
1263 | + |
1264 | +# For backward compatibility. |
1265 | +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
1266 | + |
1267 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1268 | # |
1269 | # This file is free software; the Free Software Foundation |
1270 | |
1271 | === modified file 'backgrounds/Makefile.in' |
1272 | --- backgrounds/Makefile.in 2014-01-14 11:47:53 +0000 |
1273 | +++ backgrounds/Makefile.in 2014-02-20 05:04:01 +0000 |
1274 | @@ -1,4 +1,4 @@ |
1275 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
1276 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
1277 | # @configure_input@ |
1278 | |
1279 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
1280 | |
1281 | === modified file 'common/Makefile.in' |
1282 | --- common/Makefile.in 2014-01-14 11:47:53 +0000 |
1283 | +++ common/Makefile.in 2014-02-20 05:04:01 +0000 |
1284 | @@ -1,4 +1,4 @@ |
1285 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
1286 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
1287 | # @configure_input@ |
1288 | |
1289 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
1290 | @@ -478,14 +478,14 @@ |
1291 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
1292 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
1293 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1294 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< |
1295 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
1296 | |
1297 | .c.obj: |
1298 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
1299 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
1300 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
1301 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
1302 | -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` |
1303 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
1304 | |
1305 | .c.lo: |
1306 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
1307 | |
1308 | === modified file 'common/xfdesktop-common.h' |
1309 | --- common/xfdesktop-common.h 2014-01-14 11:47:53 +0000 |
1310 | +++ common/xfdesktop-common.h 2014-02-20 05:04:01 +0000 |
1311 | @@ -35,7 +35,7 @@ |
1312 | #define XFDESKTOP_CHANNEL "xfce4-desktop" |
1313 | #define DEFAULT_BACKDROP DATADIR "/backgrounds/xfce/xfce-blue.jpg" |
1314 | #define DEFAULT_ICON_FONT_SIZE 12 |
1315 | -#define DEFAULT_ICON_SIZE 32 |
1316 | +#define DEFAULT_ICON_SIZE 48 |
1317 | #define ITHEME_FLAGS (GTK_ICON_LOOKUP_USE_BUILTIN \ |
1318 | | GTK_ICON_LOOKUP_GENERIC_FALLBACK) |
1319 | |
1320 | |
1321 | === modified file 'common/xfdesktop-thumbnailer.c' |
1322 | --- common/xfdesktop-thumbnailer.c 2014-01-14 11:47:53 +0000 |
1323 | +++ common/xfdesktop-thumbnailer.c 2014-02-20 05:04:01 +0000 |
1324 | @@ -216,13 +216,13 @@ |
1325 | { |
1326 | XfdesktopThumbnailer *thumbnailer = XFDESKTOP_THUMBNAILER(object); |
1327 | |
1328 | - if(thumbnailer->priv->proxy) |
1329 | - g_object_unref(thumbnailer->priv->proxy); |
1330 | - |
1331 | - if(thumbnailer->priv->supported_mimetypes) |
1332 | - g_free(thumbnailer->priv->supported_mimetypes); |
1333 | - |
1334 | if(thumbnailer->priv) { |
1335 | + if(thumbnailer->priv->proxy) |
1336 | + g_object_unref(thumbnailer->priv->proxy); |
1337 | + |
1338 | + if(thumbnailer->priv->supported_mimetypes) |
1339 | + g_free(thumbnailer->priv->supported_mimetypes); |
1340 | + |
1341 | g_free(thumbnailer->priv); |
1342 | thumbnailer->priv = NULL; |
1343 | } |
1344 | @@ -531,7 +531,11 @@ |
1345 | |
1346 | if(strcmp (uri[x], f_uri) == 0) { |
1347 | /* The thumbnail is in the format/location |
1348 | + * $XDG_CACHE_HOME/thumbnails/(nromal|large)/MD5_Hash_Of_URI.png |
1349 | + * for version 0.8.0 if XDG_CACHE_HOME is defined, otherwise |
1350 | * /homedir/.thumbnails/(normal|large)/MD5_Hash_Of_URI.png |
1351 | + * will be used, which is also always used for versions prior |
1352 | + * to 0.7.0. |
1353 | */ |
1354 | f_uri_checksum = g_compute_checksum_for_string(G_CHECKSUM_MD5, |
1355 | f_uri, strlen (f_uri)); |
1356 | @@ -543,10 +547,20 @@ |
1357 | |
1358 | filename = g_strconcat(f_uri_checksum, ".png", NULL); |
1359 | |
1360 | - thumbnail_location = g_build_path("/", g_get_home_dir(), |
1361 | - ".thumbnails", thumbnail_flavor, |
1362 | + /* build and check if the thumbnail is in the new location */ |
1363 | + thumbnail_location = g_build_path("/", g_get_user_cache_dir(), |
1364 | + "thumbnails", thumbnail_flavor, |
1365 | filename, NULL); |
1366 | |
1367 | + if(!g_file_test(thumbnail_location, G_FILE_TEST_EXISTS)) { |
1368 | + /* Fallback to old version */ |
1369 | + g_free(thumbnail_location); |
1370 | + |
1371 | + thumbnail_location = g_build_path("/", g_get_home_dir(), |
1372 | + ".thumbnails", thumbnail_flavor, |
1373 | + filename, NULL); |
1374 | + } |
1375 | + |
1376 | DBG("thumbnail-ready src: %s thumbnail: %s", |
1377 | (char*)iter->data, |
1378 | thumbnail_location); |
1379 | |
1380 | === modified file 'config.guess' |
1381 | --- config.guess 2014-01-14 11:47:53 +0000 |
1382 | +++ config.guess 2014-02-20 05:04:01 +0000 |
1383 | @@ -1,8 +1,8 @@ |
1384 | #! /bin/sh |
1385 | # Attempt to guess a canonical system name. |
1386 | -# Copyright 1992-2013 Free Software Foundation, Inc. |
1387 | +# Copyright 1992-2014 Free Software Foundation, Inc. |
1388 | |
1389 | -timestamp='2013-06-10' |
1390 | +timestamp='2014-02-12' |
1391 | |
1392 | # This file is free software; you can redistribute it and/or modify it |
1393 | # under the terms of the GNU General Public License as published by |
1394 | @@ -50,7 +50,7 @@ |
1395 | GNU config.guess ($timestamp) |
1396 | |
1397 | Originally written by Per Bothner. |
1398 | -Copyright 1992-2013 Free Software Foundation, Inc. |
1399 | +Copyright 1992-2014 Free Software Foundation, Inc. |
1400 | |
1401 | This is free software; see the source for copying conditions. There is NO |
1402 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1403 | @@ -149,7 +149,7 @@ |
1404 | LIBC=gnu |
1405 | #endif |
1406 | EOF |
1407 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
1408 | + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` |
1409 | ;; |
1410 | esac |
1411 | |
1412 | @@ -1020,7 +1020,18 @@ |
1413 | echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
1414 | exit ;; |
1415 | x86_64:Linux:*:*) |
1416 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1417 | + eval $set_cc_for_build |
1418 | + X86_64_ABI= |
1419 | + # If there is a compiler, see if it is configured for 32-bit objects. |
1420 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1421 | + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ |
1422 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1423 | + grep IS_X32 >/dev/null |
1424 | + then |
1425 | + X86_64_ABI=x32 |
1426 | + fi |
1427 | + fi |
1428 | + echo x86_64-unknown-linux-gnu${X86_64_ABI} |
1429 | exit ;; |
1430 | xtensa*:Linux:*:*) |
1431 | echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1432 | @@ -1260,16 +1271,26 @@ |
1433 | if test "$UNAME_PROCESSOR" = unknown ; then |
1434 | UNAME_PROCESSOR=powerpc |
1435 | fi |
1436 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1437 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1438 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1439 | - grep IS_64BIT_ARCH >/dev/null |
1440 | - then |
1441 | - case $UNAME_PROCESSOR in |
1442 | - i386) UNAME_PROCESSOR=x86_64 ;; |
1443 | - powerpc) UNAME_PROCESSOR=powerpc64 ;; |
1444 | - esac |
1445 | + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then |
1446 | + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1447 | + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1448 | + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1449 | + grep IS_64BIT_ARCH >/dev/null |
1450 | + then |
1451 | + case $UNAME_PROCESSOR in |
1452 | + i386) UNAME_PROCESSOR=x86_64 ;; |
1453 | + powerpc) UNAME_PROCESSOR=powerpc64 ;; |
1454 | + esac |
1455 | + fi |
1456 | fi |
1457 | + elif test "$UNAME_PROCESSOR" = i386 ; then |
1458 | + # Avoid executing cc on OS X 10.9, as it ships with a stub |
1459 | + # that puts up a graphical alert prompting to install |
1460 | + # developer tools. Any system running Mac OS X 10.7 or |
1461 | + # later (Darwin 11 and later) is required to have a 64-bit |
1462 | + # processor. This is not true of the ARM version of Darwin |
1463 | + # that Apple uses in portable devices. |
1464 | + UNAME_PROCESSOR=x86_64 |
1465 | fi |
1466 | echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
1467 | exit ;; |
1468 | @@ -1361,154 +1382,6 @@ |
1469 | exit ;; |
1470 | esac |
1471 | |
1472 | -eval $set_cc_for_build |
1473 | -cat >$dummy.c <<EOF |
1474 | -#ifdef _SEQUENT_ |
1475 | -# include <sys/types.h> |
1476 | -# include <sys/utsname.h> |
1477 | -#endif |
1478 | -main () |
1479 | -{ |
1480 | -#if defined (sony) |
1481 | -#if defined (MIPSEB) |
1482 | - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
1483 | - I don't know.... */ |
1484 | - printf ("mips-sony-bsd\n"); exit (0); |
1485 | -#else |
1486 | -#include <sys/param.h> |
1487 | - printf ("m68k-sony-newsos%s\n", |
1488 | -#ifdef NEWSOS4 |
1489 | - "4" |
1490 | -#else |
1491 | - "" |
1492 | -#endif |
1493 | - ); exit (0); |
1494 | -#endif |
1495 | -#endif |
1496 | - |
1497 | -#if defined (__arm) && defined (__acorn) && defined (__unix) |
1498 | - printf ("arm-acorn-riscix\n"); exit (0); |
1499 | -#endif |
1500 | - |
1501 | -#if defined (hp300) && !defined (hpux) |
1502 | - printf ("m68k-hp-bsd\n"); exit (0); |
1503 | -#endif |
1504 | - |
1505 | -#if defined (NeXT) |
1506 | -#if !defined (__ARCHITECTURE__) |
1507 | -#define __ARCHITECTURE__ "m68k" |
1508 | -#endif |
1509 | - int version; |
1510 | - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
1511 | - if (version < 4) |
1512 | - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); |
1513 | - else |
1514 | - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); |
1515 | - exit (0); |
1516 | -#endif |
1517 | - |
1518 | -#if defined (MULTIMAX) || defined (n16) |
1519 | -#if defined (UMAXV) |
1520 | - printf ("ns32k-encore-sysv\n"); exit (0); |
1521 | -#else |
1522 | -#if defined (CMU) |
1523 | - printf ("ns32k-encore-mach\n"); exit (0); |
1524 | -#else |
1525 | - printf ("ns32k-encore-bsd\n"); exit (0); |
1526 | -#endif |
1527 | -#endif |
1528 | -#endif |
1529 | - |
1530 | -#if defined (__386BSD__) |
1531 | - printf ("i386-pc-bsd\n"); exit (0); |
1532 | -#endif |
1533 | - |
1534 | -#if defined (sequent) |
1535 | -#if defined (i386) |
1536 | - printf ("i386-sequent-dynix\n"); exit (0); |
1537 | -#endif |
1538 | -#if defined (ns32000) |
1539 | - printf ("ns32k-sequent-dynix\n"); exit (0); |
1540 | -#endif |
1541 | -#endif |
1542 | - |
1543 | -#if defined (_SEQUENT_) |
1544 | - struct utsname un; |
1545 | - |
1546 | - uname(&un); |
1547 | - |
1548 | - if (strncmp(un.version, "V2", 2) == 0) { |
1549 | - printf ("i386-sequent-ptx2\n"); exit (0); |
1550 | - } |
1551 | - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ |
1552 | - printf ("i386-sequent-ptx1\n"); exit (0); |
1553 | - } |
1554 | - printf ("i386-sequent-ptx\n"); exit (0); |
1555 | - |
1556 | -#endif |
1557 | - |
1558 | -#if defined (vax) |
1559 | -# if !defined (ultrix) |
1560 | -# include <sys/param.h> |
1561 | -# if defined (BSD) |
1562 | -# if BSD == 43 |
1563 | - printf ("vax-dec-bsd4.3\n"); exit (0); |
1564 | -# else |
1565 | -# if BSD == 199006 |
1566 | - printf ("vax-dec-bsd4.3reno\n"); exit (0); |
1567 | -# else |
1568 | - printf ("vax-dec-bsd\n"); exit (0); |
1569 | -# endif |
1570 | -# endif |
1571 | -# else |
1572 | - printf ("vax-dec-bsd\n"); exit (0); |
1573 | -# endif |
1574 | -# else |
1575 | - printf ("vax-dec-ultrix\n"); exit (0); |
1576 | -# endif |
1577 | -#endif |
1578 | - |
1579 | -#if defined (alliant) && defined (i860) |
1580 | - printf ("i860-alliant-bsd\n"); exit (0); |
1581 | -#endif |
1582 | - |
1583 | - exit (1); |
1584 | -} |
1585 | -EOF |
1586 | - |
1587 | -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
1588 | - { echo "$SYSTEM_NAME"; exit; } |
1589 | - |
1590 | -# Apollos put the system type in the environment. |
1591 | - |
1592 | -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
1593 | - |
1594 | -# Convex versions that predate uname can use getsysinfo(1) |
1595 | - |
1596 | -if [ -x /usr/convex/getsysinfo ] |
1597 | -then |
1598 | - case `getsysinfo -f cpu_type` in |
1599 | - c1*) |
1600 | - echo c1-convex-bsd |
1601 | - exit ;; |
1602 | - c2*) |
1603 | - if getsysinfo -f scalar_acc |
1604 | - then echo c32-convex-bsd |
1605 | - else echo c2-convex-bsd |
1606 | - fi |
1607 | - exit ;; |
1608 | - c34*) |
1609 | - echo c34-convex-bsd |
1610 | - exit ;; |
1611 | - c38*) |
1612 | - echo c38-convex-bsd |
1613 | - exit ;; |
1614 | - c4*) |
1615 | - echo c4-convex-bsd |
1616 | - exit ;; |
1617 | - esac |
1618 | -fi |
1619 | - |
1620 | cat >&2 <<EOF |
1621 | $0: unable to guess system type |
1622 | |
1623 | |
1624 | === modified file 'config.h.in' |
1625 | --- config.h.in 2012-05-18 22:18:02 +0000 |
1626 | +++ config.h.in 2014-02-20 05:04:01 +0000 |
1627 | @@ -130,9 +130,6 @@ |
1628 | */ |
1629 | #undef LT_OBJDIR |
1630 | |
1631 | -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ |
1632 | -#undef NO_MINUS_C_MINUS_O |
1633 | - |
1634 | /* Name of package */ |
1635 | #undef PACKAGE |
1636 | |
1637 | |
1638 | === modified file 'config.sub' |
1639 | --- config.sub 2014-01-14 11:47:53 +0000 |
1640 | +++ config.sub 2014-02-20 05:04:01 +0000 |
1641 | @@ -1,8 +1,8 @@ |
1642 | #! /bin/sh |
1643 | # Configuration validation subroutine script. |
1644 | -# Copyright 1992-2013 Free Software Foundation, Inc. |
1645 | +# Copyright 1992-2014 Free Software Foundation, Inc. |
1646 | |
1647 | -timestamp='2013-08-10' |
1648 | +timestamp='2014-01-01' |
1649 | |
1650 | # This file is free software; you can redistribute it and/or modify it |
1651 | # under the terms of the GNU General Public License as published by |
1652 | @@ -68,7 +68,7 @@ |
1653 | version="\ |
1654 | GNU config.sub ($timestamp) |
1655 | |
1656 | -Copyright 1992-2013 Free Software Foundation, Inc. |
1657 | +Copyright 1992-2014 Free Software Foundation, Inc. |
1658 | |
1659 | This is free software; see the source for copying conditions. There is NO |
1660 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1661 | @@ -258,13 +258,14 @@ |
1662 | | be32 | be64 \ |
1663 | | bfin \ |
1664 | | c4x | c8051 | clipper \ |
1665 | - | d10v | d30v | dlx | dsp16xx \ |
1666 | + | d10v | d30v | dlx | dsp16xx | dvp \ |
1667 | | epiphany \ |
1668 | | fido | fr30 | frv \ |
1669 | | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
1670 | | hexagon \ |
1671 | | i370 | i860 | i960 | ia64 \ |
1672 | | ip2k | iq2000 \ |
1673 | + | k1om \ |
1674 | | le32 | le64 \ |
1675 | | lm32 \ |
1676 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1677 | @@ -324,7 +325,7 @@ |
1678 | c6x) |
1679 | basic_machine=tic6x-unknown |
1680 | ;; |
1681 | - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) |
1682 | + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) |
1683 | basic_machine=$basic_machine-unknown |
1684 | os=-none |
1685 | ;; |
1686 | @@ -381,6 +382,7 @@ |
1687 | | hexagon-* \ |
1688 | | i*86-* | i860-* | i960-* | ia64-* \ |
1689 | | ip2k-* | iq2000-* \ |
1690 | + | k1om-* \ |
1691 | | le32-* | le64-* \ |
1692 | | lm32-* \ |
1693 | | m32c-* | m32r-* | m32rle-* \ |
1694 | @@ -808,6 +810,24 @@ |
1695 | basic_machine=m68k-atari |
1696 | os=-mint |
1697 | ;; |
1698 | + mipsEE* | ee | ps2) |
1699 | + basic_machine=mips64r5900el-scei |
1700 | + case $os in |
1701 | + -linux*) |
1702 | + ;; |
1703 | + *) |
1704 | + os=-elf |
1705 | + ;; |
1706 | + esac |
1707 | + ;; |
1708 | + iop) |
1709 | + basic_machine=mipsel-scei |
1710 | + os=-irx |
1711 | + ;; |
1712 | + dvp) |
1713 | + basic_machine=dvp-scei |
1714 | + os=-elf |
1715 | + ;; |
1716 | mips3*-*) |
1717 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` |
1718 | ;; |
1719 | @@ -1370,7 +1390,7 @@ |
1720 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1721 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1722 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1723 | - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
1724 | + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ |
1725 | | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
1726 | | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
1727 | | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
1728 | |
1729 | === modified file 'configure' |
1730 | --- configure 2014-01-14 11:47:53 +0000 |
1731 | +++ configure 2014-02-20 05:04:01 +0000 |
1732 | @@ -1,6 +1,6 @@ |
1733 | #! /bin/sh |
1734 | # Guess values for system-dependent variables and create Makefiles. |
1735 | -# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.2. |
1736 | +# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.3. |
1737 | # |
1738 | # Report bugs to <http://bugzilla.xfce.org/>. |
1739 | # |
1740 | @@ -590,8 +590,8 @@ |
1741 | # Identity of this package. |
1742 | PACKAGE_NAME='xfdesktop' |
1743 | PACKAGE_TARNAME='xfdesktop' |
1744 | -PACKAGE_VERSION='4.11.2' |
1745 | -PACKAGE_STRING='xfdesktop 4.11.2' |
1746 | +PACKAGE_VERSION='4.11.3' |
1747 | +PACKAGE_STRING='xfdesktop 4.11.3' |
1748 | PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' |
1749 | PACKAGE_URL='' |
1750 | |
1751 | @@ -731,6 +731,7 @@ |
1752 | INTLLIBS |
1753 | INSTOBJEXT |
1754 | GMOFILES |
1755 | +DATADIRNAME |
1756 | CATOBJEXT |
1757 | CATALOGS |
1758 | MSGFMT_OPTS |
1759 | @@ -762,7 +763,6 @@ |
1760 | build |
1761 | LIBTOOL |
1762 | SED |
1763 | -DATADIRNAME |
1764 | ALL_LINGUAS |
1765 | INTLTOOL_PERL |
1766 | GMSGFMT |
1767 | @@ -1467,7 +1467,7 @@ |
1768 | # Omit some internal or obsolete options to make the list less imposing. |
1769 | # This message is too long to be a string in the A/UX 3.1 sh. |
1770 | cat <<_ACEOF |
1771 | -\`configure' configures xfdesktop 4.11.2 to adapt to many kinds of systems. |
1772 | +\`configure' configures xfdesktop 4.11.3 to adapt to many kinds of systems. |
1773 | |
1774 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1775 | |
1776 | @@ -1541,7 +1541,7 @@ |
1777 | |
1778 | if test -n "$ac_init_help"; then |
1779 | case $ac_init_help in |
1780 | - short | recursive ) echo "Configuration of xfdesktop 4.11.2:";; |
1781 | + short | recursive ) echo "Configuration of xfdesktop 4.11.3:";; |
1782 | esac |
1783 | cat <<\_ACEOF |
1784 | |
1785 | @@ -1687,7 +1687,7 @@ |
1786 | test -n "$ac_init_help" && exit $ac_status |
1787 | if $ac_init_version; then |
1788 | cat <<\_ACEOF |
1789 | -xfdesktop configure 4.11.2 |
1790 | +xfdesktop configure 4.11.3 |
1791 | generated by GNU Autoconf 2.69 |
1792 | |
1793 | Copyright (C) 2012 Free Software Foundation, Inc. |
1794 | @@ -2056,7 +2056,7 @@ |
1795 | This file contains any messages produced by compilers while |
1796 | running configure, to aid debugging if configure makes a mistake. |
1797 | |
1798 | -It was created by xfdesktop $as_me 4.11.2, which was |
1799 | +It was created by xfdesktop $as_me 4.11.3, which was |
1800 | generated by GNU Autoconf 2.69. Invocation command line was |
1801 | |
1802 | $ $0 $@ |
1803 | @@ -2406,7 +2406,7 @@ |
1804 | |
1805 | |
1806 | |
1807 | -am__api_version='1.13' |
1808 | +am__api_version='1.14' |
1809 | |
1810 | ac_aux_dir= |
1811 | for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do |
1812 | @@ -2921,7 +2921,7 @@ |
1813 | |
1814 | # Define the identity of the package. |
1815 | PACKAGE='xfdesktop' |
1816 | - VERSION='4.11.2' |
1817 | + VERSION='4.11.3' |
1818 | |
1819 | |
1820 | cat >>confdefs.h <<_ACEOF |
1821 | @@ -3088,6 +3088,47 @@ |
1822 | |
1823 | |
1824 | |
1825 | +# POSIX will say in a future version that running "rm -f" with no argument |
1826 | +# is OK; and we want to be able to make that assumption in our Makefile |
1827 | +# recipes. So use an aggressive probe to check that the usage we want is |
1828 | +# actually supported "in the wild" to an acceptable degree. |
1829 | +# See automake bug#10828. |
1830 | +# To make any issue more visible, cause the running configure to be aborted |
1831 | +# by default if the 'rm' program in use doesn't match our expectations; the |
1832 | +# user can still override this though. |
1833 | +if rm -f && rm -fr && rm -rf; then : OK; else |
1834 | + cat >&2 <<'END' |
1835 | +Oops! |
1836 | + |
1837 | +Your 'rm' program seems unable to run without file operands specified |
1838 | +on the command line, even when the '-f' option is present. This is contrary |
1839 | +to the behaviour of most rm programs out there, and not conforming with |
1840 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
1841 | + |
1842 | +Please tell bug-automake@gnu.org about your system, including the value |
1843 | +of your $PATH and any error possibly output before this message. This |
1844 | +can help us improve future automake versions. |
1845 | + |
1846 | +END |
1847 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
1848 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
1849 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
1850 | + echo >&2 |
1851 | + else |
1852 | + cat >&2 <<'END' |
1853 | +Aborting the configuration process, to ensure you take notice of the issue. |
1854 | + |
1855 | +You can download and install GNU coreutils to get an 'rm' implementation |
1856 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
1857 | + |
1858 | +If you want to complete the configuration process using your problematic |
1859 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
1860 | +to "yes", and re-run configure. |
1861 | + |
1862 | +END |
1863 | + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 |
1864 | + fi |
1865 | +fi |
1866 | ac_config_headers="$ac_config_headers config.h" |
1867 | |
1868 | |
1869 | @@ -4005,6 +4046,65 @@ |
1870 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1871 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1872 | |
1873 | +ac_ext=c |
1874 | +ac_cpp='$CPP $CPPFLAGS' |
1875 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1876 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1877 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1878 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
1879 | +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
1880 | +if ${am_cv_prog_cc_c_o+:} false; then : |
1881 | + $as_echo_n "(cached) " >&6 |
1882 | +else |
1883 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1884 | +/* end confdefs.h. */ |
1885 | + |
1886 | +int |
1887 | +main () |
1888 | +{ |
1889 | + |
1890 | + ; |
1891 | + return 0; |
1892 | +} |
1893 | +_ACEOF |
1894 | + # Make sure it works both with $CC and with simple cc. |
1895 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
1896 | + # compilers refuse to overwrite an existing .o file with -o, |
1897 | + # though they will create one. |
1898 | + am_cv_prog_cc_c_o=yes |
1899 | + for am_i in 1 2; do |
1900 | + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
1901 | + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
1902 | + ac_status=$? |
1903 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1904 | + (exit $ac_status); } \ |
1905 | + && test -f conftest2.$ac_objext; then |
1906 | + : OK |
1907 | + else |
1908 | + am_cv_prog_cc_c_o=no |
1909 | + break |
1910 | + fi |
1911 | + done |
1912 | + rm -f core conftest* |
1913 | + unset am_i |
1914 | +fi |
1915 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
1916 | +$as_echo "$am_cv_prog_cc_c_o" >&6; } |
1917 | +if test "$am_cv_prog_cc_c_o" != yes; then |
1918 | + # Losing compiler, so override with the script. |
1919 | + # FIXME: It is wrong to rewrite CC. |
1920 | + # But if we don't then we get into trouble of one sort or another. |
1921 | + # A longer-term fix would be to have automake use am__CC in this case, |
1922 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1923 | + CC="$am_aux_dir/compile $CC" |
1924 | +fi |
1925 | +ac_ext=c |
1926 | +ac_cpp='$CPP $CPPFLAGS' |
1927 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1928 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1929 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1930 | + |
1931 | + |
1932 | depcc="$CC" am_compiler_list= |
1933 | |
1934 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1935 | @@ -5196,6 +5296,65 @@ |
1936 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1937 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1938 | |
1939 | +ac_ext=c |
1940 | +ac_cpp='$CPP $CPPFLAGS' |
1941 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1942 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1943 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1944 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
1945 | +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
1946 | +if ${am_cv_prog_cc_c_o+:} false; then : |
1947 | + $as_echo_n "(cached) " >&6 |
1948 | +else |
1949 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1950 | +/* end confdefs.h. */ |
1951 | + |
1952 | +int |
1953 | +main () |
1954 | +{ |
1955 | + |
1956 | + ; |
1957 | + return 0; |
1958 | +} |
1959 | +_ACEOF |
1960 | + # Make sure it works both with $CC and with simple cc. |
1961 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
1962 | + # compilers refuse to overwrite an existing .o file with -o, |
1963 | + # though they will create one. |
1964 | + am_cv_prog_cc_c_o=yes |
1965 | + for am_i in 1 2; do |
1966 | + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
1967 | + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
1968 | + ac_status=$? |
1969 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1970 | + (exit $ac_status); } \ |
1971 | + && test -f conftest2.$ac_objext; then |
1972 | + : OK |
1973 | + else |
1974 | + am_cv_prog_cc_c_o=no |
1975 | + break |
1976 | + fi |
1977 | + done |
1978 | + rm -f core conftest* |
1979 | + unset am_i |
1980 | +fi |
1981 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
1982 | +$as_echo "$am_cv_prog_cc_c_o" >&6; } |
1983 | +if test "$am_cv_prog_cc_c_o" != yes; then |
1984 | + # Losing compiler, so override with the script. |
1985 | + # FIXME: It is wrong to rewrite CC. |
1986 | + # But if we don't then we get into trouble of one sort or another. |
1987 | + # A longer-term fix would be to have automake use am__CC in this case, |
1988 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1989 | + CC="$am_aux_dir/compile $CC" |
1990 | +fi |
1991 | +ac_ext=c |
1992 | +ac_cpp='$CPP $CPPFLAGS' |
1993 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1994 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1995 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1996 | + |
1997 | + |
1998 | depcc="$CC" am_compiler_list= |
1999 | |
2000 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
2001 | @@ -5324,131 +5483,6 @@ |
2002 | fi |
2003 | |
2004 | |
2005 | -if test "x$CC" != xcc; then |
2006 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 |
2007 | -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } |
2008 | -else |
2009 | - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 |
2010 | -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } |
2011 | -fi |
2012 | -set dummy $CC; ac_cc=`$as_echo "$2" | |
2013 | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
2014 | -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : |
2015 | - $as_echo_n "(cached) " >&6 |
2016 | -else |
2017 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2018 | -/* end confdefs.h. */ |
2019 | - |
2020 | -int |
2021 | -main () |
2022 | -{ |
2023 | - |
2024 | - ; |
2025 | - return 0; |
2026 | -} |
2027 | -_ACEOF |
2028 | -# Make sure it works both with $CC and with simple cc. |
2029 | -# We do the test twice because some compilers refuse to overwrite an |
2030 | -# existing .o file with -o, though they will create one. |
2031 | -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
2032 | -rm -f conftest2.* |
2033 | -if { { case "(($ac_try" in |
2034 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2035 | - *) ac_try_echo=$ac_try;; |
2036 | -esac |
2037 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2038 | -$as_echo "$ac_try_echo"; } >&5 |
2039 | - (eval "$ac_try") 2>&5 |
2040 | - ac_status=$? |
2041 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2042 | - test $ac_status = 0; } && |
2043 | - test -f conftest2.$ac_objext && { { case "(($ac_try" in |
2044 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2045 | - *) ac_try_echo=$ac_try;; |
2046 | -esac |
2047 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2048 | -$as_echo "$ac_try_echo"; } >&5 |
2049 | - (eval "$ac_try") 2>&5 |
2050 | - ac_status=$? |
2051 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2052 | - test $ac_status = 0; }; |
2053 | -then |
2054 | - eval ac_cv_prog_cc_${ac_cc}_c_o=yes |
2055 | - if test "x$CC" != xcc; then |
2056 | - # Test first that cc exists at all. |
2057 | - if { ac_try='cc -c conftest.$ac_ext >&5' |
2058 | - { { case "(($ac_try" in |
2059 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2060 | - *) ac_try_echo=$ac_try;; |
2061 | -esac |
2062 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2063 | -$as_echo "$ac_try_echo"; } >&5 |
2064 | - (eval "$ac_try") 2>&5 |
2065 | - ac_status=$? |
2066 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2067 | - test $ac_status = 0; }; }; then |
2068 | - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' |
2069 | - rm -f conftest2.* |
2070 | - if { { case "(($ac_try" in |
2071 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2072 | - *) ac_try_echo=$ac_try;; |
2073 | -esac |
2074 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2075 | -$as_echo "$ac_try_echo"; } >&5 |
2076 | - (eval "$ac_try") 2>&5 |
2077 | - ac_status=$? |
2078 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2079 | - test $ac_status = 0; } && |
2080 | - test -f conftest2.$ac_objext && { { case "(($ac_try" in |
2081 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; |
2082 | - *) ac_try_echo=$ac_try;; |
2083 | -esac |
2084 | -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" |
2085 | -$as_echo "$ac_try_echo"; } >&5 |
2086 | - (eval "$ac_try") 2>&5 |
2087 | - ac_status=$? |
2088 | - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
2089 | - test $ac_status = 0; }; |
2090 | - then |
2091 | - # cc works too. |
2092 | - : |
2093 | - else |
2094 | - # cc exists but doesn't like -o. |
2095 | - eval ac_cv_prog_cc_${ac_cc}_c_o=no |
2096 | - fi |
2097 | - fi |
2098 | - fi |
2099 | -else |
2100 | - eval ac_cv_prog_cc_${ac_cc}_c_o=no |
2101 | -fi |
2102 | -rm -f core conftest* |
2103 | - |
2104 | -fi |
2105 | -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then |
2106 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2107 | -$as_echo "yes" >&6; } |
2108 | -else |
2109 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
2110 | -$as_echo "no" >&6; } |
2111 | - |
2112 | -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h |
2113 | - |
2114 | -fi |
2115 | - |
2116 | -# FIXME: we rely on the cache variable name because |
2117 | -# there is no other way. |
2118 | -set dummy $CC |
2119 | -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` |
2120 | -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o |
2121 | -if test "$am_t" != yes; then |
2122 | - # Losing compiler, so override with the script. |
2123 | - # FIXME: It is wrong to rewrite CC. |
2124 | - # But if we don't then we get into trouble of one sort or another. |
2125 | - # A longer-term fix would be to have automake use am__CC in this case, |
2126 | - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
2127 | - CC="$am_aux_dir/compile $CC" |
2128 | -fi |
2129 | - |
2130 | |
2131 | |
2132 | |
2133 | @@ -5989,44 +6023,6 @@ |
2134 | # Substitute ALL_LINGUAS so we can use it in po/Makefile |
2135 | |
2136 | |
2137 | -# Set DATADIRNAME correctly if it is not set yet |
2138 | -# (copied from glib-gettext.m4) |
2139 | -if test -z "$DATADIRNAME"; then |
2140 | - cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
2141 | -/* end confdefs.h. */ |
2142 | - |
2143 | -int |
2144 | -main () |
2145 | -{ |
2146 | -extern int _nl_msg_cat_cntr; |
2147 | - return _nl_msg_cat_cntr |
2148 | - ; |
2149 | - return 0; |
2150 | -} |
2151 | -_ACEOF |
2152 | -if ac_fn_c_try_link "$LINENO"; then : |
2153 | - DATADIRNAME=share |
2154 | -else |
2155 | - case $host in |
2156 | - *-*-solaris*) |
2157 | - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" |
2158 | -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : |
2159 | - DATADIRNAME=share |
2160 | -else |
2161 | - DATADIRNAME=lib |
2162 | -fi |
2163 | - |
2164 | - ;; |
2165 | - *) |
2166 | - DATADIRNAME=lib |
2167 | - ;; |
2168 | - esac |
2169 | -fi |
2170 | -rm -f core conftest.err conftest.$ac_objext \ |
2171 | - conftest$ac_exeext conftest.$ac_ext |
2172 | -fi |
2173 | - |
2174 | - |
2175 | |
2176 | |
2177 | |
2178 | @@ -6856,8 +6852,7 @@ |
2179 | ;; |
2180 | *) |
2181 | lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` |
2182 | - if test -n "$lt_cv_sys_max_cmd_len" && \ |
2183 | - test undefined != "$lt_cv_sys_max_cmd_len"; then |
2184 | + if test -n "$lt_cv_sys_max_cmd_len"; then |
2185 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` |
2186 | lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` |
2187 | else |
2188 | @@ -7258,6 +7253,10 @@ |
2189 | fi |
2190 | ;; |
2191 | |
2192 | +gnu*) |
2193 | + lt_cv_deplibs_check_method=pass_all |
2194 | + ;; |
2195 | + |
2196 | haiku*) |
2197 | lt_cv_deplibs_check_method=pass_all |
2198 | ;; |
2199 | @@ -7296,11 +7295,11 @@ |
2200 | ;; |
2201 | |
2202 | # This must be glibc/ELF. |
2203 | -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2204 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2205 | lt_cv_deplibs_check_method=pass_all |
2206 | ;; |
2207 | |
2208 | -netbsd* | netbsdelf*-gnu) |
2209 | +netbsd*) |
2210 | if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then |
2211 | lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' |
2212 | else |
2213 | @@ -8393,14 +8392,7 @@ |
2214 | LD="${LD-ld} -m elf_i386_fbsd" |
2215 | ;; |
2216 | x86_64-*linux*) |
2217 | - case `/usr/bin/file conftest.o` in |
2218 | - *x86-64*) |
2219 | - LD="${LD-ld} -m elf32_x86_64" |
2220 | - ;; |
2221 | - *) |
2222 | - LD="${LD-ld} -m elf_i386" |
2223 | - ;; |
2224 | - esac |
2225 | + LD="${LD-ld} -m elf_i386" |
2226 | ;; |
2227 | ppc64-*linux*|powerpc64-*linux*) |
2228 | LD="${LD-ld} -m elf32ppclinux" |
2229 | @@ -9957,7 +9949,7 @@ |
2230 | lt_prog_compiler_static='-non_shared' |
2231 | ;; |
2232 | |
2233 | - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2234 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2235 | case $cc_basename in |
2236 | # old Intel for x86_64 which still supported -KPIC. |
2237 | ecc*) |
2238 | @@ -10435,9 +10427,6 @@ |
2239 | openbsd*) |
2240 | with_gnu_ld=no |
2241 | ;; |
2242 | - linux* | k*bsd*-gnu | gnu*) |
2243 | - link_all_deplibs=no |
2244 | - ;; |
2245 | esac |
2246 | |
2247 | ld_shlibs=yes |
2248 | @@ -10659,7 +10648,7 @@ |
2249 | fi |
2250 | ;; |
2251 | |
2252 | - netbsd* | netbsdelf*-gnu) |
2253 | + netbsd*) |
2254 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
2255 | archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' |
2256 | wlarc= |
2257 | @@ -10836,7 +10825,6 @@ |
2258 | if test "$aix_use_runtimelinking" = yes; then |
2259 | shared_flag="$shared_flag "'${wl}-G' |
2260 | fi |
2261 | - link_all_deplibs=no |
2262 | else |
2263 | # not using gcc |
2264 | if test "$host_cpu" = ia64; then |
2265 | @@ -11290,7 +11278,7 @@ |
2266 | link_all_deplibs=yes |
2267 | ;; |
2268 | |
2269 | - netbsd* | netbsdelf*-gnu) |
2270 | + netbsd*) |
2271 | if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then |
2272 | archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out |
2273 | else |
2274 | @@ -12094,7 +12082,14 @@ |
2275 | *) objformat=elf ;; |
2276 | esac |
2277 | fi |
2278 | - version_type=freebsd-$objformat |
2279 | + # Handle Gentoo/FreeBSD as it was Linux |
2280 | + case $host_vendor in |
2281 | + gentoo) |
2282 | + version_type=linux ;; |
2283 | + *) |
2284 | + version_type=freebsd-$objformat ;; |
2285 | + esac |
2286 | + |
2287 | case $version_type in |
2288 | freebsd-elf*) |
2289 | library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' |
2290 | @@ -12105,6 +12100,12 @@ |
2291 | library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' |
2292 | need_version=yes |
2293 | ;; |
2294 | + linux) |
2295 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2296 | + soname_spec='${libname}${release}${shared_ext}$major' |
2297 | + need_lib_prefix=no |
2298 | + need_version=no |
2299 | + ;; |
2300 | esac |
2301 | shlibpath_var=LD_LIBRARY_PATH |
2302 | case $host_os in |
2303 | @@ -12127,6 +12128,17 @@ |
2304 | esac |
2305 | ;; |
2306 | |
2307 | +gnu*) |
2308 | + version_type=linux # correct to gnu/linux during the next big refactor |
2309 | + need_lib_prefix=no |
2310 | + need_version=no |
2311 | + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' |
2312 | + soname_spec='${libname}${release}${shared_ext}$major' |
2313 | + shlibpath_var=LD_LIBRARY_PATH |
2314 | + shlibpath_overrides_runpath=no |
2315 | + hardcode_into_libs=yes |
2316 | + ;; |
2317 | + |
2318 | haiku*) |
2319 | version_type=linux # correct to gnu/linux during the next big refactor |
2320 | need_lib_prefix=no |
2321 | @@ -12243,7 +12255,7 @@ |
2322 | ;; |
2323 | |
2324 | # This must be glibc/ELF. |
2325 | -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) |
2326 | +linux* | k*bsd*-gnu | kopensolaris*-gnu) |
2327 | version_type=linux # correct to gnu/linux during the next big refactor |
2328 | need_lib_prefix=no |
2329 | need_version=no |
2330 | @@ -12307,18 +12319,6 @@ |
2331 | dynamic_linker='GNU/Linux ld.so' |
2332 | ;; |
2333 | |
2334 | -netbsdelf*-gnu) |
2335 | - version_type=linux |
2336 | - need_lib_prefix=no |
2337 | - need_version=no |
2338 | - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' |
2339 | - soname_spec='${libname}${release}${shared_ext}$major' |
2340 | - shlibpath_var=LD_LIBRARY_PATH |
2341 | - shlibpath_overrides_runpath=no |
2342 | - hardcode_into_libs=yes |
2343 | - dynamic_linker='NetBSD ld.elf_so' |
2344 | - ;; |
2345 | - |
2346 | netbsd*) |
2347 | version_type=sunos |
2348 | need_lib_prefix=no |
2349 | @@ -18864,7 +18864,7 @@ |
2350 | # report actual input values of CONFIG_FILES etc. instead of their |
2351 | # values after options handling. |
2352 | ac_log=" |
2353 | -This file was extended by xfdesktop $as_me 4.11.2, which was |
2354 | +This file was extended by xfdesktop $as_me 4.11.3, which was |
2355 | generated by GNU Autoconf 2.69. Invocation command line was |
2356 | |
2357 | CONFIG_FILES = $CONFIG_FILES |
2358 | @@ -18930,7 +18930,7 @@ |
2359 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
2360 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
2361 | ac_cs_version="\\ |
2362 | -xfdesktop config.status 4.11.2 |
2363 | +xfdesktop config.status 4.11.3 |
2364 | configured by $0, generated by GNU Autoconf 2.69, |
2365 | with options \\"\$ac_cs_config\\" |
2366 | |
2367 | |
2368 | === modified file 'configure.ac' |
2369 | --- configure.ac 2014-01-14 11:47:53 +0000 |
2370 | +++ configure.ac 2014-02-20 05:04:01 +0000 |
2371 | @@ -11,9 +11,9 @@ |
2372 | dnl version info |
2373 | m4_define([xfdesktop_version_major], [4]) |
2374 | m4_define([xfdesktop_version_minor], [11]) |
2375 | -m4_define([xfdesktop_version_micro], [2]) |
2376 | +m4_define([xfdesktop_version_micro], [3]) |
2377 | m4_define([xfdesktop_version_nano], []) |
2378 | -m4_define([xfdesktop_version_build], [a893ba3]) |
2379 | +m4_define([xfdesktop_version_build], [9b9bacb]) |
2380 | m4_define([xfdesktop_version_tag],[]) |
2381 | m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])]) |
2382 | |
2383 | |
2384 | === modified file 'debian/changelog' |
2385 | --- debian/changelog 2014-01-22 11:02:26 +0000 |
2386 | +++ debian/changelog 2014-02-20 05:04:01 +0000 |
2387 | @@ -1,3 +1,20 @@ |
2388 | +xfdesktop4 (4.11.3-1ubuntu1) trusty; urgency=medium |
2389 | + |
2390 | + * Merge from debian. Remaining changes: |
2391 | + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, |
2392 | + should prevent nautilus from taking over the desktop if xfdesktop is |
2393 | + running (and vice-versa). |
2394 | + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the |
2395 | + user background property of Accountsservice on backdrop change. |
2396 | + |
2397 | + -- Jackson Doak <noskcaj@ubuntu.com> Thu, 20 Feb 2014 15:59:49 +1100 |
2398 | + |
2399 | +xfdesktop4 (4.11.3-1) experimental; urgency=medium |
2400 | + |
2401 | + * New upstream development release. |
2402 | + |
2403 | + -- Yves-Alexis Perez <corsac@debian.org> Wed, 19 Feb 2014 20:34:01 +0100 |
2404 | + |
2405 | xfdesktop4 (4.11.2-1ubuntu1) trusty; urgency=medium |
2406 | |
2407 | * Merge from debian. Remaining changes: |
2408 | |
2409 | === modified file 'debian/patches/xubuntu_improve-nautilus-interactions.patch' |
2410 | --- debian/patches/xubuntu_improve-nautilus-interactions.patch 2014-01-22 11:02:26 +0000 |
2411 | +++ debian/patches/xubuntu_improve-nautilus-interactions.patch 2014-02-20 05:04:01 +0000 |
2412 | @@ -17,7 +17,7 @@ |
2413 | |
2414 | --- a/src/xfce-desktop.c |
2415 | +++ b/src/xfce-desktop.c |
2416 | -@@ -800,8 +800,8 @@ screen_set_selection(XfceDesktop *deskto |
2417 | +@@ -802,8 +802,8 @@ screen_set_selection(XfceDesktop *deskto |
2418 | { |
2419 | Window xwin; |
2420 | gint xscreen; |
2421 | @@ -28,7 +28,7 @@ |
2422 | |
2423 | xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); |
2424 | xscreen = gdk_screen_get_number(desktop->priv->gscreen); |
2425 | -@@ -810,6 +810,9 @@ screen_set_selection(XfceDesktop *deskto |
2426 | +@@ -812,6 +812,9 @@ screen_set_selection(XfceDesktop *deskto |
2427 | selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False); |
2428 | manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False); |
2429 | |
2430 | @@ -38,7 +38,7 @@ |
2431 | /* the previous check in src/main.c occurs too early, so workaround by |
2432 | * adding this one. */ |
2433 | if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) != None) { |
2434 | -@@ -817,8 +820,16 @@ screen_set_selection(XfceDesktop *deskto |
2435 | +@@ -819,8 +822,16 @@ screen_set_selection(XfceDesktop *deskto |
2436 | exit(0); |
2437 | } |
2438 | |
2439 | |
2440 | === modified file 'debian/patches/xubuntu_set-accountsservice-user-bg.patch' |
2441 | --- debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-01-22 11:02:26 +0000 |
2442 | +++ debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-02-20 05:04:01 +0000 |
2443 | @@ -17,7 +17,7 @@ |
2444 | |
2445 | #ifdef ENABLE_DESKTOP_ICONS |
2446 | #include "xfdesktop-icon-view.h" |
2447 | -@@ -351,6 +352,86 @@ create_bg_pixmap(GdkScreen *gscreen, gpo |
2448 | +@@ -352,6 +353,86 @@ create_bg_pixmap(GdkScreen *gscreen, gpo |
2449 | } |
2450 | |
2451 | static void |
2452 | @@ -104,7 +104,7 @@ |
2453 | backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) |
2454 | { |
2455 | XfceDesktop *desktop = XFCE_DESKTOP(user_data); |
2456 | -@@ -383,6 +464,10 @@ backdrop_changed_cb(XfceBackdrop *backdr |
2457 | +@@ -384,6 +465,10 @@ backdrop_changed_cb(XfceBackdrop *backdr |
2458 | } |
2459 | if(monitor == -1) |
2460 | return; |
2461 | |
2462 | === modified file 'doc/Makefile.in' |
2463 | --- doc/Makefile.in 2014-01-14 11:47:53 +0000 |
2464 | +++ doc/Makefile.in 2014-02-20 05:04:01 +0000 |
2465 | @@ -1,4 +1,4 @@ |
2466 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
2467 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
2468 | # @configure_input@ |
2469 | |
2470 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2471 | |
2472 | === modified file 'ltmain.sh' |
2473 | --- ltmain.sh 2014-01-14 11:47:53 +0000 |
2474 | +++ ltmain.sh 2014-02-20 05:04:01 +0000 |
2475 | @@ -70,7 +70,7 @@ |
2476 | # compiler: $LTCC |
2477 | # compiler flags: $LTCFLAGS |
2478 | # linker: $LD (gnu? $with_gnu_ld) |
2479 | -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 |
2480 | +# $progname: (GNU libtool) 2.4.2 |
2481 | # automake: $automake_version |
2482 | # autoconf: $autoconf_version |
2483 | # |
2484 | @@ -80,7 +80,7 @@ |
2485 | |
2486 | PROGRAM=libtool |
2487 | PACKAGE=libtool |
2488 | -VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" |
2489 | +VERSION=2.4.2 |
2490 | TIMESTAMP="" |
2491 | package_revision=1.3337 |
2492 | |
2493 | @@ -6124,10 +6124,7 @@ |
2494 | case $pass in |
2495 | dlopen) libs="$dlfiles" ;; |
2496 | dlpreopen) libs="$dlprefiles" ;; |
2497 | - link) |
2498 | - libs="$deplibs %DEPLIBS%" |
2499 | - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" |
2500 | - ;; |
2501 | + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; |
2502 | esac |
2503 | fi |
2504 | if test "$linkmode,$pass" = "lib,dlpreopen"; then |
2505 | @@ -6447,19 +6444,19 @@ |
2506 | # It is a libtool convenience library, so add in its objects. |
2507 | func_append convenience " $ladir/$objdir/$old_library" |
2508 | func_append old_convenience " $ladir/$objdir/$old_library" |
2509 | - tmp_libs= |
2510 | - for deplib in $dependency_libs; do |
2511 | - deplibs="$deplib $deplibs" |
2512 | - if $opt_preserve_dup_deps ; then |
2513 | - case "$tmp_libs " in |
2514 | - *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
2515 | - esac |
2516 | - fi |
2517 | - func_append tmp_libs " $deplib" |
2518 | - done |
2519 | elif test "$linkmode" != prog && test "$linkmode" != lib; then |
2520 | func_fatal_error "\`$lib' is not a convenience library" |
2521 | fi |
2522 | + tmp_libs= |
2523 | + for deplib in $dependency_libs; do |
2524 | + deplibs="$deplib $deplibs" |
2525 | + if $opt_preserve_dup_deps ; then |
2526 | + case "$tmp_libs " in |
2527 | + *" $deplib "*) func_append specialdeplibs " $deplib" ;; |
2528 | + esac |
2529 | + fi |
2530 | + func_append tmp_libs " $deplib" |
2531 | + done |
2532 | continue |
2533 | fi # $pass = conv |
2534 | |
2535 | @@ -7352,9 +7349,6 @@ |
2536 | revision="$number_minor" |
2537 | lt_irix_increment=no |
2538 | ;; |
2539 | - *) |
2540 | - func_fatal_configuration "$modename: unknown library version type \`$version_type'" |
2541 | - ;; |
2542 | esac |
2543 | ;; |
2544 | no) |
2545 | |
2546 | === modified file 'missing' |
2547 | --- missing 2014-01-14 11:47:53 +0000 |
2548 | +++ missing 2014-02-20 05:04:01 +0000 |
2549 | @@ -1,7 +1,7 @@ |
2550 | #! /bin/sh |
2551 | # Common wrapper for a few potentially missing GNU programs. |
2552 | |
2553 | -scriptversion=2012-06-26.16; # UTC |
2554 | +scriptversion=2013-10-28.13; # UTC |
2555 | |
2556 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2557 | # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2558 | @@ -160,7 +160,7 @@ |
2559 | ;; |
2560 | autom4te*) |
2561 | echo "You might have modified some maintainer files that require" |
2562 | - echo "the 'automa4te' program to be rebuilt." |
2563 | + echo "the 'autom4te' program to be rebuilt." |
2564 | program_details 'autom4te' |
2565 | ;; |
2566 | bison*|yacc*) |
2567 | |
2568 | === modified file 'pixmaps/Makefile.in' |
2569 | --- pixmaps/Makefile.in 2014-01-14 11:47:53 +0000 |
2570 | +++ pixmaps/Makefile.in 2014-02-20 05:04:01 +0000 |
2571 | @@ -1,4 +1,4 @@ |
2572 | -# Makefile.in generated by automake 1.13.3 from Makefile.am. |
2573 | +# Makefile.in generated by automake 1.14.1 from Makefile.am. |
2574 | # @configure_input@ |
2575 | |
2576 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2577 | |
2578 | === modified file 'po/Makefile.in.in' |
2579 | --- po/Makefile.in.in 2012-05-18 22:18:02 +0000 |
2580 | +++ po/Makefile.in.in 2014-02-20 05:04:01 +0000 |
2581 | @@ -33,8 +33,7 @@ |
2582 | datadir = @datadir@ |
2583 | datarootdir = @datarootdir@ |
2584 | libdir = @libdir@ |
2585 | -DATADIRNAME = @DATADIRNAME@ |
2586 | -itlocaledir = $(prefix)/$(DATADIRNAME)/locale |
2587 | +localedir = @localedir@ |
2588 | subdir = po |
2589 | install_sh = @install_sh@ |
2590 | # Automake >= 1.8 provides @mkdir_p@. |
2591 | @@ -109,7 +108,7 @@ |
2592 | install-data-yes: all |
2593 | linguas="$(USE_LINGUAS)"; \ |
2594 | for lang in $$linguas; do \ |
2595 | - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ |
2596 | + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ |
2597 | $(mkdir_p) $$dir; \ |
2598 | if test -r $$lang.gmo; then \ |
2599 | $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ |
2600 | @@ -143,8 +142,8 @@ |
2601 | uninstall: |
2602 | linguas="$(USE_LINGUAS)"; \ |
2603 | for lang in $$linguas; do \ |
2604 | - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ |
2605 | - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ |
2606 | + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ |
2607 | + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ |
2608 | done |
2609 | |
2610 | check: all $(GETTEXT_PACKAGE).pot |
2611 | |
2612 | === modified file 'po/cs.po' |
2613 | --- po/cs.po 2014-01-14 11:47:53 +0000 |
2614 | +++ po/cs.po 2014-02-20 05:04:01 +0000 |
2615 | @@ -7,13 +7,14 @@ |
2616 | # Alois Nešpor <info@aloisnespor.info>, 2013 |
2617 | # Libor Schejbal <libor.schejbal@gmail.com>, 2013 |
2618 | # Lukáš Konarovský <daeltar@daeltar.org>, 2003 |
2619 | +# Michal Várady <miko.vaji@gmail.com>, 2014 |
2620 | msgid "" |
2621 | msgstr "" |
2622 | "Project-Id-Version: Xfdesktop\n" |
2623 | "Report-Msgid-Bugs-To: \n" |
2624 | -"POT-Creation-Date: 2013-11-15 00:31+0100\n" |
2625 | -"PO-Revision-Date: 2013-11-19 13:41+0000\n" |
2626 | -"Last-Translator: Xfce <transifex@xfce.org>\n" |
2627 | +"POT-Creation-Date: 2013-12-15 00:31+0100\n" |
2628 | +"PO-Revision-Date: 2014-01-18 23:28+0000\n" |
2629 | +"Last-Translator: Michal Várady <miko.vaji@gmail.com>\n" |
2630 | "Language-Team: Czech (http://www.transifex.com/projects/p/xfce/language/cs/)\n" |
2631 | "MIME-Version: 1.0\n" |
2632 | "Content-Type: text/plain; charset=UTF-8\n" |
2633 | @@ -21,37 +22,37 @@ |
2634 | "Language: cs\n" |
2635 | "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" |
2636 | |
2637 | -#: ../settings/main.c:371 ../src/xfdesktop-special-file-icon.c:295 |
2638 | +#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 |
2639 | #: ../src/xfdesktop-special-file-icon.c:479 |
2640 | msgid "Home" |
2641 | msgstr "Domovská složka" |
2642 | |
2643 | -#: ../settings/main.c:373 |
2644 | +#: ../settings/main.c:374 |
2645 | msgid "Filesystem" |
2646 | msgstr "Systém souborů" |
2647 | |
2648 | -#: ../settings/main.c:375 |
2649 | +#: ../settings/main.c:376 |
2650 | msgid "Trash" |
2651 | msgstr "Koš" |
2652 | |
2653 | -#: ../settings/main.c:377 |
2654 | +#: ../settings/main.c:378 |
2655 | msgid "Removable Devices" |
2656 | msgstr "Vyměnitelné jednotky" |
2657 | |
2658 | -#: ../settings/main.c:379 |
2659 | +#: ../settings/main.c:380 |
2660 | msgid "Network Shares" |
2661 | msgstr "Sdílení sítě" |
2662 | |
2663 | -#: ../settings/main.c:381 |
2664 | +#: ../settings/main.c:382 |
2665 | msgid "Disks and Drives" |
2666 | msgstr "Disk a ovladače" |
2667 | |
2668 | -#: ../settings/main.c:383 |
2669 | +#: ../settings/main.c:384 |
2670 | msgid "Other Items" |
2671 | msgstr "Ostatní položky" |
2672 | |
2673 | #. Display the file name, file type, and file size in the tooltip. |
2674 | -#: ../settings/main.c:496 |
2675 | +#: ../settings/main.c:497 |
2676 | #, c-format |
2677 | msgid "" |
2678 | "<b>%s</b>\n" |
2679 | @@ -59,97 +60,97 @@ |
2680 | "Size: %s" |
2681 | msgstr "<b>%s</b>⏎\nTyp: %s⏎\nVelikost: %s" |
2682 | |
2683 | -#: ../settings/main.c:680 |
2684 | +#: ../settings/main.c:681 |
2685 | #, c-format |
2686 | msgid "Wallpaper for Monitor %d (%s)" |
2687 | msgstr "Tapeta pro monitor %d (%s)" |
2688 | |
2689 | -#: ../settings/main.c:683 |
2690 | +#: ../settings/main.c:684 |
2691 | #, c-format |
2692 | msgid "Wallpaper for Monitor %d" |
2693 | msgstr "Tapeta pro monitor %d" |
2694 | |
2695 | -#: ../settings/main.c:689 |
2696 | +#: ../settings/main.c:690 |
2697 | msgid "" |
2698 | "You are using more than one display, move this dialog to the display you " |
2699 | "want to edit the settings for." |
2700 | -msgstr "" |
2701 | +msgstr "Používáte více než jeden displej, přesuňte dialogové okno na displej, jehož nastavení chcete změnit." |
2702 | |
2703 | -#: ../settings/main.c:697 |
2704 | +#: ../settings/main.c:698 |
2705 | #, c-format |
2706 | msgid "Wallpaper for %s on Monitor %d (%s)" |
2707 | msgstr "Tapeta pro %s na monitoru %d (%s)" |
2708 | |
2709 | -#: ../settings/main.c:701 |
2710 | +#: ../settings/main.c:702 |
2711 | #, c-format |
2712 | msgid "Wallpaper for %s on Monitor %d" |
2713 | msgstr "Tapeta pro %s na monitoru %d" |
2714 | |
2715 | -#: ../settings/main.c:708 |
2716 | +#: ../settings/main.c:709 |
2717 | msgid "" |
2718 | "You are using more than one display, move this dialog to the display and " |
2719 | "workspace you want to edit the settings for." |
2720 | -msgstr "" |
2721 | +msgstr "Používáte více než jeden displej, přesuňte dialogové okno na displej a pracovní prostor, jejichž nastavení chcete změnit." |
2722 | |
2723 | #. Single monitor and single workspace |
2724 | -#: ../settings/main.c:716 |
2725 | +#: ../settings/main.c:717 |
2726 | #, c-format |
2727 | msgid "Wallpaper for my desktop" |
2728 | msgstr "Tapeta pro můj desktop" |
2729 | |
2730 | #. Single monitor and per workspace wallpaper |
2731 | -#: ../settings/main.c:722 |
2732 | +#: ../settings/main.c:723 |
2733 | #, c-format |
2734 | msgid "Wallpaper for %s" |
2735 | msgstr "Tapeta pro %s" |
2736 | |
2737 | -#: ../settings/main.c:727 |
2738 | +#: ../settings/main.c:728 |
2739 | msgid "Move this dialog to the workspace you want to edit the settings for." |
2740 | -msgstr "" |
2741 | +msgstr "Přesuňte toto dialogové okno na pracovní prostor, jehož nastavení chcete měnit." |
2742 | |
2743 | -#: ../settings/main.c:1130 |
2744 | +#: ../settings/main.c:1131 |
2745 | msgid "Image selection is unavailable while the image style is set to None." |
2746 | msgstr "Výběr obrazu není k dispozici, pokud je styl obrazu nastaven na hodnotu Žádný." |
2747 | |
2748 | -#: ../settings/main.c:1482 |
2749 | +#: ../settings/main.c:1483 |
2750 | msgid "Spanning screens" |
2751 | msgstr "Rozložení přes obrazovky" |
2752 | |
2753 | -#: ../settings/main.c:1787 |
2754 | +#: ../settings/main.c:1788 |
2755 | msgid "Image files" |
2756 | msgstr "Soubory s obrázky" |
2757 | |
2758 | -#: ../settings/main.c:1939 |
2759 | +#: ../settings/main.c:1945 |
2760 | msgid "Settings manager socket" |
2761 | msgstr "Soket správce nastavení" |
2762 | |
2763 | -#: ../settings/main.c:1939 |
2764 | +#: ../settings/main.c:1945 |
2765 | msgid "SOCKET ID" |
2766 | msgstr "SOCKET ID" |
2767 | |
2768 | -#: ../settings/main.c:1940 |
2769 | +#: ../settings/main.c:1946 |
2770 | msgid "Version information" |
2771 | msgstr "Informace o verzi" |
2772 | |
2773 | -#: ../settings/main.c:1967 |
2774 | +#: ../settings/main.c:1973 |
2775 | #, c-format |
2776 | msgid "Type '%s --help' for usage." |
2777 | msgstr "Informace o použití získáte příkazem '%s --help'." |
2778 | |
2779 | -#: ../settings/main.c:1979 |
2780 | +#: ../settings/main.c:1985 |
2781 | msgid "The Xfce development team. All rights reserved." |
2782 | msgstr "Tým vývojářů Xfce. Všechna práva vyhrazena." |
2783 | |
2784 | -#: ../settings/main.c:1980 |
2785 | +#: ../settings/main.c:1986 |
2786 | #, c-format |
2787 | msgid "Please report bugs to <%s>." |
2788 | msgstr "Prosíme, abyste chyby hlásili na <%s>." |
2789 | |
2790 | -#: ../settings/main.c:1987 |
2791 | +#: ../settings/main.c:1993 |
2792 | msgid "Desktop Settings" |
2793 | msgstr "Nastavení plochy" |
2794 | |
2795 | -#: ../settings/main.c:1989 |
2796 | +#: ../settings/main.c:1995 |
2797 | msgid "Unable to contact settings server" |
2798 | msgstr "Spojení se serverem nastavení nelze navázat" |
2799 | |
2800 | @@ -337,7 +338,7 @@ |
2801 | msgid "File/launcher icons" |
2802 | msgstr "Ikony souborů a spouštěčů" |
2803 | |
2804 | -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1016 |
2805 | +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 |
2806 | msgid "Desktop" |
2807 | msgstr "Plocha" |
2808 | |
2809 | @@ -402,56 +403,60 @@ |
2810 | msgstr "Zobrazit přilepená okna pouze v _aktivní pracovní ploše" |
2811 | |
2812 | #: ../settings/xfdesktop-settings-ui.glade.h:26 |
2813 | +msgid "Show a_dd and remove workspace options in list" |
2814 | +msgstr "Zobrazit možnosti pro při_dání a odebrání pracovních prostorů v seznamu" |
2815 | + |
2816 | +#: ../settings/xfdesktop-settings-ui.glade.h:27 |
2817 | msgid "<b>Window List Menu</b>" |
2818 | msgstr "<b>Nabídka seznamu oken</b>" |
2819 | |
2820 | -#: ../settings/xfdesktop-settings-ui.glade.h:27 |
2821 | +#: ../settings/xfdesktop-settings-ui.glade.h:28 |
2822 | msgid "_Menus" |
2823 | msgstr "_Nabídky" |
2824 | |
2825 | -#: ../settings/xfdesktop-settings-ui.glade.h:28 |
2826 | +#: ../settings/xfdesktop-settings-ui.glade.h:29 |
2827 | msgid "Icon _type:" |
2828 | msgstr "Typ _ikon:" |
2829 | |
2830 | -#: ../settings/xfdesktop-settings-ui.glade.h:29 |
2831 | +#: ../settings/xfdesktop-settings-ui.glade.h:30 |
2832 | msgid "Icon _size:" |
2833 | msgstr "_Velikost ikon:" |
2834 | |
2835 | -#: ../settings/xfdesktop-settings-ui.glade.h:30 |
2836 | +#: ../settings/xfdesktop-settings-ui.glade.h:31 |
2837 | msgid "Show t_humbnails" |
2838 | msgstr "Zobrazit _náhledy" |
2839 | |
2840 | -#: ../settings/xfdesktop-settings-ui.glade.h:31 |
2841 | +#: ../settings/xfdesktop-settings-ui.glade.h:32 |
2842 | msgid "" |
2843 | "Select this option to display preview-able files on the desktop as " |
2844 | "automatically generated thumbnail icons." |
2845 | msgstr "Tuto možnost vyberte pro automatické vygenerování ikon s náhledy pro soubory, které to umožňují." |
2846 | |
2847 | -#: ../settings/xfdesktop-settings-ui.glade.h:32 |
2848 | +#: ../settings/xfdesktop-settings-ui.glade.h:33 |
2849 | msgid "Single _click to activate items" |
2850 | msgstr "_Aktivace položek jedním kliknutím" |
2851 | |
2852 | -#: ../settings/xfdesktop-settings-ui.glade.h:33 |
2853 | +#: ../settings/xfdesktop-settings-ui.glade.h:34 |
2854 | msgid "Show icon tooltips. Size:" |
2855 | msgstr "Zobrazit popisky ikon. Velikost:" |
2856 | |
2857 | -#: ../settings/xfdesktop-settings-ui.glade.h:34 |
2858 | +#: ../settings/xfdesktop-settings-ui.glade.h:35 |
2859 | msgid "Size of the tooltip preview image." |
2860 | msgstr "Velikost popisku náhledu obrázku." |
2861 | |
2862 | -#: ../settings/xfdesktop-settings-ui.glade.h:35 |
2863 | +#: ../settings/xfdesktop-settings-ui.glade.h:36 |
2864 | msgid "Use custom _font size:" |
2865 | msgstr "Uživatelsky de_finovaná velikost písma:" |
2866 | |
2867 | -#: ../settings/xfdesktop-settings-ui.glade.h:36 |
2868 | +#: ../settings/xfdesktop-settings-ui.glade.h:37 |
2869 | msgid "<b>Appearance</b>" |
2870 | msgstr "<b>Vzhled</b>" |
2871 | |
2872 | -#: ../settings/xfdesktop-settings-ui.glade.h:37 |
2873 | +#: ../settings/xfdesktop-settings-ui.glade.h:38 |
2874 | msgid "<b>Default Icons</b>" |
2875 | msgstr "<b>Výchozí ikony</b>" |
2876 | |
2877 | -#: ../settings/xfdesktop-settings-ui.glade.h:38 |
2878 | +#: ../settings/xfdesktop-settings-ui.glade.h:39 |
2879 | msgid "_Icons" |
2880 | msgstr "_Ikony" |
2881 | |
2882 | @@ -459,131 +464,131 @@ |
2883 | msgid "_Applications" |
2884 | msgstr "Apli_kace" |
2885 | |
2886 | -#: ../src/windowlist.c:72 |
2887 | +#: ../src/windowlist.c:73 |
2888 | #, c-format |
2889 | msgid "Remove Workspace %d" |
2890 | msgstr "Odstrannění pracovní plochy %d" |
2891 | |
2892 | -#: ../src/windowlist.c:73 |
2893 | +#: ../src/windowlist.c:74 |
2894 | #, c-format |
2895 | msgid "" |
2896 | "Do you really want to remove workspace %d?\n" |
2897 | "Note: You are currently on workspace %d." |
2898 | -msgstr "" |
2899 | +msgstr "Opravdu chcete odebrat pracovní prostor %d?\nPoznámka: Právě se nacházíte na pracovním prostoru %d." |
2900 | |
2901 | -#: ../src/windowlist.c:77 |
2902 | +#: ../src/windowlist.c:78 |
2903 | #, c-format |
2904 | msgid "Remove Workspace '%s'" |
2905 | msgstr "Odstranění pracovní plochy '%s'" |
2906 | |
2907 | -#: ../src/windowlist.c:78 |
2908 | +#: ../src/windowlist.c:79 |
2909 | #, c-format |
2910 | msgid "" |
2911 | "Do you really want to remove workspace '%s'?\n" |
2912 | "Note: You are currently on workspace '%s'." |
2913 | -msgstr "" |
2914 | +msgstr "Opravdu chcete odebrat pracovní prostor %s?\nPoznámka: Právě se nacházíte na pracovním prostoru %s." |
2915 | |
2916 | #. Popup a dialog box confirming that the user wants to remove a |
2917 | #. * workspace |
2918 | -#: ../src/windowlist.c:85 |
2919 | +#: ../src/windowlist.c:86 |
2920 | msgid "Remove" |
2921 | msgstr "Odstranění" |
2922 | |
2923 | -#: ../src/windowlist.c:245 |
2924 | +#: ../src/windowlist.c:246 |
2925 | msgid "Window List" |
2926 | msgstr "Seznam oken" |
2927 | |
2928 | -#: ../src/windowlist.c:271 |
2929 | +#: ../src/windowlist.c:272 |
2930 | #, c-format |
2931 | msgid "<b>Workspace %d</b>" |
2932 | msgstr "<b>Pracovní plocha %d</b>" |
2933 | |
2934 | -#: ../src/windowlist.c:360 ../src/windowlist.c:363 |
2935 | +#: ../src/windowlist.c:362 ../src/windowlist.c:365 |
2936 | msgid "_Add Workspace" |
2937 | msgstr "_Přidat pracovní plochu" |
2938 | |
2939 | -#: ../src/windowlist.c:371 |
2940 | +#: ../src/windowlist.c:373 |
2941 | #, c-format |
2942 | msgid "_Remove Workspace %d" |
2943 | msgstr "_Odebrat pracovní plochu %d" |
2944 | |
2945 | -#: ../src/windowlist.c:374 |
2946 | +#: ../src/windowlist.c:376 |
2947 | #, c-format |
2948 | msgid "_Remove Workspace '%s'" |
2949 | msgstr "_Odebrat pracovní plochu '%s'" |
2950 | |
2951 | +#: ../src/xfdesktop-application.c:772 |
2952 | +msgid "Display version information" |
2953 | +msgstr "Zobrazit informace o verzi" |
2954 | + |
2955 | #: ../src/xfdesktop-application.c:773 |
2956 | -msgid "Display version information" |
2957 | -msgstr "" |
2958 | +msgid "Reload all settings" |
2959 | +msgstr "Znovu načíst všechna nastavení" |
2960 | |
2961 | #: ../src/xfdesktop-application.c:774 |
2962 | -msgid "Reload all settings" |
2963 | -msgstr "" |
2964 | +msgid "Pop up the menu (at the current mouse position)" |
2965 | +msgstr "Otevře nabídku (na aktuální pozici kurzoru myši)" |
2966 | |
2967 | #: ../src/xfdesktop-application.c:775 |
2968 | -msgid "Pop up the menu (at the current mouse position)" |
2969 | -msgstr "" |
2970 | - |
2971 | -#: ../src/xfdesktop-application.c:776 |
2972 | msgid "Pop up the window list (at the current mouse position)" |
2973 | -msgstr "" |
2974 | +msgstr "Otevře seznam oken (na aktuální pozici kurzoru myši)" |
2975 | |
2976 | -#: ../src/xfdesktop-application.c:778 |
2977 | +#: ../src/xfdesktop-application.c:777 |
2978 | msgid "Automatically arrange all the icons on the desktop" |
2979 | -msgstr "" |
2980 | +msgstr "Automaticky uspořádat všechny ikony na pracovní ploše" |
2981 | + |
2982 | +#: ../src/xfdesktop-application.c:779 |
2983 | +msgid "Do not wait for a window manager on startup" |
2984 | +msgstr "Nečekat na správce oken při startu" |
2985 | |
2986 | #: ../src/xfdesktop-application.c:780 |
2987 | -msgid "Do not wait for a window manager on startup" |
2988 | -msgstr "" |
2989 | - |
2990 | -#: ../src/xfdesktop-application.c:781 |
2991 | msgid "Cause xfdesktop to quit" |
2992 | -msgstr "" |
2993 | +msgstr "Ukončí správce plochy xfdesktop" |
2994 | |
2995 | -#: ../src/xfdesktop-application.c:796 |
2996 | +#: ../src/xfdesktop-application.c:795 |
2997 | #, c-format |
2998 | msgid "Failed to parse arguments: %s\n" |
2999 | -msgstr "" |
3000 | +msgstr "Zpracování parametrů se nezdařilo: %s\n" |
3001 | |
3002 | -#: ../src/xfdesktop-application.c:807 |
3003 | +#: ../src/xfdesktop-application.c:806 |
3004 | #, c-format |
3005 | msgid "This is %s version %s, running on Xfce %s.\n" |
3006 | -msgstr "" |
3007 | +msgstr "Toto je aplikace %s ve verzi %s, spuštěná v prostředí %s.\n" |
3008 | |
3009 | -#: ../src/xfdesktop-application.c:809 |
3010 | +#: ../src/xfdesktop-application.c:808 |
3011 | #, c-format |
3012 | msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." |
3013 | -msgstr "" |
3014 | +msgstr "Sestaveno s GTK+ %d.%d.%d, slinkováno s GTK+ %d.%d.%d." |
3015 | + |
3016 | +#: ../src/xfdesktop-application.c:812 |
3017 | +#, c-format |
3018 | +msgid "Build options:\n" |
3019 | +msgstr "Volby při sestavování:\n" |
3020 | |
3021 | #: ../src/xfdesktop-application.c:813 |
3022 | #, c-format |
3023 | -msgid "Build options:\n" |
3024 | -msgstr "" |
3025 | - |
3026 | -#: ../src/xfdesktop-application.c:814 |
3027 | -#, c-format |
3028 | msgid " Desktop Menu: %s\n" |
3029 | -msgstr "" |
3030 | +msgstr "Hlavní nabídka: %s\n" |
3031 | |
3032 | -#: ../src/xfdesktop-application.c:816 ../src/xfdesktop-application.c:823 |
3033 | -#: ../src/xfdesktop-application.c:830 |
3034 | +#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 |
3035 | +#: ../src/xfdesktop-application.c:829 |
3036 | msgid "enabled" |
3037 | -msgstr "" |
3038 | +msgstr "povoleno" |
3039 | |
3040 | -#: ../src/xfdesktop-application.c:818 ../src/xfdesktop-application.c:825 |
3041 | -#: ../src/xfdesktop-application.c:832 |
3042 | +#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 |
3043 | +#: ../src/xfdesktop-application.c:831 |
3044 | msgid "disabled" |
3045 | -msgstr "" |
3046 | +msgstr "zakázáno" |
3047 | |
3048 | -#: ../src/xfdesktop-application.c:821 |
3049 | +#: ../src/xfdesktop-application.c:820 |
3050 | #, c-format |
3051 | msgid " Desktop Icons: %s\n" |
3052 | -msgstr "" |
3053 | +msgstr "Ikony plochy: %s\n" |
3054 | |
3055 | -#: ../src/xfdesktop-application.c:828 |
3056 | +#: ../src/xfdesktop-application.c:827 |
3057 | #, c-format |
3058 | msgid " Desktop File Icons: %s\n" |
3059 | -msgstr "" |
3060 | +msgstr "Ikony souborů plochy: %s\n" |
3061 | |
3062 | #: ../src/xfdesktop-file-icon-manager.c:578 |
3063 | #: ../src/xfdesktop-file-icon-manager.c:595 |
3064 | @@ -677,8 +682,8 @@ |
3065 | msgstr "_Otevřít v novém okně" |
3066 | |
3067 | #: ../src/xfdesktop-file-icon-manager.c:1411 |
3068 | -#: ../src/xfdesktop-special-file-icon.c:550 ../src/xfdesktop-volume-icon.c:814 |
3069 | -#: ../src/xfdesktop-volume-icon.c:818 |
3070 | +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 |
3071 | +#: ../src/xfdesktop-volume-icon.c:814 |
3072 | msgid "_Open" |
3073 | msgstr "_Otevřít" |
3074 | |
3075 | @@ -735,27 +740,27 @@ |
3076 | msgstr "_Nastavení plochy..." |
3077 | |
3078 | #: ../src/xfdesktop-file-icon-manager.c:1754 |
3079 | -#: ../src/xfdesktop-volume-icon.c:860 |
3080 | +#: ../src/xfdesktop-volume-icon.c:856 |
3081 | msgid "P_roperties..." |
3082 | msgstr "_Vlastnosti..." |
3083 | |
3084 | -#: ../src/xfdesktop-file-icon-manager.c:2747 |
3085 | +#: ../src/xfdesktop-file-icon-manager.c:2744 |
3086 | msgid "Load Error" |
3087 | msgstr "Chyba při načítání" |
3088 | |
3089 | -#: ../src/xfdesktop-file-icon-manager.c:2749 |
3090 | +#: ../src/xfdesktop-file-icon-manager.c:2746 |
3091 | msgid "Failed to load the desktop folder" |
3092 | msgstr "Složku pracovní plochu se nepodařilo načíst" |
3093 | |
3094 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
3095 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
3096 | msgid "Copy _Here" |
3097 | msgstr "_Zkopírovat sem" |
3098 | |
3099 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
3100 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
3101 | msgid "_Move Here" |
3102 | msgstr "_Přesunout sem" |
3103 | |
3104 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
3105 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
3106 | msgid "_Link Here" |
3107 | msgstr "_Vytvořit zde odkaz" |
3108 | |
3109 | @@ -923,7 +928,7 @@ |
3110 | msgid "Eject Finished" |
3111 | msgstr "Vysunout dokončené" |
3112 | |
3113 | -#: ../src/xfdesktop-regular-file-icon.c:606 |
3114 | +#: ../src/xfdesktop-regular-file-icon.c:603 |
3115 | #, c-format |
3116 | msgid "" |
3117 | "Type: %s\n" |
3118 | @@ -949,7 +954,7 @@ |
3119 | msgid "Trash contains %d items" |
3120 | msgstr "Koš obsahuje %d položek" |
3121 | |
3122 | -#: ../src/xfdesktop-special-file-icon.c:498 |
3123 | +#: ../src/xfdesktop-special-file-icon.c:495 |
3124 | #, c-format |
3125 | msgid "" |
3126 | "%s\n" |
3127 | @@ -957,11 +962,11 @@ |
3128 | "Last modified: %s" |
3129 | msgstr "%s\nVelikost: %s\nPoslední změna: %s" |
3130 | |
3131 | -#: ../src/xfdesktop-special-file-icon.c:567 |
3132 | +#: ../src/xfdesktop-special-file-icon.c:564 |
3133 | msgid "_Empty Trash" |
3134 | msgstr "_Vysypat koš" |
3135 | |
3136 | -#: ../src/xfdesktop-volume-icon.c:486 |
3137 | +#: ../src/xfdesktop-volume-icon.c:482 |
3138 | #, c-format |
3139 | msgid "" |
3140 | "Removable Volume\n" |
3141 | @@ -969,39 +974,39 @@ |
3142 | "%s left (%s total)" |
3143 | msgstr " Vyměnitelný svazek\nBod připojení: %s\n%s volného místa (%s celkem)" |
3144 | |
3145 | -#: ../src/xfdesktop-volume-icon.c:493 |
3146 | +#: ../src/xfdesktop-volume-icon.c:489 |
3147 | msgid "" |
3148 | "Removable Volume\n" |
3149 | "Not mounted yet" |
3150 | msgstr "Vyměnitelný svazek\nDosud nepřipojeno" |
3151 | |
3152 | -#: ../src/xfdesktop-volume-icon.c:522 ../src/xfdesktop-volume-icon.c:567 |
3153 | +#: ../src/xfdesktop-volume-icon.c:518 ../src/xfdesktop-volume-icon.c:563 |
3154 | #, c-format |
3155 | msgid "Failed to eject \"%s\"" |
3156 | msgstr "Vysunutí \"%s\" se nezdařilo" |
3157 | |
3158 | -#: ../src/xfdesktop-volume-icon.c:527 ../src/xfdesktop-volume-icon.c:572 |
3159 | +#: ../src/xfdesktop-volume-icon.c:523 ../src/xfdesktop-volume-icon.c:568 |
3160 | msgid "Eject Failed" |
3161 | msgstr "Vysunutí se nezdařilo" |
3162 | |
3163 | -#: ../src/xfdesktop-volume-icon.c:604 |
3164 | +#: ../src/xfdesktop-volume-icon.c:600 |
3165 | #, c-format |
3166 | msgid "Failed to mount \"%s\"" |
3167 | msgstr "Připojení \"%s\" se nezdařilo" |
3168 | |
3169 | -#: ../src/xfdesktop-volume-icon.c:607 |
3170 | +#: ../src/xfdesktop-volume-icon.c:603 |
3171 | msgid "Mount Failed" |
3172 | msgstr "Připojení se nezdařilo" |
3173 | |
3174 | -#: ../src/xfdesktop-volume-icon.c:833 |
3175 | +#: ../src/xfdesktop-volume-icon.c:829 |
3176 | msgid "E_ject Volume" |
3177 | msgstr "_Vysunout svazek" |
3178 | |
3179 | -#: ../src/xfdesktop-volume-icon.c:840 |
3180 | +#: ../src/xfdesktop-volume-icon.c:836 |
3181 | msgid "_Unmount Volume" |
3182 | msgstr "_Odpojit svazek" |
3183 | |
3184 | -#: ../src/xfdesktop-volume-icon.c:847 |
3185 | +#: ../src/xfdesktop-volume-icon.c:843 |
3186 | msgid "_Mount Volume" |
3187 | msgstr "_Připojit svazek" |
3188 | |
3189 | |
3190 | === modified file 'po/de.po' |
3191 | --- po/de.po 2014-01-14 11:47:53 +0000 |
3192 | +++ po/de.po 2014-02-20 05:04:01 +0000 |
3193 | @@ -4,16 +4,18 @@ |
3194 | # |
3195 | # Translators: |
3196 | # Benedikt Meurer <benny@xfce.org>, 2003 |
3197 | +# gem <eckert.georg@gmx.de>, 2013 |
3198 | # Mario Blättermann <mario.blaettermann@gmail.com>, 2012 |
3199 | # Moritz Heiber <moe@xfce.org>, 2004 |
3200 | # Nico Schümann <nico@prog.nico22.de>, 2007 |
3201 | +# to_ba, 2014 |
3202 | msgid "" |
3203 | msgstr "" |
3204 | "Project-Id-Version: Xfdesktop\n" |
3205 | "Report-Msgid-Bugs-To: \n" |
3206 | -"POT-Creation-Date: 2013-11-15 00:31+0100\n" |
3207 | -"PO-Revision-Date: 2013-11-19 13:41+0000\n" |
3208 | -"Last-Translator: Xfce <transifex@xfce.org>\n" |
3209 | +"POT-Creation-Date: 2013-12-15 00:31+0100\n" |
3210 | +"PO-Revision-Date: 2014-01-07 20:04+0000\n" |
3211 | +"Last-Translator: to_ba\n" |
3212 | "Language-Team: German (http://www.transifex.com/projects/p/xfce/language/de/)\n" |
3213 | "MIME-Version: 1.0\n" |
3214 | "Content-Type: text/plain; charset=UTF-8\n" |
3215 | @@ -21,135 +23,135 @@ |
3216 | "Language: de\n" |
3217 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
3218 | |
3219 | -#: ../settings/main.c:371 ../src/xfdesktop-special-file-icon.c:295 |
3220 | +#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 |
3221 | #: ../src/xfdesktop-special-file-icon.c:479 |
3222 | msgid "Home" |
3223 | msgstr "Persönlicher Ordner" |
3224 | |
3225 | -#: ../settings/main.c:373 |
3226 | +#: ../settings/main.c:374 |
3227 | msgid "Filesystem" |
3228 | msgstr "Dateisystem" |
3229 | |
3230 | -#: ../settings/main.c:375 |
3231 | +#: ../settings/main.c:376 |
3232 | msgid "Trash" |
3233 | msgstr "Papierkorb" |
3234 | |
3235 | -#: ../settings/main.c:377 |
3236 | +#: ../settings/main.c:378 |
3237 | msgid "Removable Devices" |
3238 | msgstr "Entfernbare Datenträger" |
3239 | |
3240 | -#: ../settings/main.c:379 |
3241 | +#: ../settings/main.c:380 |
3242 | msgid "Network Shares" |
3243 | -msgstr "" |
3244 | +msgstr "Netzwerkfreigaben" |
3245 | |
3246 | -#: ../settings/main.c:381 |
3247 | +#: ../settings/main.c:382 |
3248 | msgid "Disks and Drives" |
3249 | msgstr "" |
3250 | |
3251 | -#: ../settings/main.c:383 |
3252 | +#: ../settings/main.c:384 |
3253 | msgid "Other Items" |
3254 | msgstr "" |
3255 | |
3256 | #. Display the file name, file type, and file size in the tooltip. |
3257 | -#: ../settings/main.c:496 |
3258 | +#: ../settings/main.c:497 |
3259 | #, c-format |
3260 | msgid "" |
3261 | "<b>%s</b>\n" |
3262 | "Type: %s\n" |
3263 | "Size: %s" |
3264 | -msgstr "" |
3265 | +msgstr "<b>%s</b>\nTyp: %s\nGröße: %s" |
3266 | |
3267 | -#: ../settings/main.c:680 |
3268 | +#: ../settings/main.c:681 |
3269 | #, c-format |
3270 | msgid "Wallpaper for Monitor %d (%s)" |
3271 | -msgstr "" |
3272 | +msgstr "Hintergrundbild für Bildschirm %d (%s)" |
3273 | |
3274 | -#: ../settings/main.c:683 |
3275 | +#: ../settings/main.c:684 |
3276 | #, c-format |
3277 | msgid "Wallpaper for Monitor %d" |
3278 | -msgstr "" |
3279 | +msgstr "Hintergrundbild für Bildschirm %d" |
3280 | |
3281 | -#: ../settings/main.c:689 |
3282 | +#: ../settings/main.c:690 |
3283 | msgid "" |
3284 | "You are using more than one display, move this dialog to the display you " |
3285 | "want to edit the settings for." |
3286 | msgstr "" |
3287 | |
3288 | -#: ../settings/main.c:697 |
3289 | +#: ../settings/main.c:698 |
3290 | #, c-format |
3291 | msgid "Wallpaper for %s on Monitor %d (%s)" |
3292 | msgstr "" |
3293 | |
3294 | -#: ../settings/main.c:701 |
3295 | +#: ../settings/main.c:702 |
3296 | #, c-format |
3297 | msgid "Wallpaper for %s on Monitor %d" |
3298 | msgstr "" |
3299 | |
3300 | -#: ../settings/main.c:708 |
3301 | +#: ../settings/main.c:709 |
3302 | msgid "" |
3303 | "You are using more than one display, move this dialog to the display and " |
3304 | "workspace you want to edit the settings for." |
3305 | msgstr "" |
3306 | |
3307 | #. Single monitor and single workspace |
3308 | -#: ../settings/main.c:716 |
3309 | +#: ../settings/main.c:717 |
3310 | #, c-format |
3311 | msgid "Wallpaper for my desktop" |
3312 | -msgstr "" |
3313 | +msgstr "Hintergrundbild für meinen Schreibtisch" |
3314 | |
3315 | #. Single monitor and per workspace wallpaper |
3316 | -#: ../settings/main.c:722 |
3317 | +#: ../settings/main.c:723 |
3318 | #, c-format |
3319 | msgid "Wallpaper for %s" |
3320 | -msgstr "" |
3321 | +msgstr "Hintergrundbild für %s" |
3322 | |
3323 | -#: ../settings/main.c:727 |
3324 | +#: ../settings/main.c:728 |
3325 | msgid "Move this dialog to the workspace you want to edit the settings for." |
3326 | msgstr "" |
3327 | |
3328 | -#: ../settings/main.c:1130 |
3329 | +#: ../settings/main.c:1131 |
3330 | msgid "Image selection is unavailable while the image style is set to None." |
3331 | -msgstr "" |
3332 | +msgstr "Bildauswahl ist nicht verfügbar, während Stil auf \"kein Bild\" eingestellt ist." |
3333 | |
3334 | -#: ../settings/main.c:1482 |
3335 | +#: ../settings/main.c:1483 |
3336 | msgid "Spanning screens" |
3337 | msgstr "" |
3338 | |
3339 | -#: ../settings/main.c:1787 |
3340 | +#: ../settings/main.c:1788 |
3341 | msgid "Image files" |
3342 | msgstr "Bilddateien" |
3343 | |
3344 | -#: ../settings/main.c:1939 |
3345 | +#: ../settings/main.c:1945 |
3346 | msgid "Settings manager socket" |
3347 | msgstr "Socket für die Sitzungsverwaltung" |
3348 | |
3349 | -#: ../settings/main.c:1939 |
3350 | +#: ../settings/main.c:1945 |
3351 | msgid "SOCKET ID" |
3352 | msgstr "SOCKET-NUMMER" |
3353 | |
3354 | -#: ../settings/main.c:1940 |
3355 | +#: ../settings/main.c:1946 |
3356 | msgid "Version information" |
3357 | msgstr "Versionsinformation" |
3358 | |
3359 | -#: ../settings/main.c:1967 |
3360 | +#: ../settings/main.c:1973 |
3361 | #, c-format |
3362 | msgid "Type '%s --help' for usage." |
3363 | msgstr "Geben Sie »%s --help« ein, um Hinweise zur Verwendung zu erhalten." |
3364 | |
3365 | -#: ../settings/main.c:1979 |
3366 | +#: ../settings/main.c:1985 |
3367 | msgid "The Xfce development team. All rights reserved." |
3368 | msgstr "Das Entwicklungsteam von Xfce. Alle Rechte vorbehalten." |
3369 | |
3370 | -#: ../settings/main.c:1980 |
3371 | +#: ../settings/main.c:1986 |
3372 | #, c-format |
3373 | msgid "Please report bugs to <%s>." |
3374 | msgstr "Bitte melden Sie Fehler an <%s>." |
3375 | |
3376 | -#: ../settings/main.c:1987 |
3377 | +#: ../settings/main.c:1993 |
3378 | msgid "Desktop Settings" |
3379 | -msgstr "Hintergrundeinstellungen" |
3380 | +msgstr "Schreibtischeinstellungen" |
3381 | |
3382 | -#: ../settings/main.c:1989 |
3383 | +#: ../settings/main.c:1995 |
3384 | msgid "Unable to contact settings server" |
3385 | msgstr "Der Einstellungsdienst konnte nicht kontaktiert werden." |
3386 | |
3387 | @@ -159,7 +161,7 @@ |
3388 | |
3389 | #: ../settings/xfce-backdrop-settings.desktop.in.h:2 |
3390 | msgid "Set desktop background and menu and icon behaviour" |
3391 | -msgstr "Stellen Sie den Hintergrund des Schreibtischs sowie das Menü- und Symbolverhalten ein" |
3392 | +msgstr "Den Hintergrund des Schreibtischs sowie das Menü- und Symbolverhalten einstellen" |
3393 | |
3394 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 |
3395 | msgid "Solid color" |
3396 | @@ -179,7 +181,7 @@ |
3397 | |
3398 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:5 |
3399 | msgid "_Folder:" |
3400 | -msgstr "" |
3401 | +msgstr "_Ordner:" |
3402 | |
3403 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 |
3404 | msgid "Choose the folder to select wallpapers from" |
3405 | @@ -224,7 +226,7 @@ |
3406 | |
3407 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:16 |
3408 | msgid "C_olor:" |
3409 | -msgstr "" |
3410 | +msgstr "_Farbe:" |
3411 | |
3412 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 |
3413 | msgid "Specify the style of the color drawn behind the backdrop image" |
3414 | @@ -265,31 +267,31 @@ |
3415 | |
3416 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 |
3417 | msgid "in seconds:" |
3418 | -msgstr "" |
3419 | +msgstr "In Sekunden:" |
3420 | |
3421 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:27 |
3422 | msgid "in minutes:" |
3423 | -msgstr "" |
3424 | +msgstr "In Minuten:" |
3425 | |
3426 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:28 |
3427 | msgid "in hours:" |
3428 | -msgstr "" |
3429 | +msgstr "In Stunden:" |
3430 | |
3431 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:29 |
3432 | msgid "at start up" |
3433 | -msgstr "" |
3434 | +msgstr "beim Start" |
3435 | |
3436 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:30 |
3437 | msgid "every hour" |
3438 | -msgstr "" |
3439 | +msgstr "jede Stunde" |
3440 | |
3441 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:31 |
3442 | msgid "every day" |
3443 | -msgstr "" |
3444 | +msgstr "jeden Tag" |
3445 | |
3446 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:32 |
3447 | msgid "chronologically" |
3448 | -msgstr "" |
3449 | +msgstr "chronologisch" |
3450 | |
3451 | #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 |
3452 | msgid "Amount of time before a different background is selected." |
3453 | @@ -337,13 +339,13 @@ |
3454 | msgid "File/launcher icons" |
3455 | msgstr "Datei-/Startersymbole" |
3456 | |
3457 | -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1016 |
3458 | +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 |
3459 | msgid "Desktop" |
3460 | msgstr "Schreibtisch" |
3461 | |
3462 | #: ../settings/xfdesktop-settings-ui.glade.h:11 |
3463 | msgid "Set desktop background and menu and icon behavior" |
3464 | -msgstr "Stellen Sie den Hintergrund des Schreibtischs sowie das Menü- und Symbolverhalten ein" |
3465 | +msgstr "Den Hintergrund des Schreibtischs sowie das Menü- und Symbolverhalten einstellen" |
3466 | |
3467 | #: ../settings/xfdesktop-settings-ui.glade.h:12 |
3468 | msgid "_Background" |
3469 | @@ -351,7 +353,7 @@ |
3470 | |
3471 | #: ../settings/xfdesktop-settings-ui.glade.h:13 |
3472 | msgid "Show applications menu on _desktop right click" |
3473 | -msgstr "_Programm-Menü bei Rechtsklick anzeigen" |
3474 | +msgstr "_Anwendungsmenü beim Rechtsklick auf dem Schreibtisch anzeigen" |
3475 | |
3476 | #: ../settings/xfdesktop-settings-ui.glade.h:14 |
3477 | msgid "_Button:" |
3478 | @@ -367,15 +369,15 @@ |
3479 | |
3480 | #: ../settings/xfdesktop-settings-ui.glade.h:17 |
3481 | msgid "_Edit desktop menu" |
3482 | -msgstr "_Menü bearbeiten" |
3483 | +msgstr "_Schreibtischmenü bearbeiten" |
3484 | |
3485 | #: ../settings/xfdesktop-settings-ui.glade.h:18 |
3486 | msgid "<b>Desktop Menu</b>" |
3487 | -msgstr "<b>Desktopmenü</b>" |
3488 | +msgstr "<b>Schreibtischmenü</b>" |
3489 | |
3490 | #: ../settings/xfdesktop-settings-ui.glade.h:19 |
3491 | msgid "Show _window list menu on desktop middle click" |
3492 | -msgstr "_Fensterliste bei Mittelklick anzeigen" |
3493 | +msgstr "_Fensterliste beim Mittelklick auf dem Schreibtisch anzeigen" |
3494 | |
3495 | #: ../settings/xfdesktop-settings-ui.glade.h:20 |
3496 | msgid "B_utton:" |
3497 | @@ -402,56 +404,60 @@ |
3498 | msgstr "_Klebrige Fenster nur auf der aktiven Arbeitsfläche zeigen" |
3499 | |
3500 | #: ../settings/xfdesktop-settings-ui.glade.h:26 |
3501 | +msgid "Show a_dd and remove workspace options in list" |
3502 | +msgstr "" |
3503 | + |
3504 | +#: ../settings/xfdesktop-settings-ui.glade.h:27 |
3505 | msgid "<b>Window List Menu</b>" |
3506 | msgstr "<b>Fensterliste</b>" |
3507 | |
3508 | -#: ../settings/xfdesktop-settings-ui.glade.h:27 |
3509 | +#: ../settings/xfdesktop-settings-ui.glade.h:28 |
3510 | msgid "_Menus" |
3511 | msgstr "_Menüs" |
3512 | |
3513 | -#: ../settings/xfdesktop-settings-ui.glade.h:28 |
3514 | +#: ../settings/xfdesktop-settings-ui.glade.h:29 |
3515 | msgid "Icon _type:" |
3516 | msgstr "Sy_mboltyp:" |
3517 | |
3518 | -#: ../settings/xfdesktop-settings-ui.glade.h:29 |
3519 | +#: ../settings/xfdesktop-settings-ui.glade.h:30 |
3520 | msgid "Icon _size:" |
3521 | msgstr "S_ymbolgröße:" |
3522 | |
3523 | -#: ../settings/xfdesktop-settings-ui.glade.h:30 |
3524 | +#: ../settings/xfdesktop-settings-ui.glade.h:31 |
3525 | msgid "Show t_humbnails" |
3526 | msgstr "Vorsc_haubilder anzeigen" |
3527 | |
3528 | -#: ../settings/xfdesktop-settings-ui.glade.h:31 |
3529 | +#: ../settings/xfdesktop-settings-ui.glade.h:32 |
3530 | msgid "" |
3531 | "Select this option to display preview-able files on the desktop as " |
3532 | "automatically generated thumbnail icons." |
3533 | -msgstr "Wählen Sie diese Option, um vorschaufähige Dateien auf dem Schreibtisch als automatisch erzeugte Vorschaubilder anzuzeigen." |
3534 | +msgstr "Diese Option wählen, um vorschaufähige Dateien auf dem Schreibtisch als automatisch erzeugte Vorschaubilder anzuzeigen." |
3535 | |
3536 | -#: ../settings/xfdesktop-settings-ui.glade.h:32 |
3537 | +#: ../settings/xfdesktop-settings-ui.glade.h:33 |
3538 | msgid "Single _click to activate items" |
3539 | msgstr "_Einfacher Klick zum Aktivieren von Objekten" |
3540 | |
3541 | -#: ../settings/xfdesktop-settings-ui.glade.h:33 |
3542 | +#: ../settings/xfdesktop-settings-ui.glade.h:34 |
3543 | msgid "Show icon tooltips. Size:" |
3544 | msgstr "" |
3545 | |
3546 | -#: ../settings/xfdesktop-settings-ui.glade.h:34 |
3547 | +#: ../settings/xfdesktop-settings-ui.glade.h:35 |
3548 | msgid "Size of the tooltip preview image." |
3549 | msgstr "" |
3550 | |
3551 | -#: ../settings/xfdesktop-settings-ui.glade.h:35 |
3552 | +#: ../settings/xfdesktop-settings-ui.glade.h:36 |
3553 | msgid "Use custom _font size:" |
3554 | msgstr "_Benutzerdefinierte Schriftgröße:" |
3555 | |
3556 | -#: ../settings/xfdesktop-settings-ui.glade.h:36 |
3557 | +#: ../settings/xfdesktop-settings-ui.glade.h:37 |
3558 | msgid "<b>Appearance</b>" |
3559 | msgstr "<b>Aussehen</b>" |
3560 | |
3561 | -#: ../settings/xfdesktop-settings-ui.glade.h:37 |
3562 | +#: ../settings/xfdesktop-settings-ui.glade.h:38 |
3563 | msgid "<b>Default Icons</b>" |
3564 | msgstr "<b>Standardsymbole</b>" |
3565 | |
3566 | -#: ../settings/xfdesktop-settings-ui.glade.h:38 |
3567 | +#: ../settings/xfdesktop-settings-ui.glade.h:39 |
3568 | msgid "_Icons" |
3569 | msgstr "_Symbole" |
3570 | |
3571 | @@ -459,142 +465,142 @@ |
3572 | msgid "_Applications" |
3573 | msgstr "_Anwendungen" |
3574 | |
3575 | -#: ../src/windowlist.c:72 |
3576 | +#: ../src/windowlist.c:73 |
3577 | #, c-format |
3578 | msgid "Remove Workspace %d" |
3579 | -msgstr "" |
3580 | +msgstr "Entferne Arbeitsfläche %d" |
3581 | |
3582 | -#: ../src/windowlist.c:73 |
3583 | +#: ../src/windowlist.c:74 |
3584 | #, c-format |
3585 | msgid "" |
3586 | "Do you really want to remove workspace %d?\n" |
3587 | "Note: You are currently on workspace %d." |
3588 | -msgstr "" |
3589 | +msgstr "Soll Arbeitsfläche %d wirklich entfernt werden?\nHinweis: Sie befinden sich momentan auf Arbeitsfläche %d." |
3590 | |
3591 | -#: ../src/windowlist.c:77 |
3592 | +#: ../src/windowlist.c:78 |
3593 | #, c-format |
3594 | msgid "Remove Workspace '%s'" |
3595 | -msgstr "" |
3596 | +msgstr "Entferne Arbeitsfläche '%s'" |
3597 | |
3598 | -#: ../src/windowlist.c:78 |
3599 | +#: ../src/windowlist.c:79 |
3600 | #, c-format |
3601 | msgid "" |
3602 | "Do you really want to remove workspace '%s'?\n" |
3603 | "Note: You are currently on workspace '%s'." |
3604 | -msgstr "" |
3605 | +msgstr "Soll Arbeitsfläche '%s' wirklich entfernt werden?\nHinweis: Sie befinden sich momentan auf Arbeitsfläche '%s'." |
3606 | |
3607 | #. Popup a dialog box confirming that the user wants to remove a |
3608 | #. * workspace |
3609 | -#: ../src/windowlist.c:85 |
3610 | +#: ../src/windowlist.c:86 |
3611 | msgid "Remove" |
3612 | -msgstr "" |
3613 | +msgstr "Entfernen" |
3614 | |
3615 | -#: ../src/windowlist.c:245 |
3616 | +#: ../src/windowlist.c:246 |
3617 | msgid "Window List" |
3618 | msgstr "Fensterliste" |
3619 | |
3620 | -#: ../src/windowlist.c:271 |
3621 | +#: ../src/windowlist.c:272 |
3622 | #, c-format |
3623 | msgid "<b>Workspace %d</b>" |
3624 | msgstr "<b>Arbeitsfläche %d</b>" |
3625 | |
3626 | -#: ../src/windowlist.c:360 ../src/windowlist.c:363 |
3627 | +#: ../src/windowlist.c:362 ../src/windowlist.c:365 |
3628 | msgid "_Add Workspace" |
3629 | msgstr "_Arbeitsfläche hinzufügen" |
3630 | |
3631 | -#: ../src/windowlist.c:371 |
3632 | +#: ../src/windowlist.c:373 |
3633 | #, c-format |
3634 | msgid "_Remove Workspace %d" |
3635 | msgstr "A_rbeitsfläche %d entfernen" |
3636 | |
3637 | -#: ../src/windowlist.c:374 |
3638 | +#: ../src/windowlist.c:376 |
3639 | #, c-format |
3640 | msgid "_Remove Workspace '%s'" |
3641 | msgstr "A_rbeitsfläche »%s« entfernen" |
3642 | |
3643 | +#: ../src/xfdesktop-application.c:772 |
3644 | +msgid "Display version information" |
3645 | +msgstr "" |
3646 | + |
3647 | #: ../src/xfdesktop-application.c:773 |
3648 | -msgid "Display version information" |
3649 | -msgstr "" |
3650 | +msgid "Reload all settings" |
3651 | +msgstr "Alle Einstellungen neu laden" |
3652 | |
3653 | #: ../src/xfdesktop-application.c:774 |
3654 | -msgid "Reload all settings" |
3655 | +msgid "Pop up the menu (at the current mouse position)" |
3656 | msgstr "" |
3657 | |
3658 | #: ../src/xfdesktop-application.c:775 |
3659 | -msgid "Pop up the menu (at the current mouse position)" |
3660 | -msgstr "" |
3661 | - |
3662 | -#: ../src/xfdesktop-application.c:776 |
3663 | msgid "Pop up the window list (at the current mouse position)" |
3664 | msgstr "" |
3665 | |
3666 | -#: ../src/xfdesktop-application.c:778 |
3667 | +#: ../src/xfdesktop-application.c:777 |
3668 | msgid "Automatically arrange all the icons on the desktop" |
3669 | +msgstr "Die Symbole auf dem Schreibtisch automatisch anordnen" |
3670 | + |
3671 | +#: ../src/xfdesktop-application.c:779 |
3672 | +msgid "Do not wait for a window manager on startup" |
3673 | msgstr "" |
3674 | |
3675 | #: ../src/xfdesktop-application.c:780 |
3676 | -msgid "Do not wait for a window manager on startup" |
3677 | -msgstr "" |
3678 | - |
3679 | -#: ../src/xfdesktop-application.c:781 |
3680 | msgid "Cause xfdesktop to quit" |
3681 | -msgstr "" |
3682 | +msgstr "Xfdesktop beenden" |
3683 | |
3684 | -#: ../src/xfdesktop-application.c:796 |
3685 | +#: ../src/xfdesktop-application.c:795 |
3686 | #, c-format |
3687 | msgid "Failed to parse arguments: %s\n" |
3688 | msgstr "" |
3689 | |
3690 | -#: ../src/xfdesktop-application.c:807 |
3691 | +#: ../src/xfdesktop-application.c:806 |
3692 | #, c-format |
3693 | msgid "This is %s version %s, running on Xfce %s.\n" |
3694 | msgstr "" |
3695 | |
3696 | -#: ../src/xfdesktop-application.c:809 |
3697 | +#: ../src/xfdesktop-application.c:808 |
3698 | #, c-format |
3699 | msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." |
3700 | msgstr "" |
3701 | |
3702 | +#: ../src/xfdesktop-application.c:812 |
3703 | +#, c-format |
3704 | +msgid "Build options:\n" |
3705 | +msgstr "" |
3706 | + |
3707 | #: ../src/xfdesktop-application.c:813 |
3708 | #, c-format |
3709 | -msgid "Build options:\n" |
3710 | -msgstr "" |
3711 | - |
3712 | -#: ../src/xfdesktop-application.c:814 |
3713 | -#, c-format |
3714 | msgid " Desktop Menu: %s\n" |
3715 | -msgstr "" |
3716 | +msgstr "Schreibtischmenü: %s\n" |
3717 | |
3718 | -#: ../src/xfdesktop-application.c:816 ../src/xfdesktop-application.c:823 |
3719 | -#: ../src/xfdesktop-application.c:830 |
3720 | +#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 |
3721 | +#: ../src/xfdesktop-application.c:829 |
3722 | msgid "enabled" |
3723 | -msgstr "" |
3724 | +msgstr "aktiviert" |
3725 | |
3726 | -#: ../src/xfdesktop-application.c:818 ../src/xfdesktop-application.c:825 |
3727 | -#: ../src/xfdesktop-application.c:832 |
3728 | +#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 |
3729 | +#: ../src/xfdesktop-application.c:831 |
3730 | msgid "disabled" |
3731 | -msgstr "" |
3732 | +msgstr "deaktiviert" |
3733 | |
3734 | -#: ../src/xfdesktop-application.c:821 |
3735 | +#: ../src/xfdesktop-application.c:820 |
3736 | #, c-format |
3737 | msgid " Desktop Icons: %s\n" |
3738 | -msgstr "" |
3739 | +msgstr "Schreibtischsymbole: %s\n" |
3740 | |
3741 | -#: ../src/xfdesktop-application.c:828 |
3742 | +#: ../src/xfdesktop-application.c:827 |
3743 | #, c-format |
3744 | msgid " Desktop File Icons: %s\n" |
3745 | -msgstr "" |
3746 | +msgstr "Schreibtischdateisymbole: %s\n" |
3747 | |
3748 | #: ../src/xfdesktop-file-icon-manager.c:578 |
3749 | #: ../src/xfdesktop-file-icon-manager.c:595 |
3750 | #, c-format |
3751 | msgid "Could not create the desktop folder \"%s\"" |
3752 | -msgstr "Der Ordner mit Hintergrundbildern »%s« konnte nicht erstellt werden" |
3753 | +msgstr "Der Schreibtischordner »%s« konnte nicht erstellt werden" |
3754 | |
3755 | #: ../src/xfdesktop-file-icon-manager.c:583 |
3756 | #: ../src/xfdesktop-file-icon-manager.c:600 |
3757 | msgid "Desktop Folder Error" |
3758 | -msgstr "Fehler im Ordner »Desktop«" |
3759 | +msgstr "Fehler im Schreibtischordner" |
3760 | |
3761 | #: ../src/xfdesktop-file-icon-manager.c:602 |
3762 | msgid "" |
3763 | @@ -608,7 +614,7 @@ |
3764 | |
3765 | #: ../src/xfdesktop-file-icon-manager.c:686 ../src/xfdesktop-file-utils.c:770 |
3766 | msgid "The files could not be renamed" |
3767 | -msgstr "" |
3768 | +msgstr "Die Dateien konnten nicht umbenannt werden" |
3769 | |
3770 | #: ../src/xfdesktop-file-icon-manager.c:687 |
3771 | msgid "None of the icons selected support being renamed." |
3772 | @@ -677,8 +683,8 @@ |
3773 | msgstr "_In neuem Fenster öffnen" |
3774 | |
3775 | #: ../src/xfdesktop-file-icon-manager.c:1411 |
3776 | -#: ../src/xfdesktop-special-file-icon.c:550 ../src/xfdesktop-volume-icon.c:814 |
3777 | -#: ../src/xfdesktop-volume-icon.c:818 |
3778 | +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 |
3779 | +#: ../src/xfdesktop-volume-icon.c:814 |
3780 | msgid "_Open" |
3781 | msgstr "_Öffnen" |
3782 | |
3783 | @@ -735,27 +741,27 @@ |
3784 | msgstr "Schreibtischein_stellungen" |
3785 | |
3786 | #: ../src/xfdesktop-file-icon-manager.c:1754 |
3787 | -#: ../src/xfdesktop-volume-icon.c:860 |
3788 | +#: ../src/xfdesktop-volume-icon.c:856 |
3789 | msgid "P_roperties..." |
3790 | msgstr "_Eigenschaften …" |
3791 | |
3792 | -#: ../src/xfdesktop-file-icon-manager.c:2747 |
3793 | +#: ../src/xfdesktop-file-icon-manager.c:2744 |
3794 | msgid "Load Error" |
3795 | msgstr "Fehler beim Laden" |
3796 | |
3797 | -#: ../src/xfdesktop-file-icon-manager.c:2749 |
3798 | +#: ../src/xfdesktop-file-icon-manager.c:2746 |
3799 | msgid "Failed to load the desktop folder" |
3800 | -msgstr "Desktop-Ordner konnte nicht geladen werden" |
3801 | +msgstr "Schreibtischordner konnte nicht geladen werden" |
3802 | |
3803 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
3804 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
3805 | msgid "Copy _Here" |
3806 | msgstr "Hierher _kopieren" |
3807 | |
3808 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
3809 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
3810 | msgid "_Move Here" |
3811 | msgstr "Hierher _verschieben" |
3812 | |
3813 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
3814 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
3815 | msgid "_Link Here" |
3816 | msgstr "_Verknüpfung hier erstellen" |
3817 | |
3818 | @@ -794,11 +800,11 @@ |
3819 | |
3820 | #: ../src/xfdesktop-file-utils.c:675 |
3821 | msgid "Error" |
3822 | -msgstr "" |
3823 | +msgstr "Fehler" |
3824 | |
3825 | #: ../src/xfdesktop-file-utils.c:676 |
3826 | msgid "The requested operation could not be completed" |
3827 | -msgstr "" |
3828 | +msgstr "Die angeforderte Operation konnte nicht abgeschlossen werden" |
3829 | |
3830 | #: ../src/xfdesktop-file-utils.c:717 |
3831 | msgid "The file could not be renamed" |
3832 | @@ -901,12 +907,12 @@ |
3833 | |
3834 | #: ../src/xfdesktop-notify.c:221 |
3835 | msgid "Unmount Finished" |
3836 | -msgstr "" |
3837 | +msgstr "Gerät wurde ausgehängt" |
3838 | |
3839 | #: ../src/xfdesktop-notify.c:223 ../src/xfdesktop-notify.c:408 |
3840 | #, c-format |
3841 | msgid "The device \"%s\" has been safely removed from the system. " |
3842 | -msgstr "" |
3843 | +msgstr "Das Gerät \"%s\" wurde sicher vom System entfernt." |
3844 | |
3845 | #. TRANSLATORS: Please use the same translation here as in Thunar |
3846 | #: ../src/xfdesktop-notify.c:313 |
3847 | @@ -921,9 +927,9 @@ |
3848 | |
3849 | #: ../src/xfdesktop-notify.c:406 |
3850 | msgid "Eject Finished" |
3851 | -msgstr "" |
3852 | +msgstr "Gerät wurde ausgeworfen" |
3853 | |
3854 | -#: ../src/xfdesktop-regular-file-icon.c:606 |
3855 | +#: ../src/xfdesktop-regular-file-icon.c:603 |
3856 | #, c-format |
3857 | msgid "" |
3858 | "Type: %s\n" |
3859 | @@ -949,7 +955,7 @@ |
3860 | msgid "Trash contains %d items" |
3861 | msgstr "Der Papierkorb enthält %d Dateien." |
3862 | |
3863 | -#: ../src/xfdesktop-special-file-icon.c:498 |
3864 | +#: ../src/xfdesktop-special-file-icon.c:495 |
3865 | #, c-format |
3866 | msgid "" |
3867 | "%s\n" |
3868 | @@ -957,11 +963,11 @@ |
3869 | "Last modified: %s" |
3870 | msgstr "%s\nGröße: %s\nZuletzt bearbeitet: %s" |
3871 | |
3872 | -#: ../src/xfdesktop-special-file-icon.c:567 |
3873 | +#: ../src/xfdesktop-special-file-icon.c:564 |
3874 | msgid "_Empty Trash" |
3875 | msgstr "_Papierkorb leeren" |
3876 | |
3877 | -#: ../src/xfdesktop-volume-icon.c:486 |
3878 | +#: ../src/xfdesktop-volume-icon.c:482 |
3879 | #, c-format |
3880 | msgid "" |
3881 | "Removable Volume\n" |
3882 | @@ -969,39 +975,39 @@ |
3883 | "%s left (%s total)" |
3884 | msgstr "Entfernbarer Datenträger\nEinhängepunkt: %s\nVerfügbarer Speicherplatz: %s (von %s)" |
3885 | |
3886 | -#: ../src/xfdesktop-volume-icon.c:493 |
3887 | +#: ../src/xfdesktop-volume-icon.c:489 |
3888 | msgid "" |
3889 | "Removable Volume\n" |
3890 | "Not mounted yet" |
3891 | msgstr "Entfernbarer Datenträger\nNicht eingehängt" |
3892 | |
3893 | -#: ../src/xfdesktop-volume-icon.c:522 ../src/xfdesktop-volume-icon.c:567 |
3894 | +#: ../src/xfdesktop-volume-icon.c:518 ../src/xfdesktop-volume-icon.c:563 |
3895 | #, c-format |
3896 | msgid "Failed to eject \"%s\"" |
3897 | msgstr "»%s« konnte nicht ausgeworfen werden" |
3898 | |
3899 | -#: ../src/xfdesktop-volume-icon.c:527 ../src/xfdesktop-volume-icon.c:572 |
3900 | +#: ../src/xfdesktop-volume-icon.c:523 ../src/xfdesktop-volume-icon.c:568 |
3901 | msgid "Eject Failed" |
3902 | msgstr "Auswerfen fehlgeschlagen" |
3903 | |
3904 | -#: ../src/xfdesktop-volume-icon.c:604 |
3905 | +#: ../src/xfdesktop-volume-icon.c:600 |
3906 | #, c-format |
3907 | msgid "Failed to mount \"%s\"" |
3908 | msgstr "»%s« konnte nicht eingehängt werden" |
3909 | |
3910 | -#: ../src/xfdesktop-volume-icon.c:607 |
3911 | +#: ../src/xfdesktop-volume-icon.c:603 |
3912 | msgid "Mount Failed" |
3913 | msgstr "Einhängen fehlgeschlagen" |
3914 | |
3915 | -#: ../src/xfdesktop-volume-icon.c:833 |
3916 | +#: ../src/xfdesktop-volume-icon.c:829 |
3917 | msgid "E_ject Volume" |
3918 | msgstr "Datenträger aus_werfen" |
3919 | |
3920 | -#: ../src/xfdesktop-volume-icon.c:840 |
3921 | +#: ../src/xfdesktop-volume-icon.c:836 |
3922 | msgid "_Unmount Volume" |
3923 | msgstr "" |
3924 | |
3925 | -#: ../src/xfdesktop-volume-icon.c:847 |
3926 | +#: ../src/xfdesktop-volume-icon.c:843 |
3927 | msgid "_Mount Volume" |
3928 | msgstr "Datenträger _einhängen" |
3929 | |
3930 | |
3931 | === modified file 'po/en_AU.po' |
3932 | --- po/en_AU.po 2014-01-14 11:47:53 +0000 |
3933 | +++ po/en_AU.po 2014-02-20 05:04:01 +0000 |
3934 | @@ -3,13 +3,13 @@ |
3935 | # This file is distributed under the same license as the PACKAGE package. |
3936 | # |
3937 | # Translators: |
3938 | -# k3lt01 <keltoiboy@gmail.com>, 2013 |
3939 | +# k3lt01 <keltoiboy@gmail.com>, 2013-2014 |
3940 | msgid "" |
3941 | msgstr "" |
3942 | "Project-Id-Version: Xfdesktop\n" |
3943 | "Report-Msgid-Bugs-To: \n" |
3944 | -"POT-Creation-Date: 2013-11-15 00:31+0100\n" |
3945 | -"PO-Revision-Date: 2013-11-19 13:41+0000\n" |
3946 | +"POT-Creation-Date: 2013-12-15 00:31+0100\n" |
3947 | +"PO-Revision-Date: 2014-01-27 05:35+0000\n" |
3948 | "Last-Translator: k3lt01 <keltoiboy@gmail.com>\n" |
3949 | "Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce/language/en_AU/)\n" |
3950 | "MIME-Version: 1.0\n" |
3951 | @@ -18,37 +18,37 @@ |
3952 | "Language: en_AU\n" |
3953 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
3954 | |
3955 | -#: ../settings/main.c:371 ../src/xfdesktop-special-file-icon.c:295 |
3956 | +#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 |
3957 | #: ../src/xfdesktop-special-file-icon.c:479 |
3958 | msgid "Home" |
3959 | msgstr "Home" |
3960 | |
3961 | -#: ../settings/main.c:373 |
3962 | +#: ../settings/main.c:374 |
3963 | msgid "Filesystem" |
3964 | msgstr "Filesystem" |
3965 | |
3966 | -#: ../settings/main.c:375 |
3967 | +#: ../settings/main.c:376 |
3968 | msgid "Trash" |
3969 | msgstr "Rubbish" |
3970 | |
3971 | -#: ../settings/main.c:377 |
3972 | +#: ../settings/main.c:378 |
3973 | msgid "Removable Devices" |
3974 | msgstr "Removable Devices" |
3975 | |
3976 | -#: ../settings/main.c:379 |
3977 | +#: ../settings/main.c:380 |
3978 | msgid "Network Shares" |
3979 | msgstr "Network Shares" |
3980 | |
3981 | -#: ../settings/main.c:381 |
3982 | +#: ../settings/main.c:382 |
3983 | msgid "Disks and Drives" |
3984 | msgstr "Disks and Drives" |
3985 | |
3986 | -#: ../settings/main.c:383 |
3987 | +#: ../settings/main.c:384 |
3988 | msgid "Other Items" |
3989 | msgstr "Other Items" |
3990 | |
3991 | #. Display the file name, file type, and file size in the tooltip. |
3992 | -#: ../settings/main.c:496 |
3993 | +#: ../settings/main.c:497 |
3994 | #, c-format |
3995 | msgid "" |
3996 | "<b>%s</b>\n" |
3997 | @@ -56,97 +56,97 @@ |
3998 | "Size: %s" |
3999 | msgstr "<b>%s</b>\nType: %s\nSize: %s" |
4000 | |
4001 | -#: ../settings/main.c:680 |
4002 | +#: ../settings/main.c:681 |
4003 | #, c-format |
4004 | msgid "Wallpaper for Monitor %d (%s)" |
4005 | msgstr "Wallpaper for Monitor %d (%s)" |
4006 | |
4007 | -#: ../settings/main.c:683 |
4008 | +#: ../settings/main.c:684 |
4009 | #, c-format |
4010 | msgid "Wallpaper for Monitor %d" |
4011 | msgstr "Wallpaper for Monitor %d" |
4012 | |
4013 | -#: ../settings/main.c:689 |
4014 | +#: ../settings/main.c:690 |
4015 | msgid "" |
4016 | "You are using more than one display, move this dialog to the display you " |
4017 | "want to edit the settings for." |
4018 | msgstr "You are using more than one display, move this dialogue to the display you want to edit the settings for." |
4019 | |
4020 | -#: ../settings/main.c:697 |
4021 | +#: ../settings/main.c:698 |
4022 | #, c-format |
4023 | msgid "Wallpaper for %s on Monitor %d (%s)" |
4024 | msgstr "Wallpaper for %s on Monitor %d (%s)" |
4025 | |
4026 | -#: ../settings/main.c:701 |
4027 | +#: ../settings/main.c:702 |
4028 | #, c-format |
4029 | msgid "Wallpaper for %s on Monitor %d" |
4030 | msgstr "Wallpaper for %s on Monitor %d" |
4031 | |
4032 | -#: ../settings/main.c:708 |
4033 | +#: ../settings/main.c:709 |
4034 | msgid "" |
4035 | "You are using more than one display, move this dialog to the display and " |
4036 | "workspace you want to edit the settings for." |
4037 | msgstr "You are using more than one display, move this dialogue to the display and workspace you want to edit the settings for." |
4038 | |
4039 | #. Single monitor and single workspace |
4040 | -#: ../settings/main.c:716 |
4041 | +#: ../settings/main.c:717 |
4042 | #, c-format |
4043 | msgid "Wallpaper for my desktop" |
4044 | msgstr "Wallpaper for my desktop" |
4045 | |
4046 | #. Single monitor and per workspace wallpaper |
4047 | -#: ../settings/main.c:722 |
4048 | +#: ../settings/main.c:723 |
4049 | #, c-format |
4050 | msgid "Wallpaper for %s" |
4051 | msgstr "Wallpaper for %s" |
4052 | |
4053 | -#: ../settings/main.c:727 |
4054 | +#: ../settings/main.c:728 |
4055 | msgid "Move this dialog to the workspace you want to edit the settings for." |
4056 | msgstr "Move this dialogue to the workspace you want to edit the settings for." |
4057 | |
4058 | -#: ../settings/main.c:1130 |
4059 | +#: ../settings/main.c:1131 |
4060 | msgid "Image selection is unavailable while the image style is set to None." |
4061 | msgstr "Image selection is unavailable while the image style is set to None." |
4062 | |
4063 | -#: ../settings/main.c:1482 |
4064 | +#: ../settings/main.c:1483 |
4065 | msgid "Spanning screens" |
4066 | msgstr "Spanning screens" |
4067 | |
4068 | -#: ../settings/main.c:1787 |
4069 | +#: ../settings/main.c:1788 |
4070 | msgid "Image files" |
4071 | msgstr "Image files" |
4072 | |
4073 | -#: ../settings/main.c:1939 |
4074 | +#: ../settings/main.c:1945 |
4075 | msgid "Settings manager socket" |
4076 | msgstr "Settings manager socket" |
4077 | |
4078 | -#: ../settings/main.c:1939 |
4079 | +#: ../settings/main.c:1945 |
4080 | msgid "SOCKET ID" |
4081 | msgstr "SOCKET ID" |
4082 | |
4083 | -#: ../settings/main.c:1940 |
4084 | +#: ../settings/main.c:1946 |
4085 | msgid "Version information" |
4086 | msgstr "Version information" |
4087 | |
4088 | -#: ../settings/main.c:1967 |
4089 | +#: ../settings/main.c:1973 |
4090 | #, c-format |
4091 | msgid "Type '%s --help' for usage." |
4092 | msgstr "Type '%s --help' for usage." |
4093 | |
4094 | -#: ../settings/main.c:1979 |
4095 | +#: ../settings/main.c:1985 |
4096 | msgid "The Xfce development team. All rights reserved." |
4097 | msgstr "The Xfce development team. All rights reserved." |
4098 | |
4099 | -#: ../settings/main.c:1980 |
4100 | +#: ../settings/main.c:1986 |
4101 | #, c-format |
4102 | msgid "Please report bugs to <%s>." |
4103 | msgstr "Please report bugs to <%s>." |
4104 | |
4105 | -#: ../settings/main.c:1987 |
4106 | +#: ../settings/main.c:1993 |
4107 | msgid "Desktop Settings" |
4108 | msgstr "Desktop Settings" |
4109 | |
4110 | -#: ../settings/main.c:1989 |
4111 | +#: ../settings/main.c:1995 |
4112 | msgid "Unable to contact settings server" |
4113 | msgstr "Unable to contact settings server" |
4114 | |
4115 | @@ -334,7 +334,7 @@ |
4116 | msgid "File/launcher icons" |
4117 | msgstr "File/launcher icons" |
4118 | |
4119 | -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1016 |
4120 | +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 |
4121 | msgid "Desktop" |
4122 | msgstr "Desktop" |
4123 | |
4124 | @@ -399,56 +399,60 @@ |
4125 | msgstr "Show s_ticky windows only in active workspace" |
4126 | |
4127 | #: ../settings/xfdesktop-settings-ui.glade.h:26 |
4128 | +msgid "Show a_dd and remove workspace options in list" |
4129 | +msgstr "Show a_dd and remove workspace options in list" |
4130 | + |
4131 | +#: ../settings/xfdesktop-settings-ui.glade.h:27 |
4132 | msgid "<b>Window List Menu</b>" |
4133 | msgstr "<b>Window List Menu</b>" |
4134 | |
4135 | -#: ../settings/xfdesktop-settings-ui.glade.h:27 |
4136 | +#: ../settings/xfdesktop-settings-ui.glade.h:28 |
4137 | msgid "_Menus" |
4138 | msgstr "_Menus" |
4139 | |
4140 | -#: ../settings/xfdesktop-settings-ui.glade.h:28 |
4141 | +#: ../settings/xfdesktop-settings-ui.glade.h:29 |
4142 | msgid "Icon _type:" |
4143 | msgstr "Icon _type:" |
4144 | |
4145 | -#: ../settings/xfdesktop-settings-ui.glade.h:29 |
4146 | +#: ../settings/xfdesktop-settings-ui.glade.h:30 |
4147 | msgid "Icon _size:" |
4148 | msgstr "Icon _size:" |
4149 | |
4150 | -#: ../settings/xfdesktop-settings-ui.glade.h:30 |
4151 | +#: ../settings/xfdesktop-settings-ui.glade.h:31 |
4152 | msgid "Show t_humbnails" |
4153 | msgstr "Show t_humbnails" |
4154 | |
4155 | -#: ../settings/xfdesktop-settings-ui.glade.h:31 |
4156 | +#: ../settings/xfdesktop-settings-ui.glade.h:32 |
4157 | msgid "" |
4158 | "Select this option to display preview-able files on the desktop as " |
4159 | "automatically generated thumbnail icons." |
4160 | msgstr "Select this option to display preview-able files on the desktop as automatically generated thumbnail icons." |
4161 | |
4162 | -#: ../settings/xfdesktop-settings-ui.glade.h:32 |
4163 | +#: ../settings/xfdesktop-settings-ui.glade.h:33 |
4164 | msgid "Single _click to activate items" |
4165 | msgstr "Single _click to activate items" |
4166 | |
4167 | -#: ../settings/xfdesktop-settings-ui.glade.h:33 |
4168 | +#: ../settings/xfdesktop-settings-ui.glade.h:34 |
4169 | msgid "Show icon tooltips. Size:" |
4170 | msgstr "Show icon tooltips. Size:" |
4171 | |
4172 | -#: ../settings/xfdesktop-settings-ui.glade.h:34 |
4173 | +#: ../settings/xfdesktop-settings-ui.glade.h:35 |
4174 | msgid "Size of the tooltip preview image." |
4175 | msgstr "Size of the tooltip preview image." |
4176 | |
4177 | -#: ../settings/xfdesktop-settings-ui.glade.h:35 |
4178 | +#: ../settings/xfdesktop-settings-ui.glade.h:36 |
4179 | msgid "Use custom _font size:" |
4180 | msgstr "Use custom _font size:" |
4181 | |
4182 | -#: ../settings/xfdesktop-settings-ui.glade.h:36 |
4183 | +#: ../settings/xfdesktop-settings-ui.glade.h:37 |
4184 | msgid "<b>Appearance</b>" |
4185 | msgstr "<b>Appearance</b>" |
4186 | |
4187 | -#: ../settings/xfdesktop-settings-ui.glade.h:37 |
4188 | +#: ../settings/xfdesktop-settings-ui.glade.h:38 |
4189 | msgid "<b>Default Icons</b>" |
4190 | msgstr "<b>Default Icons</b>" |
4191 | |
4192 | -#: ../settings/xfdesktop-settings-ui.glade.h:38 |
4193 | +#: ../settings/xfdesktop-settings-ui.glade.h:39 |
4194 | msgid "_Icons" |
4195 | msgstr "_Icons" |
4196 | |
4197 | @@ -456,24 +460,24 @@ |
4198 | msgid "_Applications" |
4199 | msgstr "_Applications" |
4200 | |
4201 | -#: ../src/windowlist.c:72 |
4202 | +#: ../src/windowlist.c:73 |
4203 | #, c-format |
4204 | msgid "Remove Workspace %d" |
4205 | msgstr "Remove Workspace %d" |
4206 | |
4207 | -#: ../src/windowlist.c:73 |
4208 | +#: ../src/windowlist.c:74 |
4209 | #, c-format |
4210 | msgid "" |
4211 | "Do you really want to remove workspace %d?\n" |
4212 | "Note: You are currently on workspace %d." |
4213 | msgstr "Do you really want to remove workspace %d?\nNote: You are currently on workspace %d." |
4214 | |
4215 | -#: ../src/windowlist.c:77 |
4216 | +#: ../src/windowlist.c:78 |
4217 | #, c-format |
4218 | msgid "Remove Workspace '%s'" |
4219 | msgstr "Remove Workspace '%s'" |
4220 | |
4221 | -#: ../src/windowlist.c:78 |
4222 | +#: ../src/windowlist.c:79 |
4223 | #, c-format |
4224 | msgid "" |
4225 | "Do you really want to remove workspace '%s'?\n" |
4226 | @@ -482,102 +486,102 @@ |
4227 | |
4228 | #. Popup a dialog box confirming that the user wants to remove a |
4229 | #. * workspace |
4230 | -#: ../src/windowlist.c:85 |
4231 | +#: ../src/windowlist.c:86 |
4232 | msgid "Remove" |
4233 | msgstr "Remove" |
4234 | |
4235 | -#: ../src/windowlist.c:245 |
4236 | +#: ../src/windowlist.c:246 |
4237 | msgid "Window List" |
4238 | msgstr "Window List" |
4239 | |
4240 | -#: ../src/windowlist.c:271 |
4241 | +#: ../src/windowlist.c:272 |
4242 | #, c-format |
4243 | msgid "<b>Workspace %d</b>" |
4244 | msgstr "<b>Workspace %d</b>" |
4245 | |
4246 | -#: ../src/windowlist.c:360 ../src/windowlist.c:363 |
4247 | +#: ../src/windowlist.c:362 ../src/windowlist.c:365 |
4248 | msgid "_Add Workspace" |
4249 | msgstr "_Add Workspace" |
4250 | |
4251 | -#: ../src/windowlist.c:371 |
4252 | +#: ../src/windowlist.c:373 |
4253 | #, c-format |
4254 | msgid "_Remove Workspace %d" |
4255 | msgstr "_Remove Workspace %d" |
4256 | |
4257 | -#: ../src/windowlist.c:374 |
4258 | +#: ../src/windowlist.c:376 |
4259 | #, c-format |
4260 | msgid "_Remove Workspace '%s'" |
4261 | msgstr "_Remove Workspace '%s'" |
4262 | |
4263 | -#: ../src/xfdesktop-application.c:773 |
4264 | +#: ../src/xfdesktop-application.c:772 |
4265 | msgid "Display version information" |
4266 | msgstr "Display version information" |
4267 | |
4268 | -#: ../src/xfdesktop-application.c:774 |
4269 | +#: ../src/xfdesktop-application.c:773 |
4270 | msgid "Reload all settings" |
4271 | msgstr "Reload all settings" |
4272 | |
4273 | -#: ../src/xfdesktop-application.c:775 |
4274 | +#: ../src/xfdesktop-application.c:774 |
4275 | msgid "Pop up the menu (at the current mouse position)" |
4276 | msgstr "Pop up the menu (at the current mouse position)" |
4277 | |
4278 | -#: ../src/xfdesktop-application.c:776 |
4279 | +#: ../src/xfdesktop-application.c:775 |
4280 | msgid "Pop up the window list (at the current mouse position)" |
4281 | msgstr "Pop up the window list (at the current mouse position)" |
4282 | |
4283 | -#: ../src/xfdesktop-application.c:778 |
4284 | +#: ../src/xfdesktop-application.c:777 |
4285 | msgid "Automatically arrange all the icons on the desktop" |
4286 | msgstr "Automatically arrange all the icons on the desktop" |
4287 | |
4288 | -#: ../src/xfdesktop-application.c:780 |
4289 | +#: ../src/xfdesktop-application.c:779 |
4290 | msgid "Do not wait for a window manager on startup" |
4291 | msgstr "Do not wait for a window manager on startup" |
4292 | |
4293 | -#: ../src/xfdesktop-application.c:781 |
4294 | +#: ../src/xfdesktop-application.c:780 |
4295 | msgid "Cause xfdesktop to quit" |
4296 | msgstr "Cause xfdesktop to quit" |
4297 | |
4298 | -#: ../src/xfdesktop-application.c:796 |
4299 | +#: ../src/xfdesktop-application.c:795 |
4300 | #, c-format |
4301 | msgid "Failed to parse arguments: %s\n" |
4302 | msgstr "Failed to parse arguments: %s\n" |
4303 | |
4304 | -#: ../src/xfdesktop-application.c:807 |
4305 | +#: ../src/xfdesktop-application.c:806 |
4306 | #, c-format |
4307 | msgid "This is %s version %s, running on Xfce %s.\n" |
4308 | msgstr "This is %s version %s, running on Xfce %s.\n" |
4309 | |
4310 | -#: ../src/xfdesktop-application.c:809 |
4311 | +#: ../src/xfdesktop-application.c:808 |
4312 | #, c-format |
4313 | msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." |
4314 | msgstr "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." |
4315 | |
4316 | -#: ../src/xfdesktop-application.c:813 |
4317 | +#: ../src/xfdesktop-application.c:812 |
4318 | #, c-format |
4319 | msgid "Build options:\n" |
4320 | msgstr "Build options:\n" |
4321 | |
4322 | -#: ../src/xfdesktop-application.c:814 |
4323 | +#: ../src/xfdesktop-application.c:813 |
4324 | #, c-format |
4325 | msgid " Desktop Menu: %s\n" |
4326 | msgstr " Desktop Menu: %s\n" |
4327 | |
4328 | -#: ../src/xfdesktop-application.c:816 ../src/xfdesktop-application.c:823 |
4329 | -#: ../src/xfdesktop-application.c:830 |
4330 | +#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 |
4331 | +#: ../src/xfdesktop-application.c:829 |
4332 | msgid "enabled" |
4333 | msgstr "enabled" |
4334 | |
4335 | -#: ../src/xfdesktop-application.c:818 ../src/xfdesktop-application.c:825 |
4336 | -#: ../src/xfdesktop-application.c:832 |
4337 | +#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 |
4338 | +#: ../src/xfdesktop-application.c:831 |
4339 | msgid "disabled" |
4340 | msgstr "disabled" |
4341 | |
4342 | -#: ../src/xfdesktop-application.c:821 |
4343 | +#: ../src/xfdesktop-application.c:820 |
4344 | #, c-format |
4345 | msgid " Desktop Icons: %s\n" |
4346 | msgstr " Desktop Icons: %s\n" |
4347 | |
4348 | -#: ../src/xfdesktop-application.c:828 |
4349 | +#: ../src/xfdesktop-application.c:827 |
4350 | #, c-format |
4351 | msgid " Desktop File Icons: %s\n" |
4352 | msgstr " Desktop File Icons: %s\n" |
4353 | @@ -674,8 +678,8 @@ |
4354 | msgstr "_Open in New Window" |
4355 | |
4356 | #: ../src/xfdesktop-file-icon-manager.c:1411 |
4357 | -#: ../src/xfdesktop-special-file-icon.c:550 ../src/xfdesktop-volume-icon.c:814 |
4358 | -#: ../src/xfdesktop-volume-icon.c:818 |
4359 | +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 |
4360 | +#: ../src/xfdesktop-volume-icon.c:814 |
4361 | msgid "_Open" |
4362 | msgstr "_Open" |
4363 | |
4364 | @@ -732,27 +736,27 @@ |
4365 | msgstr "Desktop _Settings..." |
4366 | |
4367 | #: ../src/xfdesktop-file-icon-manager.c:1754 |
4368 | -#: ../src/xfdesktop-volume-icon.c:860 |
4369 | +#: ../src/xfdesktop-volume-icon.c:856 |
4370 | msgid "P_roperties..." |
4371 | msgstr "P_roperties..." |
4372 | |
4373 | -#: ../src/xfdesktop-file-icon-manager.c:2747 |
4374 | +#: ../src/xfdesktop-file-icon-manager.c:2744 |
4375 | msgid "Load Error" |
4376 | msgstr "Load Error" |
4377 | |
4378 | -#: ../src/xfdesktop-file-icon-manager.c:2749 |
4379 | +#: ../src/xfdesktop-file-icon-manager.c:2746 |
4380 | msgid "Failed to load the desktop folder" |
4381 | msgstr "Failed to load the desktop folder" |
4382 | |
4383 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
4384 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
4385 | msgid "Copy _Here" |
4386 | msgstr "Copy _Here" |
4387 | |
4388 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
4389 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
4390 | msgid "_Move Here" |
4391 | msgstr "_Move Here" |
4392 | |
4393 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
4394 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
4395 | msgid "_Link Here" |
4396 | msgstr "_Link Here" |
4397 | |
4398 | @@ -920,7 +924,7 @@ |
4399 | msgid "Eject Finished" |
4400 | msgstr "Eject Finished" |
4401 | |
4402 | -#: ../src/xfdesktop-regular-file-icon.c:606 |
4403 | +#: ../src/xfdesktop-regular-file-icon.c:603 |
4404 | #, c-format |
4405 | msgid "" |
4406 | "Type: %s\n" |
4407 | @@ -946,7 +950,7 @@ |
4408 | msgid "Trash contains %d items" |
4409 | msgstr "Rubbish contains %d items" |
4410 | |
4411 | -#: ../src/xfdesktop-special-file-icon.c:498 |
4412 | +#: ../src/xfdesktop-special-file-icon.c:495 |
4413 | #, c-format |
4414 | msgid "" |
4415 | "%s\n" |
4416 | @@ -954,11 +958,11 @@ |
4417 | "Last modified: %s" |
4418 | msgstr "%s\nSize: %s\nLast modified: %s" |
4419 | |
4420 | -#: ../src/xfdesktop-special-file-icon.c:567 |
4421 | +#: ../src/xfdesktop-special-file-icon.c:564 |
4422 | msgid "_Empty Trash" |
4423 | msgstr "_Empty Rubbish" |
4424 | |
4425 | -#: ../src/xfdesktop-volume-icon.c:486 |
4426 | +#: ../src/xfdesktop-volume-icon.c:482 |
4427 | #, c-format |
4428 | msgid "" |
4429 | "Removable Volume\n" |
4430 | @@ -966,39 +970,39 @@ |
4431 | "%s left (%s total)" |
4432 | msgstr "Removable Volume\nMounted in \"%s\"\n%s left (%s total)" |
4433 | |
4434 | -#: ../src/xfdesktop-volume-icon.c:493 |
4435 | +#: ../src/xfdesktop-volume-icon.c:489 |
4436 | msgid "" |
4437 | "Removable Volume\n" |
4438 | "Not mounted yet" |
4439 | msgstr "Removable Volume\nNot mounted yet" |
4440 | |
4441 | -#: ../src/xfdesktop-volume-icon.c:522 ../src/xfdesktop-volume-icon.c:567 |
4442 | +#: ../src/xfdesktop-volume-icon.c:518 ../src/xfdesktop-volume-icon.c:563 |
4443 | #, c-format |
4444 | msgid "Failed to eject \"%s\"" |
4445 | msgstr "Failed to eject \"%s\"" |
4446 | |
4447 | -#: ../src/xfdesktop-volume-icon.c:527 ../src/xfdesktop-volume-icon.c:572 |
4448 | +#: ../src/xfdesktop-volume-icon.c:523 ../src/xfdesktop-volume-icon.c:568 |
4449 | msgid "Eject Failed" |
4450 | msgstr "Eject Failed" |
4451 | |
4452 | -#: ../src/xfdesktop-volume-icon.c:604 |
4453 | +#: ../src/xfdesktop-volume-icon.c:600 |
4454 | #, c-format |
4455 | msgid "Failed to mount \"%s\"" |
4456 | msgstr "Failed to mount \"%s\"" |
4457 | |
4458 | -#: ../src/xfdesktop-volume-icon.c:607 |
4459 | +#: ../src/xfdesktop-volume-icon.c:603 |
4460 | msgid "Mount Failed" |
4461 | msgstr "Mount Failed" |
4462 | |
4463 | -#: ../src/xfdesktop-volume-icon.c:833 |
4464 | +#: ../src/xfdesktop-volume-icon.c:829 |
4465 | msgid "E_ject Volume" |
4466 | msgstr "E_ject Volume" |
4467 | |
4468 | -#: ../src/xfdesktop-volume-icon.c:840 |
4469 | +#: ../src/xfdesktop-volume-icon.c:836 |
4470 | msgid "_Unmount Volume" |
4471 | msgstr "_Unmount Volume" |
4472 | |
4473 | -#: ../src/xfdesktop-volume-icon.c:847 |
4474 | +#: ../src/xfdesktop-volume-icon.c:843 |
4475 | msgid "_Mount Volume" |
4476 | msgstr "_Mount Volume" |
4477 | |
4478 | |
4479 | === modified file 'po/es.po' |
4480 | --- po/es.po 2014-01-14 11:47:53 +0000 |
4481 | +++ po/es.po 2014-02-20 05:04:01 +0000 |
4482 | @@ -9,8 +9,8 @@ |
4483 | msgstr "" |
4484 | "Project-Id-Version: Xfdesktop\n" |
4485 | "Report-Msgid-Bugs-To: \n" |
4486 | -"POT-Creation-Date: 2013-11-15 00:31+0100\n" |
4487 | -"PO-Revision-Date: 2013-11-19 13:41+0000\n" |
4488 | +"POT-Creation-Date: 2013-12-15 00:31+0100\n" |
4489 | +"PO-Revision-Date: 2013-12-27 17:18+0000\n" |
4490 | "Last-Translator: Pablo Lezaeta <prflr88@gmail.com>\n" |
4491 | "Language-Team: Spanish (http://www.transifex.com/projects/p/xfce/language/es/)\n" |
4492 | "MIME-Version: 1.0\n" |
4493 | @@ -19,37 +19,37 @@ |
4494 | "Language: es\n" |
4495 | "Plural-Forms: nplurals=2; plural=(n != 1);\n" |
4496 | |
4497 | -#: ../settings/main.c:371 ../src/xfdesktop-special-file-icon.c:295 |
4498 | +#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 |
4499 | #: ../src/xfdesktop-special-file-icon.c:479 |
4500 | msgid "Home" |
4501 | msgstr "Carpeta personal" |
4502 | |
4503 | -#: ../settings/main.c:373 |
4504 | +#: ../settings/main.c:374 |
4505 | msgid "Filesystem" |
4506 | msgstr "Sistema de archivos" |
4507 | |
4508 | -#: ../settings/main.c:375 |
4509 | +#: ../settings/main.c:376 |
4510 | msgid "Trash" |
4511 | msgstr "Papelera" |
4512 | |
4513 | -#: ../settings/main.c:377 |
4514 | +#: ../settings/main.c:378 |
4515 | msgid "Removable Devices" |
4516 | msgstr "Dispositivos extraíbles" |
4517 | |
4518 | -#: ../settings/main.c:379 |
4519 | +#: ../settings/main.c:380 |
4520 | msgid "Network Shares" |
4521 | msgstr "Compartir redes" |
4522 | |
4523 | -#: ../settings/main.c:381 |
4524 | +#: ../settings/main.c:382 |
4525 | msgid "Disks and Drives" |
4526 | msgstr "Discos y dispositivos" |
4527 | |
4528 | -#: ../settings/main.c:383 |
4529 | +#: ../settings/main.c:384 |
4530 | msgid "Other Items" |
4531 | msgstr "Otros objetos" |
4532 | |
4533 | #. Display the file name, file type, and file size in the tooltip. |
4534 | -#: ../settings/main.c:496 |
4535 | +#: ../settings/main.c:497 |
4536 | #, c-format |
4537 | msgid "" |
4538 | "<b>%s</b>\n" |
4539 | @@ -57,97 +57,97 @@ |
4540 | "Size: %s" |
4541 | msgstr "<b>%s</b>\nTipo: %s\nTamaño: %s" |
4542 | |
4543 | -#: ../settings/main.c:680 |
4544 | +#: ../settings/main.c:681 |
4545 | #, c-format |
4546 | msgid "Wallpaper for Monitor %d (%s)" |
4547 | msgstr "Fondo de pantalla para el Monitor %d (%s)" |
4548 | |
4549 | -#: ../settings/main.c:683 |
4550 | +#: ../settings/main.c:684 |
4551 | #, c-format |
4552 | msgid "Wallpaper for Monitor %d" |
4553 | msgstr "Fondo de pantalla para el Monitor %d" |
4554 | |
4555 | -#: ../settings/main.c:689 |
4556 | +#: ../settings/main.c:690 |
4557 | msgid "" |
4558 | "You are using more than one display, move this dialog to the display you " |
4559 | "want to edit the settings for." |
4560 | msgstr "Está usando más de una pantalla, mueva este diálogo a la pantalla que desea modificar su configuración." |
4561 | |
4562 | -#: ../settings/main.c:697 |
4563 | +#: ../settings/main.c:698 |
4564 | #, c-format |
4565 | msgid "Wallpaper for %s on Monitor %d (%s)" |
4566 | msgstr "Fondo de pantalla para %s en el monitor %d (%s)" |
4567 | |
4568 | -#: ../settings/main.c:701 |
4569 | +#: ../settings/main.c:702 |
4570 | #, c-format |
4571 | msgid "Wallpaper for %s on Monitor %d" |
4572 | msgstr "Fondo de pantalla para %s en el monitor %d" |
4573 | |
4574 | -#: ../settings/main.c:708 |
4575 | +#: ../settings/main.c:709 |
4576 | msgid "" |
4577 | "You are using more than one display, move this dialog to the display and " |
4578 | "workspace you want to edit the settings for." |
4579 | msgstr "Está usando más de una pantalla, mueva este diálogo a la pantalla y área de trabajo que desea modificar su configuración." |
4580 | |
4581 | #. Single monitor and single workspace |
4582 | -#: ../settings/main.c:716 |
4583 | +#: ../settings/main.c:717 |
4584 | #, c-format |
4585 | msgid "Wallpaper for my desktop" |
4586 | msgstr "Fondo de pantalla para mi Escritorio" |
4587 | |
4588 | #. Single monitor and per workspace wallpaper |
4589 | -#: ../settings/main.c:722 |
4590 | +#: ../settings/main.c:723 |
4591 | #, c-format |
4592 | msgid "Wallpaper for %s" |
4593 | msgstr "Fondo de pantalla para %s" |
4594 | |
4595 | -#: ../settings/main.c:727 |
4596 | +#: ../settings/main.c:728 |
4597 | msgid "Move this dialog to the workspace you want to edit the settings for." |
4598 | msgstr "Mueva este diálogo al área de trabajo que desea modificar su configuración." |
4599 | |
4600 | -#: ../settings/main.c:1130 |
4601 | +#: ../settings/main.c:1131 |
4602 | msgid "Image selection is unavailable while the image style is set to None." |
4603 | msgstr "La selección de imágenes estará desactivada mientras el estilo utilizado sea None (Ninguno)." |
4604 | |
4605 | -#: ../settings/main.c:1482 |
4606 | +#: ../settings/main.c:1483 |
4607 | msgid "Spanning screens" |
4608 | msgstr "Extención de pantallas" |
4609 | |
4610 | -#: ../settings/main.c:1787 |
4611 | +#: ../settings/main.c:1788 |
4612 | msgid "Image files" |
4613 | msgstr "Archivos de imagen" |
4614 | |
4615 | -#: ../settings/main.c:1939 |
4616 | +#: ../settings/main.c:1945 |
4617 | msgid "Settings manager socket" |
4618 | msgstr "Entrada de administración de configuración" |
4619 | |
4620 | -#: ../settings/main.c:1939 |
4621 | +#: ../settings/main.c:1945 |
4622 | msgid "SOCKET ID" |
4623 | msgstr "ID de SOCKET" |
4624 | |
4625 | -#: ../settings/main.c:1940 |
4626 | +#: ../settings/main.c:1946 |
4627 | msgid "Version information" |
4628 | msgstr "Información de versión" |
4629 | |
4630 | -#: ../settings/main.c:1967 |
4631 | +#: ../settings/main.c:1973 |
4632 | #, c-format |
4633 | msgid "Type '%s --help' for usage." |
4634 | msgstr "Escriba '%s --help' para opciones de uso." |
4635 | |
4636 | -#: ../settings/main.c:1979 |
4637 | +#: ../settings/main.c:1985 |
4638 | msgid "The Xfce development team. All rights reserved." |
4639 | msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados." |
4640 | |
4641 | -#: ../settings/main.c:1980 |
4642 | +#: ../settings/main.c:1986 |
4643 | #, c-format |
4644 | msgid "Please report bugs to <%s>." |
4645 | msgstr "Por favor, informe de errores a <%s>." |
4646 | |
4647 | -#: ../settings/main.c:1987 |
4648 | +#: ../settings/main.c:1993 |
4649 | msgid "Desktop Settings" |
4650 | msgstr "Configuración del escritorio" |
4651 | |
4652 | -#: ../settings/main.c:1989 |
4653 | +#: ../settings/main.c:1995 |
4654 | msgid "Unable to contact settings server" |
4655 | msgstr "No se puede contactar con el servidor de configuración" |
4656 | |
4657 | @@ -335,7 +335,7 @@ |
4658 | msgid "File/launcher icons" |
4659 | msgstr "Iconos de archivo/lanzador" |
4660 | |
4661 | -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1016 |
4662 | +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 |
4663 | msgid "Desktop" |
4664 | msgstr "Escritorio" |
4665 | |
4666 | @@ -400,56 +400,60 @@ |
4667 | msgstr "Mostrar ventanas adhe_sivas sólo en el área de trabajo activa" |
4668 | |
4669 | #: ../settings/xfdesktop-settings-ui.glade.h:26 |
4670 | +msgid "Show a_dd and remove workspace options in list" |
4671 | +msgstr "Mostrar a_gregar y remover áreas de trabajo en la lista" |
4672 | + |
4673 | +#: ../settings/xfdesktop-settings-ui.glade.h:27 |
4674 | msgid "<b>Window List Menu</b>" |
4675 | msgstr "<b>Menú de lista de ventanas</b>" |
4676 | |
4677 | -#: ../settings/xfdesktop-settings-ui.glade.h:27 |
4678 | +#: ../settings/xfdesktop-settings-ui.glade.h:28 |
4679 | msgid "_Menus" |
4680 | msgstr "_Menús" |
4681 | |
4682 | -#: ../settings/xfdesktop-settings-ui.glade.h:28 |
4683 | +#: ../settings/xfdesktop-settings-ui.glade.h:29 |
4684 | msgid "Icon _type:" |
4685 | msgstr "_Tipo de icono:" |
4686 | |
4687 | -#: ../settings/xfdesktop-settings-ui.glade.h:29 |
4688 | +#: ../settings/xfdesktop-settings-ui.glade.h:30 |
4689 | msgid "Icon _size:" |
4690 | msgstr "Ta_maño de icono:" |
4691 | |
4692 | -#: ../settings/xfdesktop-settings-ui.glade.h:30 |
4693 | +#: ../settings/xfdesktop-settings-ui.glade.h:31 |
4694 | msgid "Show t_humbnails" |
4695 | msgstr "Mostrar mi_niaturas" |
4696 | |
4697 | -#: ../settings/xfdesktop-settings-ui.glade.h:31 |
4698 | +#: ../settings/xfdesktop-settings-ui.glade.h:32 |
4699 | msgid "" |
4700 | "Select this option to display preview-able files on the desktop as " |
4701 | "automatically generated thumbnail icons." |
4702 | msgstr "Seleccione ésta opción para mostrar una vista previa de archivos en el escritorio como iconos de miniaturas generados automaticamente." |
4703 | |
4704 | -#: ../settings/xfdesktop-settings-ui.glade.h:32 |
4705 | +#: ../settings/xfdesktop-settings-ui.glade.h:33 |
4706 | msgid "Single _click to activate items" |
4707 | msgstr "Un solo _clic para activar los elementos" |
4708 | |
4709 | -#: ../settings/xfdesktop-settings-ui.glade.h:33 |
4710 | +#: ../settings/xfdesktop-settings-ui.glade.h:34 |
4711 | msgid "Show icon tooltips. Size:" |
4712 | msgstr "Mostrar iconos en las descripciones emergentes. Tamaño:" |
4713 | |
4714 | -#: ../settings/xfdesktop-settings-ui.glade.h:34 |
4715 | +#: ../settings/xfdesktop-settings-ui.glade.h:35 |
4716 | msgid "Size of the tooltip preview image." |
4717 | msgstr "Tamaño de las previsualizaciones emergentes de las imágenes." |
4718 | |
4719 | -#: ../settings/xfdesktop-settings-ui.glade.h:35 |
4720 | +#: ../settings/xfdesktop-settings-ui.glade.h:36 |
4721 | msgid "Use custom _font size:" |
4722 | msgstr "Usar tamaño de _letra personalizado:" |
4723 | |
4724 | -#: ../settings/xfdesktop-settings-ui.glade.h:36 |
4725 | +#: ../settings/xfdesktop-settings-ui.glade.h:37 |
4726 | msgid "<b>Appearance</b>" |
4727 | msgstr "<b>Apariencia</b>" |
4728 | |
4729 | -#: ../settings/xfdesktop-settings-ui.glade.h:37 |
4730 | +#: ../settings/xfdesktop-settings-ui.glade.h:38 |
4731 | msgid "<b>Default Icons</b>" |
4732 | msgstr "<b>Iconos predeterminados</b>" |
4733 | |
4734 | -#: ../settings/xfdesktop-settings-ui.glade.h:38 |
4735 | +#: ../settings/xfdesktop-settings-ui.glade.h:39 |
4736 | msgid "_Icons" |
4737 | msgstr "_Iconos" |
4738 | |
4739 | @@ -457,24 +461,24 @@ |
4740 | msgid "_Applications" |
4741 | msgstr "_Aplicaciones" |
4742 | |
4743 | -#: ../src/windowlist.c:72 |
4744 | +#: ../src/windowlist.c:73 |
4745 | #, c-format |
4746 | msgid "Remove Workspace %d" |
4747 | msgstr "Eliminar Area de Trabajo %d" |
4748 | |
4749 | -#: ../src/windowlist.c:73 |
4750 | +#: ../src/windowlist.c:74 |
4751 | #, c-format |
4752 | msgid "" |
4753 | "Do you really want to remove workspace %d?\n" |
4754 | "Note: You are currently on workspace %d." |
4755 | msgstr "¿Realmente desea eliminar el área de trabajo %d?\nNota: Está actualmente en el área de trabajo %d." |
4756 | |
4757 | -#: ../src/windowlist.c:77 |
4758 | +#: ../src/windowlist.c:78 |
4759 | #, c-format |
4760 | msgid "Remove Workspace '%s'" |
4761 | msgstr "Eliminar Area de Trabajo '%s'" |
4762 | |
4763 | -#: ../src/windowlist.c:78 |
4764 | +#: ../src/windowlist.c:79 |
4765 | #, c-format |
4766 | msgid "" |
4767 | "Do you really want to remove workspace '%s'?\n" |
4768 | @@ -483,102 +487,102 @@ |
4769 | |
4770 | #. Popup a dialog box confirming that the user wants to remove a |
4771 | #. * workspace |
4772 | -#: ../src/windowlist.c:85 |
4773 | +#: ../src/windowlist.c:86 |
4774 | msgid "Remove" |
4775 | msgstr "Eliminar" |
4776 | |
4777 | -#: ../src/windowlist.c:245 |
4778 | +#: ../src/windowlist.c:246 |
4779 | msgid "Window List" |
4780 | msgstr "Lista de ventanas" |
4781 | |
4782 | -#: ../src/windowlist.c:271 |
4783 | +#: ../src/windowlist.c:272 |
4784 | #, c-format |
4785 | msgid "<b>Workspace %d</b>" |
4786 | msgstr "<b>Área de trabajo %d</b>" |
4787 | |
4788 | -#: ../src/windowlist.c:360 ../src/windowlist.c:363 |
4789 | +#: ../src/windowlist.c:362 ../src/windowlist.c:365 |
4790 | msgid "_Add Workspace" |
4791 | msgstr "_Añadir área de trabajo" |
4792 | |
4793 | -#: ../src/windowlist.c:371 |
4794 | +#: ../src/windowlist.c:373 |
4795 | #, c-format |
4796 | msgid "_Remove Workspace %d" |
4797 | msgstr "Elimina_r área de trabajo %d" |
4798 | |
4799 | -#: ../src/windowlist.c:374 |
4800 | +#: ../src/windowlist.c:376 |
4801 | #, c-format |
4802 | msgid "_Remove Workspace '%s'" |
4803 | msgstr "Elimina_r área de trabajo '%s'" |
4804 | |
4805 | -#: ../src/xfdesktop-application.c:773 |
4806 | +#: ../src/xfdesktop-application.c:772 |
4807 | msgid "Display version information" |
4808 | msgstr "Mostrar información de versión" |
4809 | |
4810 | -#: ../src/xfdesktop-application.c:774 |
4811 | +#: ../src/xfdesktop-application.c:773 |
4812 | msgid "Reload all settings" |
4813 | msgstr "Recargar todas las configuraciones" |
4814 | |
4815 | -#: ../src/xfdesktop-application.c:775 |
4816 | +#: ../src/xfdesktop-application.c:774 |
4817 | msgid "Pop up the menu (at the current mouse position)" |
4818 | msgstr "Mostrar el menú (en la posición actual del ratón)" |
4819 | |
4820 | -#: ../src/xfdesktop-application.c:776 |
4821 | +#: ../src/xfdesktop-application.c:775 |
4822 | msgid "Pop up the window list (at the current mouse position)" |
4823 | msgstr "Mostrar la lista de ventanas (en la posición actual del ratón)" |
4824 | |
4825 | -#: ../src/xfdesktop-application.c:778 |
4826 | +#: ../src/xfdesktop-application.c:777 |
4827 | msgid "Automatically arrange all the icons on the desktop" |
4828 | msgstr "Organizar automáticamente los iconos del escritorio" |
4829 | |
4830 | -#: ../src/xfdesktop-application.c:780 |
4831 | +#: ../src/xfdesktop-application.c:779 |
4832 | msgid "Do not wait for a window manager on startup" |
4833 | msgstr "No esperar a un gestor de ventanas al iniciar" |
4834 | |
4835 | -#: ../src/xfdesktop-application.c:781 |
4836 | +#: ../src/xfdesktop-application.c:780 |
4837 | msgid "Cause xfdesktop to quit" |
4838 | msgstr "Hace que xfdesktop termine" |
4839 | |
4840 | -#: ../src/xfdesktop-application.c:796 |
4841 | +#: ../src/xfdesktop-application.c:795 |
4842 | #, c-format |
4843 | msgid "Failed to parse arguments: %s\n" |
4844 | msgstr "Fallo al procesar argumentos: %s\n" |
4845 | |
4846 | -#: ../src/xfdesktop-application.c:807 |
4847 | +#: ../src/xfdesktop-application.c:806 |
4848 | #, c-format |
4849 | msgid "This is %s version %s, running on Xfce %s.\n" |
4850 | msgstr "Esto es %s version %s, ejecutándose en Xfce %s.\n" |
4851 | |
4852 | -#: ../src/xfdesktop-application.c:809 |
4853 | +#: ../src/xfdesktop-application.c:808 |
4854 | #, c-format |
4855 | msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." |
4856 | msgstr "Compilado con GTK+ %d.%d.%d, Enlazado con GTK+ %d.%d.%d." |
4857 | |
4858 | -#: ../src/xfdesktop-application.c:813 |
4859 | +#: ../src/xfdesktop-application.c:812 |
4860 | #, c-format |
4861 | msgid "Build options:\n" |
4862 | msgstr "Opciones de compilación:\n" |
4863 | |
4864 | -#: ../src/xfdesktop-application.c:814 |
4865 | +#: ../src/xfdesktop-application.c:813 |
4866 | #, c-format |
4867 | msgid " Desktop Menu: %s\n" |
4868 | msgstr "Menú del escritorio: %s\n" |
4869 | |
4870 | -#: ../src/xfdesktop-application.c:816 ../src/xfdesktop-application.c:823 |
4871 | -#: ../src/xfdesktop-application.c:830 |
4872 | +#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 |
4873 | +#: ../src/xfdesktop-application.c:829 |
4874 | msgid "enabled" |
4875 | msgstr "activado" |
4876 | |
4877 | -#: ../src/xfdesktop-application.c:818 ../src/xfdesktop-application.c:825 |
4878 | -#: ../src/xfdesktop-application.c:832 |
4879 | +#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 |
4880 | +#: ../src/xfdesktop-application.c:831 |
4881 | msgid "disabled" |
4882 | msgstr "desactivado" |
4883 | |
4884 | -#: ../src/xfdesktop-application.c:821 |
4885 | +#: ../src/xfdesktop-application.c:820 |
4886 | #, c-format |
4887 | msgid " Desktop Icons: %s\n" |
4888 | msgstr "Iconos de escritorio: %s\n" |
4889 | |
4890 | -#: ../src/xfdesktop-application.c:828 |
4891 | +#: ../src/xfdesktop-application.c:827 |
4892 | #, c-format |
4893 | msgid " Desktop File Icons: %s\n" |
4894 | msgstr "Iconos de archivos del escritorio: %s\n" |
4895 | @@ -675,8 +679,8 @@ |
4896 | msgstr "_Abrir en una nueva ventana" |
4897 | |
4898 | #: ../src/xfdesktop-file-icon-manager.c:1411 |
4899 | -#: ../src/xfdesktop-special-file-icon.c:550 ../src/xfdesktop-volume-icon.c:814 |
4900 | -#: ../src/xfdesktop-volume-icon.c:818 |
4901 | +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 |
4902 | +#: ../src/xfdesktop-volume-icon.c:814 |
4903 | msgid "_Open" |
4904 | msgstr "_Abrir" |
4905 | |
4906 | @@ -733,27 +737,27 @@ |
4907 | msgstr "_Configuración de escritorio..." |
4908 | |
4909 | #: ../src/xfdesktop-file-icon-manager.c:1754 |
4910 | -#: ../src/xfdesktop-volume-icon.c:860 |
4911 | +#: ../src/xfdesktop-volume-icon.c:856 |
4912 | msgid "P_roperties..." |
4913 | msgstr "P_ropiedades" |
4914 | |
4915 | -#: ../src/xfdesktop-file-icon-manager.c:2747 |
4916 | +#: ../src/xfdesktop-file-icon-manager.c:2744 |
4917 | msgid "Load Error" |
4918 | msgstr "Error al cargar" |
4919 | |
4920 | -#: ../src/xfdesktop-file-icon-manager.c:2749 |
4921 | +#: ../src/xfdesktop-file-icon-manager.c:2746 |
4922 | msgid "Failed to load the desktop folder" |
4923 | msgstr "Error al cargar la carpeta de escritorio" |
4924 | |
4925 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
4926 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
4927 | msgid "Copy _Here" |
4928 | msgstr "Copiar _aquí" |
4929 | |
4930 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
4931 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
4932 | msgid "_Move Here" |
4933 | msgstr "_Mover aquí" |
4934 | |
4935 | -#: ../src/xfdesktop-file-icon-manager.c:3289 |
4936 | +#: ../src/xfdesktop-file-icon-manager.c:3286 |
4937 | msgid "_Link Here" |
4938 | msgstr "_Enlazar Acá" |
4939 | |
4940 | @@ -921,7 +925,7 @@ |
4941 | msgid "Eject Finished" |
4942 | msgstr "Expulsión finalizada" |
4943 | |
4944 | -#: ../src/xfdesktop-regular-file-icon.c:606 |
4945 | +#: ../src/xfdesktop-regular-file-icon.c:603 |
4946 | #, c-format |
4947 | msgid "" |
4948 | "Type: %s\n" |
4949 | @@ -947,7 +951,7 @@ |
4950 | msgid "Trash contains %d items" |
4951 | msgstr "La papelera contiene %d ítems" |
4952 | |
4953 | -#: ../src/xfdesktop-special-file-icon.c:498 |
4954 | +#: ../src/xfdesktop-special-file-icon.c:495 |
4955 | #, c-format |
4956 | msgid "" |
4957 | "%s\n" |
4958 | @@ -955,11 +959,11 @@ |
4959 | "Last modified: %s" |
4960 | msgstr "%s\nTamaño: %s\nFecha de modificación: %s" |
4961 | |
4962 | -#: ../src/xfdesktop-special-file-icon.c:567 |
4963 | +#: ../src/xfdesktop-special-file-icon.c:564 |
4964 | msgid "_Empty Trash" |
4965 | msgstr "_Vaciar papelera" |
4966 | |
4967 | -#: ../src/xfdesktop-volume-icon.c:486 |
4968 | +#: ../src/xfdesktop-volume-icon.c:482 |
4969 | #, c-format |
4970 | msgid "" |
4971 | "Removable Volume\n" |
4972 | @@ -967,39 +971,39 @@ |
4973 | "%s left (%s total)" |
4974 | msgstr "Volumen extraíble\nPunto de montaje: %s\nEspacio libre: %s (total: %s)" |
4975 | |
4976 | -#: ../src/xfdesktop-volume-icon.c:493 |
4977 | +#: ../src/xfdesktop-volume-icon.c:489 |
4978 | msgid "" |
4979 | "Removable Volume\n" |
4980 | "Not mounted yet" |
4981 | msgstr "Volumen extraíble\nAún no montado" |
4982 | |
4983 | -#: ../src/xfdesktop-volume-icon.c:522 ../src/xfdesktop-volume-icon.c:567 |
4984 | +#: ../src/xfdesktop-volume-icon.c:518 ../src/xfdesktop-volume-icon.c:563 |
4985 | #, c-format |
4986 | msgid "Failed to eject \"%s\"" |
4987 | msgstr "Fallo al expulsar \"%s\"" |
4988 | |
4989 | -#: ../src/xfdesktop-volume-icon.c:527 ../src/xfdesktop-volume-icon.c:572 |
4990 | +#: ../src/xfdesktop-volume-icon.c:523 ../src/xfdesktop-volume-icon.c:568 |
4991 | msgid "Eject Failed" |
4992 | msgstr "Fallo al expulsar" |
4993 | |
4994 | -#: ../src/xfdesktop-volume-icon.c:604 |
4995 | +#: ../src/xfdesktop-volume-icon.c:600 |
4996 | #, c-format |
4997 | msgid "Failed to mount \"%s\"" |
4998 | msgstr "Fallo al montar \"%s\"" |
4999 | |
5000 | -#: ../src/xfdesktop-volume-icon.c:607 |
The diff has been truncated for viewing.
Thanks. Uploaded.